[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-212-g53f7ee8
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-212-g53f7ee8
|
From: Julien B a. A. <ar...@us...> - 2010-02-22 20:22: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 53f7ee8c36a4b237a3aa9f1d2145012bf6592ce4 (commit)
via 0fb8ea19c03ed071481ec09637ef7110faf40358 (commit)
from bfc9119170dad9ba1bed11670101be21e47517d3 (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 53f7ee8c36a4b237a3aa9f1d2145012bf6592ce4
Merge: 0fb8ea19c03ed071481ec09637ef7110faf40358 bfc9119170dad9ba1bed11670101be21e47517d3
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 22 18:20:42 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 0fb8ea19c03ed071481ec09637ef7110faf40358
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 22 18:20:19 2010 +0100
[BUILDROOT] [2010.02] Updates to latest available snapshot
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
...config.sh-sets-THIS_MINOR-to-0-by-default.patch | 29 ----------------
...pdates_source_repository_and_bump_version.patch | 32 -----------------
...libform_libmenu_and_libpanel_from_ncurses.patch | 36 --------------------
4 files changed, 1 insertions(+), 98 deletions(-)
delete mode 100644 patches/buildroot/2010.02/100-get_linux_config.sh-sets-THIS_MINOR-to-0-by-default.patch
delete mode 100644 patches/buildroot/2010.02/102-rsync-updates_source_repository_and_bump_version.patch
delete mode 100644 patches/buildroot/2010.02/103-alsamixer-now_requires_libform_libmenu_and_libpanel_from_ncurses.patch
diff --git a/Makefile b/Makefile
index 549f0eb..9b1e1b5 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
-#BUILDROOT_VERSION:=20100211
+#BUILDROOT_VERSION:=20100221
#BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/2010.02
BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
BUILDROOT_VERSION:=20081103
diff --git a/patches/buildroot/2010.02/100-get_linux_config.sh-sets-THIS_MINOR-to-0-by-default.patch b/patches/buildroot/2010.02/100-get_linux_config.sh-sets-THIS_MINOR-to-0-by-default.patch
deleted file mode 100644
index edf01db..0000000
--- a/patches/buildroot/2010.02/100-get_linux_config.sh-sets-THIS_MINOR-to-0-by-default.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 13cef349fdc8d01d09e8b1d62f1dd32376d53523 Mon Sep 17 00:00:00 2001
-From: Julien Boibessot <jul...@ar...>
-Date: Tue, 9 Feb 2010 15:18:29 +0100
-Subject: [PATCH] get_linux_config.sh: sets THIS_MINOR to 0 if not valid.
-
-Sets THIS_MINOR to 0 if not valid, ie when processing a Linux config file who do not
-have a minor number extension; ex: "<name>-linux-2.6.<major>.config"
-Otherwise bash is raising an error/exception (line 59) and script can not complete.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
----
- scripts/get_linux_config.sh | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/scripts/get_linux_config.sh b/scripts/get_linux_config.sh
-index 1950e9d..5cd0e37 100755
---- a/scripts/get_linux_config.sh
-+++ b/scripts/get_linux_config.sh
-@@ -35,6 +35,7 @@ function linux_version()
- KERNEL=`echo ${KCONFIG} | sed s/.*linux-2.6./linux-2.6./g -`
- THIS_MAJOR=${KERNEL:10:2}
- THIS_MINOR=${KERNEL:13}
-+ THIS_MINOR=${THIS_MINOR:=0}
- }
-
- # Try to be careful...
---
-1.6.0.4
-
diff --git a/patches/buildroot/2010.02/102-rsync-updates_source_repository_and_bump_version.patch b/patches/buildroot/2010.02/102-rsync-updates_source_repository_and_bump_version.patch
deleted file mode 100644
index 4d8fda9..0000000
--- a/patches/buildroot/2010.02/102-rsync-updates_source_repository_and_bump_version.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0296eef9774b080a5ddd960f9bc7694c4b590f7b Mon Sep 17 00:00:00 2001
-From: Julien Boibessot <jul...@ar...>
-Date: Thu, 11 Feb 2010 13:40:40 +0100
-Subject: [PATCH] Updates rsync source repository
-
-rsync source repository has moved (?).
-Bump version while we are at it.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
----
- package/rsync/rsync.mk | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
-index 1ed6812..e1bb28e 100644
---- a/package/rsync/rsync.mk
-+++ b/package/rsync/rsync.mk
-@@ -4,9 +4,9 @@
- #
- #############################################################
-
--RSYNC_VERSION:=3.0.6
-+RSYNC_VERSION:=3.0.7
- RSYNC_SOURCE:=rsync-$(RSYNC_VERSION).tar.gz
--RSYNC_SITE:=http://rsync.samba.org/ftp/rsync
-+RSYNC_SITE:=http://rsync.samba.org/ftp/rsync/src
- RSYNC_INSTALL_STAGING:=NO
- RSYNC_INSTALL_TARGET:=YES
- RSYNC_CONF_OPT=$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
---
-1.6.0.4
-
diff --git a/patches/buildroot/2010.02/103-alsamixer-now_requires_libform_libmenu_and_libpanel_from_ncurses.patch b/patches/buildroot/2010.02/103-alsamixer-now_requires_libform_libmenu_and_libpanel_from_ncurses.patch
deleted file mode 100644
index 54f3b6d..0000000
--- a/patches/buildroot/2010.02/103-alsamixer-now_requires_libform_libmenu_and_libpanel_from_ncurses.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4ad3a1b57fb94d8fd8cf5a6e215afbcc16f50c23 Mon Sep 17 00:00:00 2001
-From: Julien Boibessot <jul...@ar...>
-Date: Thu, 11 Feb 2010 17:27:06 +0100
-Subject: [PATCH] alsamixer now seems to need libform, libmenu & libpanel (from ncurses)
-
-Without this patch alsamixer complains about missing libs and
-ldd says:
- libform.so.5 => not found
- libmenu.so.5 => not found
- libpanel.so.5 => not found
- libncurses.so.5 => /usr/lib/libncurses.so.5 (0x4000e000)
- libasound.so.2 => /usr/lib/libasound.so.2 (0x40056000)
- ... <cut>
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
----
- package/multimedia/alsa-utils/Config.in | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/package/multimedia/alsa-utils/Config.in b/package/multimedia/alsa-utils/Config.in
-index 54ab3f9..04057f4 100644
---- a/package/multimedia/alsa-utils/Config.in
-+++ b/package/multimedia/alsa-utils/Config.in
-@@ -24,6 +24,9 @@ config BR2_PACKAGE_ALSA_UTILS_ALSACTL
- config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
- bool "alsamixer"
- select BR2_PACKAGE_NCURSES
-+ select BR2_PACKAGE_NCURSES_TARGET_PANEL
-+ select BR2_PACKAGE_NCURSES_TARGET_FORM
-+ select BR2_PACKAGE_NCURSES_TARGET_MENU
- default y
-
- config BR2_PACKAGE_ALSA_UTILS_AMIDI
---
-1.6.0.4
-
hooks/post-receive
--
armadeus
|
