[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-115-g8cbcaa3

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  8cbcaa3f49f9ad692184a0bc77b1a26b0ea4a862 (commit)
      from  3b6b1d0d193f573a8ef67feefc05e1e1a8a10be0 (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 8cbcaa3f49f9ad692184a0bc77b1a26b0ea4a862
Author: Julien Boibessot <jul...@ar...>
Date:   Sun Nov 21 22:31:49 2010 +0100

    [BUILDROOT] [2010.11] Updates to 2010.11-rc1

-----------------------------------------------------------------------

Summary of changes:
 Makefile                                           |    4 +-
 patches/buildroot/2010.11/006-lcd4linux.patch      |    4 +-
 .../buildroot/2010.11/085-adds_gpm_package.patch   |    2 +-
 .../2010.11/086-bump_proftp_version.patch          |   47 --------------------
 ...ckage.patch => 113-gpsd-add_package.integrated} |    3 +
 patches/buildroot/2010.11/cleanup_buildroot.sh     |    2 -
 6 files changed, 8 insertions(+), 54 deletions(-)
 delete mode 100644 patches/buildroot/2010.11/086-bump_proftp_version.patch
 rename patches/buildroot/2010.11/{113-gpsd-add_package.patch => 113-gpsd-add_package.integrated} (99%)

diff --git a/Makefile b/Makefile
index e50b29f..7a0e099 100644
--- a/Makefile
+++ b/Makefile
@@ -36,8 +36,8 @@ else
 #BUILDROOT_VERSION:=2010.11
 #BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
 #BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
-BUILDROOT_VERSION:=20101015
-BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
+BUILDROOT_VERSION:=2010.11-rc1
+BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
 BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/2010.11
 ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
 endif
diff --git a/patches/buildroot/2010.11/006-lcd4linux.patch b/patches/buildroot/2010.11/006-lcd4linux.patch
index d16e71b..ee85be7 100644
--- a/patches/buildroot/2010.11/006-lcd4linux.patch
+++ b/patches/buildroot/2010.11/006-lcd4linux.patch
@@ -6,10 +6,10 @@ Index: buildroot/package/Config.in
 ===================================================================
 --- buildroot.orig/package/Config.in	2010-06-23 14:09:19.000000000 +0200
 +++ buildroot/package/Config.in	2010-06-23 14:09:53.000000000 +0200
-@@ -175,6 +175,7 @@
- source "package/i2c-tools/Config.in"
+@@ -177,6 +177,7 @@
  source "package/input-tools/Config.in"
  source "package/iostat/Config.in"
+ source "package/kbd/Config.in"
 +source "package/lcd4linux/Config.in"
  source "package/lm-sensors/Config.in"
  source "package/lvm2/Config.in"
diff --git a/patches/buildroot/2010.11/085-adds_gpm_package.patch b/patches/buildroot/2010.11/085-adds_gpm_package.patch
index 6997db4..3786f30 100644
--- a/patches/buildroot/2010.11/085-adds_gpm_package.patch
+++ b/patches/buildroot/2010.11/085-adds_gpm_package.patch
@@ -128,9 +128,9 @@ Index: buildroot/package/Config.in
  source "package/genext2fs/Config.in"
  source "package/genromfs/Config.in"
 +source "package/gpm/Config.in"
+ source "package/gpsd/Config.in"
  source "package/gvfs/Config.in"
  source "package/hal/Config.in"
- if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 Index: buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2010.11/086-bump_proftp_version.patch b/patches/buildroot/2010.11/086-bump_proftp_version.patch
deleted file mode 100644
index 21f44c3..0000000
--- a/patches/buildroot/2010.11/086-bump_proftp_version.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: buildroot/package/proftpd/proftpd.mk
-===================================================================
---- buildroot.orig/package/proftpd/proftpd.mk	2010-06-17 16:45:11.000000000 +0200
-+++ buildroot/package/proftpd/proftpd.mk	2010-06-17 16:49:27.000000000 +0200
-@@ -3,7 +3,7 @@
- # proftpd
- #
- #############################################################
--PROFTPD_VERSION:=1.3.1
-+PROFTPD_VERSION:=1.3.2
- PROFTPD_SOURCE:=proftpd-$(PROFTPD_VERSION).tar.bz2
- PROFTPD_SITE:=ftp://ftp.proftpd.org/distrib/source/
- PROFTPD_DIR:=$(BUILD_DIR)/proftpd-$(PROFTPD_VERSION)
-Index: buildroot/package/proftpd/proftpd-1.3.1-fix-kernel-header-capability-version.patch
-===================================================================
---- buildroot.orig/package/proftpd/proftpd-1.3.1-fix-kernel-header-capability-version.patch	2010-06-17 16:45:11.000000000 +0200
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,12 +0,0 @@
----- a/lib/libcap/libcap.h	2008-04-24 19:46:29.475883739 +0200
--+++ b/lib/libcap/libcap.h	2008-04-24 19:48:31.116088563 +0200
--@@ -52,7 +52,8 @@
--  */
-- 
-- #if !defined(_LINUX_CAPABILITY_VERSION) || \
---            (_LINUX_CAPABILITY_VERSION != 0x19980330)
--+           ((_LINUX_CAPABILITY_VERSION != 0x19980330) && \
--+            (_LINUX_CAPABILITY_VERSION != 0x20071026))
-- 
-- # error "Kernel <linux/capability.h> does not match library"
-- # error "file "libcap.h" --> fix and recompile libcap"
-Index: buildroot/package/proftpd/proftpd-1.3.2-fix-kernel-header-capability-version.patch
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/proftpd/proftpd-1.3.2-fix-kernel-header-capability-version.patch	2010-06-17 16:49:27.000000000 +0200
-@@ -0,0 +1,12 @@
-+--- a/lib/libcap/libcap.h	2008-04-24 19:46:29.475883739 +0200
-++++ b/lib/libcap/libcap.h	2008-04-24 19:48:31.116088563 +0200
-+@@ -52,7 +52,8 @@
-+  */
-+ 
-+ #if !defined(_LINUX_CAPABILITY_VERSION_1) || \
-+-            (_LINUX_CAPABILITY_VERSION_1 != 0x19980330)
-++           ((_LINUX_CAPABILITY_VERSION_1 != 0x19980330) && \
-++            (_LINUX_CAPABILITY_VERSION_1 != 0x20071026))
-+ 
-+ # error "Kernel <linux/capability.h> does not match library"
-+ # error "file "libcap.h" --> fix and recompile libcap"
diff --git a/patches/buildroot/2010.11/113-gpsd-add_package.patch b/patches/buildroot/2010.11/113-gpsd-add_package.integrated
similarity index 99%
rename from patches/buildroot/2010.11/113-gpsd-add_package.patch
rename to patches/buildroot/2010.11/113-gpsd-add_package.integrated
index 5a7456e..7f724f4 100644
--- a/patches/buildroot/2010.11/113-gpsd-add_package.patch
+++ b/patches/buildroot/2010.11/113-gpsd-add_package.integrated
@@ -1,5 +1,8 @@
 Adds gpsd package to BR.
 
+Integrated in latest BR. To do: check if some of our modifications are
+not also useful.
+
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
 Index: buildroot/package/Config.in
diff --git a/patches/buildroot/2010.11/cleanup_buildroot.sh b/patches/buildroot/2010.11/cleanup_buildroot.sh
index 14fe7f9..b5ec0ef 100755
--- a/patches/buildroot/2010.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.11/cleanup_buildroot.sh
@@ -8,7 +8,6 @@ rm -rf buildroot/package/games/quake-pak/
 rm -rf buildroot/package/games/sdlquake/
 rm -rf buildroot/package/gpm/
 rm -rf buildroot/package/pygame/
-rm -f  buildroot/package/proftpd/proftpd-1.3.2-fix-kernel-header-capability-version.patch
 rm -rf buildroot/package/uucp/
 rm -f  buildroot/package/multimedia/libsndfile/libsndfile-1.0.*-srconly.patch
 rm -rf buildroot/package/multimedia/flite/
@@ -21,7 +20,6 @@ rm -f  buildroot/toolchain/gcc/4.2.4/999-4.2.4-armeabi-aapcs-linux.patch
 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/
 rm -rf buildroot/package/openssh/


hooks/post-receive
-- 
armadeus


