Skip to contentSkip to conversation

linux: stop if one linux patches doesn't apply

PATCH New Sébastien Szymanski 3 participants 3 messages Mar 16, 2015

lore
Share & tools
lore

Sébastien Szymanski

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 linux/linux.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
linux/linux.mk +3 -3
index 78e589e..4a69e49 100644
@@ -158,11 +158,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
Signature · 1 line
2.0.5
#1 lore raw

PATCH 1/1 linux: stop if one linux patches doesn't apply

S?bastien, All,

On 2015-03-16 10:57 +0100, S?bastien Szymanski spake thusly:

Quoted 5 lines

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 <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 30 lines
---
 linux/linux.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
linux/linux.mk +3 -3
index 78e589e..4a69e49 100644
@@ -158,11 +158,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
Signature · 6 lines
2.0.5

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
Applied
#2 lore raw

PATCH 1/1 linux: stop if one linux patches doesn't apply

In reply to Sébastien Szymanski

Dear S?bastien Szymanski,

Quoted 5 lines · S?bastien Szymanski

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 <[email protected]>

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com