[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-469-gf20ce48
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-469-gf20ce48
|
From: Julien B a. A. <ar...@us...> - 2012-07-30 09:27:55
|
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 f20ce4825ed6764e94dd5d1c05c650a0c3edf1c7 (commit)
via 427937e09d6bb792eb165262419dea6ec9094d0b (commit)
from 2527763a894a6eae425dfd7bf9636002bd658e24 (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 f20ce4825ed6764e94dd5d1c05c650a0c3edf1c7
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jul 30 11:27:25 2012 +0200
[BUILD] BSP is stable enough to enter in 5.0 beta stage
commit 427937e09d6bb792eb165262419dea6ec9094d0b
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jul 30 11:23:00 2012 +0200
[BUILDROOT] Fixes fbtest build on recent kernels
-----------------------------------------------------------------------
Summary of changes:
.../rootfs/target_skeleton/etc/armadeus-version | 2 +-
.../buildroot/2012.02/119-fbtest-add_package.patch | 26 ++++++++++---------
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
index c0feada..53ca344 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
@@ -1 +1 @@
-5.0-alpha-git
+5.0-beta-git
diff --git a/patches/buildroot/2012.02/119-fbtest-add_package.patch b/patches/buildroot/2012.02/119-fbtest-add_package.patch
index 4364c1d..f1a3ec9 100644
--- a/patches/buildroot/2012.02/119-fbtest-add_package.patch
+++ b/patches/buildroot/2012.02/119-fbtest-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:45:06.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:45:15.000000000 +0100
+--- buildroot.orig/package/Config.in 2012-07-30 10:43:47.000000000 +0200
++++ buildroot/package/Config.in 2012-07-30 10:59:43.000000000 +0200
@@ -116,6 +116,7 @@
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/fbset/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/fbtest/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/Config.in 2012-02-21 16:45:15.000000000 +0100
++++ buildroot/package/fbtest/Config.in 2012-07-30 10:43:47.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_FBTEST
+ bool "fbtest"
@@ -29,7 +29,7 @@ Index: buildroot/package/fbtest/Config.in
Index: buildroot/package/fbtest/fbtest.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest.mk 2012-02-21 16:45:15.000000000 +0100
++++ buildroot/package/fbtest/fbtest.mk 2012-07-30 10:43:47.000000000 +0200
@@ -0,0 +1,51 @@
+#############################################################
+#
@@ -85,7 +85,7 @@ Index: buildroot/package/fbtest/fbtest.mk
Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch 2012-02-21 16:45:15.000000000 +0100
++++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch 2012-07-30 10:43:47.000000000 +0200
@@ -0,0 +1,36 @@
+--- fbtest-20041102-1.org/fb.c 2003-04-04 14:07:55.000000000 +0200
++++ fbtest-20041102-1/fb.c 2009-05-20 10:32:32.000000000 +0200
@@ -126,7 +126,7 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch 2012-02-21 16:45:15.000000000 +0100
++++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch 2012-07-30 10:43:47.000000000 +0200
@@ -0,0 +1,11 @@
+--- fbtest-20041102-1.org/Makefile 2009-05-21 10:16:05.000000000 +0200
++++ fbtest-20041102-1/Makefile 2009-05-21 10:17:47.000000000 +0200
@@ -142,7 +142,7 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
Index: buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch 2012-02-21 16:45:15.000000000 +0100
++++ buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch 2012-07-30 10:43:47.000000000 +0200
@@ -0,0 +1,11 @@
+--- fbtest-20041102-1.org/pnmtohex/Makefile 2004-11-02 09:43:02.000000000 +0100
++++ fbtest-20041102-1/pnmtohex/Makefile 2005-11-16 22:24:08.406157582 +0100
@@ -158,16 +158,18 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch
Index: buildroot/package/fbtest/fbtest-20041102-1-correct_struct_fb_var_screeninfo.reserved_usage.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-correct_struct_fb_var_screeninfo.reserved_usage.patch 2012-02-21 16:45:15.000000000 +0100
-@@ -0,0 +1,12 @@
-+struct fb_var_screeninfo has only 5 bytes available in "reserved[]" table.
++++ buildroot/package/fbtest/fbtest-20041102-1-correct_struct_fb_var_screeninfo.reserved_usage.patch 2012-07-30 11:08:14.000000000 +0200
+@@ -0,0 +1,14 @@
++struct fb_var_screeninfo has only 4 bytes available in "reserved[]" table (on
++recent kernel versions)
+
+--- fbtest-20041102-1/fb.c 2011-05-03 11:53:28.000000000 +0200
++++ fbtest-20041102-1.mod/fb.c 2011-05-03 12:30:34.000000000 +0200
-+@@ -341,7 +341,6 @@
++@@ -340,8 +341,6 @@
++ CHECK_CHANGE(reserved[1]);
+ CHECK_CHANGE(reserved[2]);
+ CHECK_CHANGE(reserved[3]);
-+ CHECK_CHANGE(reserved[4]);
++- CHECK_CHANGE(reserved[4]);
+- CHECK_CHANGE(reserved[5]);
+
+ var_validate();
hooks/post-receive
--
armadeus
|
