[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-457-g7fac98d
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2010-06-17 21:28:25
|
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 7fac98dbb4d0fab25ee668c0a4f667f913082d2b (commit)
via 2283d5e87dcdd21fd5fc59fd7b94eedc5e3b2025 (commit)
from a24f4dfd228f45c3553a39d7cb1bf10366a3735f (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 7fac98dbb4d0fab25ee668c0a4f667f913082d2b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 17 23:26:32 2010 +0200
Updates default BR configs
commit 2283d5e87dcdd21fd5fc59fd7b94eedc5e3b2025
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 17 23:24:24 2010 +0200
[BUILDROOT] End of lmbench cleanup
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/.gitignore | 1 -
.../target/device/armadeus/apf27/apf27_defconfig | 3 ++-
.../device/armadeus/apf9328/apf9328_defconfig | 3 ++-
...package.patch => 017-lmbench-add_package.patch} | 10 ++++++++++
patches/buildroot/017-lmbench.patch | 10 ----------
patches/buildroot/2010.05/cleanup_buildroot.sh | 2 ++
patches/buildroot/cleanup_buildroot.sh | 2 ++
7 files changed, 18 insertions(+), 13 deletions(-)
rename patches/buildroot/{043-lmbench-add_package.patch => 017-lmbench-add_package.patch} (89%)
delete mode 100644 patches/buildroot/017-lmbench.patch
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index 6336fc9..273ed3c 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -16,7 +16,6 @@
!/fbgrab/
!/fbtest/
!/lcd4linux/
-!/lmbench/
!/mesa/
!/mtd/
!/openssh/
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index 5181f78..849b58e 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Wed Jun 16 16:58:03 2010
+# Thu Jun 17 18:25:20 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -510,6 +510,7 @@ BR2_BLOCKDEV_SUPPORT=y
# BR2_PACKAGE_LIBFUSE is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
# BR2_PACKAGE_GPM is not set
+# BR2_PACKAGE_GPSD is not set
# BR2_PACKAGE_HAL is not set
# BR2_PACKAGE_HWDATA is not set
BR2_PACKAGE_I2C_TOOLS=y
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index a2262ad..abb21e6 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
+++ b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Wed Jun 16 16:58:03 2010
+# Thu Jun 17 18:25:20 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -504,6 +504,7 @@ BR2_BLOCKDEV_SUPPORT=y
# BR2_PACKAGE_LIBFUSE is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
# BR2_PACKAGE_GPM is not set
+# BR2_PACKAGE_GPSD is not set
# BR2_PACKAGE_HAL is not set
# BR2_PACKAGE_HWDATA is not set
# BR2_PACKAGE_I2C_TOOLS is not set
diff --git a/patches/buildroot/043-lmbench-add_package.patch b/patches/buildroot/017-lmbench-add_package.patch
similarity index 89%
rename from patches/buildroot/043-lmbench-add_package.patch
rename to patches/buildroot/017-lmbench-add_package.patch
index d7d049c..5d8e24d 100644
--- a/patches/buildroot/043-lmbench-add_package.patch
+++ b/patches/buildroot/017-lmbench-add_package.patch
@@ -2,6 +2,16 @@ Adds lmbench package to BR.
No more needed with recent BR as lmbench was integrated.
+--- buildroot/package/Config.in.ref 2008-11-03 16:03:10.000000000 +0100
++++ buildroot/package/Config.in 2008-11-03 16:07:18.000000000 +0100
+@@ -88,6 +88,7 @@ source "package/libgpg-error/Config.in"
+ source "package/libiconv/Config.in"
+ source "package/liblockfile/Config.in"
+ source "package/libsysfs/Config.in"
++source "package/lmbench/Config.in"
+ source "package/lockfile-progs/Config.in"
+ source "package/logrotate/Config.in"
+ source "package/lsof/Config.in"
Index: buildroot/package/lmbench/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/017-lmbench.patch b/patches/buildroot/017-lmbench.patch
deleted file mode 100644
index 5cb81fc..0000000
--- a/patches/buildroot/017-lmbench.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- buildroot/package/Config.in.ref 2008-11-03 16:03:10.000000000 +0100
-+++ buildroot/package/Config.in 2008-11-03 16:07:18.000000000 +0100
-@@ -88,6 +88,7 @@ source "package/libgpg-error/Config.in"
- source "package/libiconv/Config.in"
- source "package/liblockfile/Config.in"
- source "package/libsysfs/Config.in"
-+source "package/lmbench/Config.in"
- source "package/lockfile-progs/Config.in"
- source "package/logrotate/Config.in"
- source "package/lsof/Config.in"
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index 1fd9286..b122322 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -23,3 +23,5 @@ rm -rf buildroot/package/games/wolf4sdl/
rm -rf buildroot/package/ussp-push/
rm -rf buildroot/package/openobex/
rm -rf buildroot/package/gpsd/
+rm -rf buildroot/package/lmbench/
+rm -rf buildroot/package/tslib/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 833eca3..1c02a92 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -27,3 +27,5 @@ rm -rf buildroot/package/qtopia4/
rm -rf buildroot/package/ussp-push/
rm -rf buildroot/package/openobex/
rm -rf buildroot/package/gpsd/
+rm -rf buildroot/package/lmbench/
+rm -rf buildroot/package/tslib/
hooks/post-receive
--
armadeus
|