aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2011-04-06 07:06:58 (GMT)
committerHans Verkuil <hverkuil@xs4all.nl>2011-04-06 07:06:58 (GMT)
commitadb7f9dd0ffa26bae3eb1776847a9dd7cb912df2 (patch)
tree3f27220c86003f284db44e6287f2d559768375e3
parenta500c7f35da96e4d87d5527f3ffa986db0c5d0b9 (diff)
Skip commented patches in the backports/*_series files.
Makes it easier when debugging patch failures. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
-rw-r--r--linux/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/Makefile b/linux/Makefile
index f374097..715ee06 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -129,7 +129,7 @@ apply_patches apply-patches:
if [ ! -e ../backports/$$dir_series ]; then echo "Version $$dir not supported."; exit 1; fi; \
echo "Applying patches for kernel $$dir"; \
touch .patches_applied; \
- for i in `cat ../backports/$${dir}_series`; do \
+ for i in `cat ../backports/$${dir}_series|grep -v '^#'`; do \
echo patch -s -f -N -p1 -i ../backports/$$i; \
patch -s -f -N -p1 -i ../backports/$$i --dry-run || exit 1; \
patch -s -f -N -p1 -i ../backports/$$i; \
@@ -147,7 +147,7 @@ apply_patches apply-patches:
unapply_patches unapply-patches:
@if [ -e .patches_applied ]; then \
echo "Unapplying patches"; \
- for i in `cat .patches_applied|grep -v ^#`; do \
+ for i in `cat .patches_applied|grep -v '^#'`; do \
echo patch -s -f -R -p1 -i ../backports/$$i; \
patch -s -f -R -p1 -i ../backports/$$i || break; \
done; \

Privacy Policy