summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSébastien Szymanski <sebastien.szymanski@armadeus.com>2015-03-16 10:57:17 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-03-16 19:46:10 +0100
commit540e14a81c9caae52adb8482b6d73c7f716694ee (patch)
tree99305b9fc5ae990b1d3a80599f0cee3d23896f0b
parent84183b3ec32723527434e93224e5914e2ab469bf (diff)
downloadbuildroot-540e14a81c9caae52adb8482b6d73c7f716694ee.tar.gz
buildroot-540e14a81c9caae52adb8482b6d73c7f716694ee.zip
linux: stop if one linux patches doesn't apply
If you have several linux patches directories, Buildroot does not stop if one patches of the first directories don't apply. This patch fixes this. Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--linux/linux.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/linux.mk b/linux/linux.mk
index b1aca419da..5a0ba01d42 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -162,11 +162,11 @@ LINUX_POST_DOWNLOAD_HOOKS += LINUX_DOWNLOAD_PATCHES
define LINUX_APPLY_PATCHES
for p in $(LINUX_PATCHES) ; do \
if echo $$p | grep -q -E "^ftp://|^http://|^https://" ; then \
- $(APPLY_PATCHES) $(@D) $(DL_DIR) `basename $$p` ; \
+ $(APPLY_PATCHES) $(@D) $(DL_DIR) `basename $$p` || exit 1; \
elif test -d $$p ; then \
- $(APPLY_PATCHES) $(@D) $$p linux-\*.patch ; \
+ $(APPLY_PATCHES) $(@D) $$p linux-\*.patch || exit 1; \
else \
- $(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` ; \
+ $(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || exit 1; \
fi \
done
endef
OpenPOWER on IntegriCloud