[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-661-g6400404
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-661-g6400404
|
From: Sébastien S. <ss...@us...> - 2015-03-17 10:28:09
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 6400404e5c8ad5f1ecd90b29af005eb5d8932d34 (commit)
from 80d8d93f27864c83c844abb6566b6d2cd3a8fd28 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6400404e5c8ad5f1ecd90b29af005eb5d8932d34
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Mar 17 11:31:07 2015 +0100
[BUILDROOT] 2015.02/2013.11: linux: stop if one linux patch doesn't
apply
-----------------------------------------------------------------------
Summary of changes:
...x-stop-if-one-linux-patches-doesn-t-apply.patch | 39 ++++++++++++++++++++
...x-stop-if-one-linux-patches-doesn-t-apply.patch | 39 ++++++++++++++++++++
2 files changed, 78 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2013.11/226-armadeus-linux-stop-if-one-linux-patches-doesn-t-apply.patch
create mode 100644 patches/buildroot/2015.02/223-armadeus-linux-stop-if-one-linux-patches-doesn-t-apply.patch
diff --git a/patches/buildroot/2013.11/226-armadeus-linux-stop-if-one-linux-patches-doesn-t-apply.patch b/patches/buildroot/2013.11/226-armadeus-linux-stop-if-one-linux-patches-doesn-t-apply.patch
new file mode 100644
index 0000000..3722da6
--- /dev/null
+++ b/patches/buildroot/2013.11/226-armadeus-linux-stop-if-one-linux-patches-doesn-t-apply.patch
@@ -0,0 +1,39 @@
+From bd6eb463551e673fa75505a7a2803e0b378e7189 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Mon, 16 Mar 2015 10:44:59 +0100
+Subject: [PATCH 1/1] linux: stop if one linux patches doesn't apply
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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.
+
+Merged by upstream, can be removed when bumping to BR 2015.05
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ linux/linux.mk | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk
++++ buildroot/linux/linux.mk
+@@ -147,11 +147,11 @@ LINUX_POST_DOWNLOAD_HOOKS += LINUX_DOWNL
+ define LINUX_APPLY_PATCHES
+ for p in $(LINUX_PATCHES) ; do \
+ if echo $$p | grep -q -E "^ftp://|^http://" ; then \
+- support/scripts/apply-patches.sh $(@D) $(DL_DIR) `basename $$p` ; \
++ support/scripts/apply-patches.sh $(@D) $(DL_DIR) `basename $$p` || exit 1; \
+ elif test -d $$p ; then \
+- support/scripts/apply-patches.sh $(@D) $$p \*.patch ; \
++ support/scripts/apply-patches.sh $(@D) $$p \*.patch || exit 1; \
+ else \
+- support/scripts/apply-patches.sh $(@D) `dirname $$p` `basename $$p` ; \
++ support/scripts/apply-patches.sh $(@D) `dirname $$p` `basename $$p` || exit 1; \
+ fi \
+ done
+ endef
diff --git a/patches/buildroot/2015.02/223-armadeus-linux-stop-if-one-linux-patches-doesn-t-apply.patch b/patches/buildroot/2015.02/223-armadeus-linux-stop-if-one-linux-patches-doesn-t-apply.patch
new file mode 100644
index 0000000..5034c7a
--- /dev/null
+++ b/patches/buildroot/2015.02/223-armadeus-linux-stop-if-one-linux-patches-doesn-t-apply.patch
@@ -0,0 +1,39 @@
+From bd6eb463551e673fa75505a7a2803e0b378e7189 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Mon, 16 Mar 2015 10:44:59 +0100
+Subject: [PATCH 1/1] linux: stop if one linux patches doesn't apply
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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.
+
+Merged by upstream, can be removed when bumping to BR 2015.05
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ linux/linux.mk | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk
++++ buildroot/linux/linux.mk
+@@ -158,11 +158,11 @@ LINUX_POST_DOWNLOAD_HOOKS += LINUX_DOWNL
+ 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 \*.patch ; \
++ $(APPLY_PATCHES) $(@D) $$p \*.patch || exit 1; \
+ else \
+- $(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` ; \
++ $(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || exit 1; \
+ fi \
+ done
+ endef
hooks/post-receive
--
armadeus
|