[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-71-g74c2856
Brought to you by:
sszy
|
From: jorasse <jo...@us...> - 2012-12-10 18:40:52
|
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 74c2856539e3a7f3fa6c798fb099a293aaef6d9d (commit)
from b4efab436aa1eef5e5b92b95e5166ed376af5e4e (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 74c2856539e3a7f3fa6c798fb099a293aaef6d9d
Author: Eric Jarrige <eri...@ar...>
Date: Mon Dec 10 19:42:15 2012 +0100
[BILDROOT] 2012.11: update to support next BR release
-----------------------------------------------------------------------
Summary of changes:
Makefile | 7 +---
.../2012.11/001-add_armadeus_device.patch | 33 +++++++++++---------
.../buildroot/2012.11/072-xenomai-package.patch | 7 +++-
.../buildroot/2012.11/081-adds_quake_package.patch | 8 ++--
.../2012.11/117-ussp-push-add_package.patch | 2 +-
.../2012.11/121-target-arm926t_is_arm926ej-s.patch | 6 ++--
.../buildroot/2012.11/124-e-uae-add_package.patch | 4 +-
.../2012.11/125-opentyrian-add_package.patch | 6 ++--
.../2012.11/130-lbreakout-add_package.patch | 4 +-
...lection_even_when_custom_rootfs_is_chosen.patch | 20 ++++++------
10 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/Makefile b/Makefile
index cd9e87f..eb9cb99 100644
--- a/Makefile
+++ b/Makefile
@@ -27,15 +27,10 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_VERSION:=2012.02
-#BUILDROOT_VERSION:=20121030
+#BUILDROOT_VERSION:=2012.11
include ./Makefile.in
-ifeq ($(BUILDROOT_VERSION),2012.02)
BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
-else
-BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
-BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/2012.11
-endif
ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
#--- End of user conf (don't touch anything below unless you know what you're doing !! ;-) )
diff --git a/patches/buildroot/2012.11/001-add_armadeus_device.patch b/patches/buildroot/2012.11/001-add_armadeus_device.patch
index b952e5f..0e8f71f 100644
--- a/patches/buildroot/2012.11/001-add_armadeus_device.patch
+++ b/patches/buildroot/2012.11/001-add_armadeus_device.patch
@@ -1,21 +1,24 @@
Add armadeus target specific menu to BR.
-Index: buildroot/target/generic/Config.in
+Index: buildroot/Makefile
===================================================================
---- buildroot.orig/target/generic/Config.in 2012-02-21 16:43:29.000000000 +0100
-+++ buildroot/target/generic/Config.in 2012-02-21 16:43:48.000000000 +0100
-@@ -149,4 +149,5 @@
- only argument. Make sure the exit code of that script is 0,
- otherwise make will stop after calling it.
+--- buildroot/Makefile
++++ buildroot/Makefile
+@@ -336,6 +336,7 @@ endif
+ endif
-+source "target/device/armadeus/Config.in"
- endmenu
-Index: buildroot/target/Makefile.in
+ include system/system.mk
++include target/device/armadeus/Makefile.in
+ include fs/common.mk
+
+ TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
+Index: buildroot/system/Config.in
===================================================================
---- buildroot.orig/target/Makefile.in 2012-02-21 16:43:29.000000000 +0100
-+++ buildroot/target/Makefile.in 2012-02-21 16:43:48.000000000 +0100
-@@ -1,3 +1,4 @@
- # make sure to put everything that is board-specific before the tarroot targets
- include target/generic/Makefile.in
+--- buildroot/system/Config.in
++++ buildroot/system/Config.in
+@@ -183,4 +183,5 @@ config BR2_ROOTFS_POST_BUILD_SCRIPT
+ only argument. Make sure the exit code of those scripts are 0,
+ otherwise make will stop after calling them.
-+include target/device/armadeus/Makefile.in
++source "target/device/armadeus/Config.in"
+ endmenu
diff --git a/patches/buildroot/2012.11/072-xenomai-package.patch b/patches/buildroot/2012.11/072-xenomai-package.patch
index f41b12b..2bdfba8 100644
--- a/patches/buildroot/2012.11/072-xenomai-package.patch
+++ b/patches/buildroot/2012.11/072-xenomai-package.patch
@@ -197,14 +197,17 @@ Index: buildroot/package/xenomai/xeno-kernel.config
+# CONFIG_IPIPE_DEBUG is not set
Index: buildroot/package/xenomai/xenomai.mk
===================================================================
---- buildroot.orig/package/xenomai/xenomai.mk
+--- buildroot/package/xenomai/xenomai.mk
+++ buildroot/package/xenomai/xenomai.mk
-@@ -12,9 +12,17 @@ endif
+@@ -12,12 +12,20 @@ endif
XENOMAI_SITE = http://download.gna.org/xenomai/stable/
XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
+XENOMAI_ADEOS_PATCH = $(call qstri |