[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-267-g47a71e0
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-267-g47a71e0
|
From: Julien B a. A. <ar...@us...> - 2010-03-29 20:14:58
|
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 47a71e03db3c940875edc76e14b7cf79faaa2747 (commit)
from 29ead19457657e1354a631a8c968faaa4c454909 (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 47a71e03db3c940875edc76e14b7cf79faaa2747
Author: Julien Boibessot <jul...@ar...>
Date: Mon Mar 29 22:13:14 2010 +0200
[BUILDROOT] Finalizes support for BR 2010.02 version
-----------------------------------------------------------------------
Summary of changes:
Makefile | 8 +++---
buildroot/configs/apf9328_defconfig | 27 +++++++++++---------
patches/buildroot/2010.02/040-linux-makefile.patch | 16 ++++++------
...0-linux-remove_unsupported_kernel_version.patch | 23 ++++++++++------
...-mplayer-replace_us_charset_with_utf8_one.patch | 26 -------------------
5 files changed, 41 insertions(+), 59 deletions(-)
delete mode 100644 patches/buildroot/2010.02/102-mplayer-replace_us_charset_with_utf8_one.patch
diff --git a/Makefile b/Makefile
index 9b1e1b5..b1fe77c 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,8 @@ ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
#--- User configurable stuff:
-#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
-#BUILDROOT_VERSION:=20100221
+#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
+#BUILDROOT_VERSION:=2010.02
#BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/2010.02
BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
BUILDROOT_VERSION:=20081103
@@ -39,7 +39,7 @@ BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
#BUILDROOT_DIR is defined in ./Makefile.in
PATCH_DIR = patches
BUILDROOT_FILE_PATH:=downloads
-TAR_OPTIONS=--exclude=.svn --exclude=.git --exclude=.gitignore -xf
+TAR_OPTIONS=--exclude=.svn --exclude=.git --exclude=.gitignore --strip-component=1 -xf
ARMADEUS_ENV_FILE:=$(ARMADEUS_TOPDIR)/armadeus_env.sh
@@ -99,7 +99,7 @@ buildroot-sources: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE)
$(BUILDROOT_DIR)/.unpacked: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) $(BUILDROOT_PATCH_DIR)/*.patch
$(BUILDROOT_PATCH_DIR)/cleanup_buildroot.sh
bzcat $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) | \
- tar -C $(ARMADEUS_TOPDIR) $(TAR_OPTIONS) -
+ tar -C $(BUILDROOT_DIR) $(TAR_OPTIONS) -
touch $@
buildroot-unpacked: $(BUILDROOT_DIR)/.unpacked
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index fca7fb3..dc2a427 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -1,9 +1,9 @@
#
# Automatically generated make config: don't edit
-# Sun Mar 21 13:16:38 2010
+# Mon Mar 29 22:02:48 2010
#
BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2010.02-rc1"
+BR2_VERSION="2010.02"
# BR2_alpha is not set
BR2_arm=y
# BR2_armeb is not set
@@ -294,6 +294,7 @@ BR2_HOST_FAKEROOT=y
# BR2_PACKAGE_PKG_CONFIG is not set
# BR2_PACKAGE_READLINE is not set
# BR2_PACKAGE_PCRE is not set
+# BR2_PACKAGE_INTLTOOL is not set
#
# Armadeus specific packages
@@ -615,9 +616,9 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
# text rendering libraries
#
BR2_PACKAGE_NCURSES=y
-# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
-# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
-# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
+BR2_PACKAGE_NCURSES_TARGET_PANEL=y
+BR2_PACKAGE_NCURSES_TARGET_FORM=y
+BR2_PACKAGE_NCURSES_TARGET_MENU=y
# BR2_PACKAGE_NEWT is not set
# BR2_PACKAGE_SLANG is not set
@@ -674,7 +675,6 @@ BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_LIBERATION is not set
# BR2_PACKAGE_LIBGLIB12 is not set
# BR2_PACKAGE_LIBGLIB2 is not set
-# BR2_PACKAGE_OPENMOTIF is not set
# BR2_PACKAGE_FONTCONFIG is not set
# BR2_PACKAGE_FREETYPE is not set
BR2_PACKAGE_TSLIB=y
@@ -689,7 +689,6 @@ BR2_PACKAGE_TSLIB=y
#
# BR2_PACKAGE_GOB2 is not set
# BR2_PACKAGE_SYLPHEED is not set
-# BR2_PACKAGE_XPDF is not set
#
# Compressors / decompressors
@@ -724,6 +723,7 @@ BR2_PACKAGE_ZLIB=y
# BR2_PACKAGE_LIBXML2 is not set
# BR2_PACKAGE_LIBXSLT is not set
# BR2_PACKAGE_XERCES is not set
+# BR2_PACKAGE_LIBXML_PARSER_PERL is not set
#
# Java
@@ -814,13 +814,15 @@ BR2_KERNEL_LINUX_ADVANCED=y
BR2_PACKAGE_LINUX=y
BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
BR2_PACKAGE_LINUX_FORMAT="uImage"
-BR2_KERNEL_CURRENT_VERSION="2.6.30.2"
-BR2_KERNEL_LATEST_2_6_30="2"
+BR2_KERNEL_CURRENT_VERSION="2.6.32.9"
+BR2_KERNEL_LATEST_2_6_32="9"
+BR2_KERNEL_LATEST_2_6_31="12"
+BR2_KERNEL_LATEST_2_6_30="10"
BR2_KERNEL_LATEST_2_6_29="6"
BR2_KERNEL_LATEST_2_6_28="10"
-BR2_KERNEL_LATEST_2_6_27="27"
+BR2_KERNEL_LATEST_2_6_27="45"
BR2_KERNEL_LATEST_2_6_26="8"
-BR2_KERNEL_LATEST_2_6_25="19"
+BR2_KERNEL_LATEST_2_6_25="20"
BR2_KERNEL_LATEST_2_6_24="7"
BR2_KERNEL_PATCH_LEVEL="$(BR2_KERNEL_MINORLEVEL)"
BR2_KERNEL_NEXT_VERSION="2.6.30"
@@ -830,6 +832,8 @@ BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.
BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
BR2_KERNEL_PATCH_SITE="$(BR2_KERNEL_SITE)"
# BR2_LINUX_2_6_STABLE is not set
+# BR2_LINUX_2_6_32 is not set
+# BR2_LINUX_2_6_31 is not set
# BR2_LINUX_2_6_30 is not set
BR2_LINUX_2_6_29=y
# BR2_LINUX_2_6_28 is not set
@@ -837,7 +841,6 @@ BR2_LINUX_2_6_29=y
# BR2_LINUX_2_6_26 is not set
# BR2_LINUX_2_6_25 is not set
# BR2_LINUX_2_6_24 is not set
-# BR2_LINUX_2_6_31 is not set
# BR2_LINUX26_CUSTOM is not set
#
diff --git a/patches/buildroot/2010.02/040-linux-makefile.patch b/patches/buildroot/2010.02/040-linux-makefile.patch
index d66c3c5..532af8d 100644
--- a/patches/buildroot/2010.02/040-linux-makefile.patch
+++ b/patches/buildroot/2010.02/040-linux-makefile.patch
@@ -1,16 +1,16 @@
--- buildroot/target/linux/Makefile.in.advanced 2007-10-27 09:15:08.000000000 +0200
+++ buildroot/target/linux/Makefile.in.advanced.new 2008-10-22 16:06:21.000000000 +0200
-@@ -43,7 +43,8 @@ endif
+@@ -41,7 +41,8 @@ endif
endif
-
+
# Ask the kernel what version number it will use when installing modules
--LINUX26_VERSION_PROBED = `$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) -s kernelrelease`
+-LINUX26_VERSION_PROBED = `$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) --no-print-directory -s kernelrelease`
+LINUX26_VERSION_PROBED = $(LINUX26_VERSION)
-+#`$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) -s kernelrelease`
-
++#`$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) --no-print-directory -s kernelrelease`
+
ifeq ($(BOARD_PATH),)
BOARD_PATH:=$(call qstrip,$(BR2_BOARD_PATH))
-@@ -159,8 +159,9 @@ endif
+@@ -158,8 +158,9 @@ endif
ROOTFS_STRIPPED_SUFFIX=$(call qstrip,$(ROOTFS_SUFFIX))
# -----------------------------------------------------------------------------
# File name for the Linux kernel binary
@@ -21,7 +21,7 @@
ifeq ($(BOARD_NAME),)
BOARD_NAME=$(ARCH)
-@@ -280,8 +282,8 @@ endif
+@@ -330,8 +332,8 @@ endif
$(SED) '/CONFIG_AEABI=y/d' $(LINUX26_DIR)/.config
ifeq ($(BR2_ARM_EABI),y)
echo "CONFIG_AEABI=y" >> $(LINUX26_DIR)/.config
@@ -32,7 +32,7 @@
else
echo "# CONFIG_AEABI is not set" >> $(LINUX26_DIR)/.config
endif
-@@ -310,6 +312,9 @@ ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y
+@@ -360,6 +362,9 @@ ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y
echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
endif
diff --git a/patches/buildroot/2010.02/050-linux-remove_unsupported_kernel_version.patch b/patches/buildroot/2010.02/050-linux-remove_unsupported_kernel_version.patch
index 5b753fc..06d19d8 100644
--- a/patches/buildroot/2010.02/050-linux-remove_unsupported_kernel_version.patch
+++ b/patches/buildroot/2010.02/050-linux-remove_unsupported_kernel_version.patch
@@ -4,19 +4,29 @@ Index: buildroot/target/linux/Config.in.advanced
===================================================================
--- buildroot.orig/target/linux/Config.in.advanced 2010-02-03 13:21:18.000000000 +0100
+++ buildroot/target/linux/Config.in.advanced 2010-02-03 13:27:11.000000000 +0100
-@@ -122,9 +122,11 @@
+@@ -127,17 +127,21 @@
config BR2_LINUX_2_6_STABLE
- bool "The latest stable Linux kernel (2.6.30.2)"
+ bool "The latest stable Linux kernel (2.6.32.9)"
+ depends on !BR2_TARGET_ARMADEUS
+ config BR2_LINUX_2_6_32
+ bool "Linux 2.6.32"
++ depends on !BR2_TARGET_ARMADEUS
+ select BR2_KERNEL_BASE
+
+ config BR2_LINUX_2_6_31
+ bool "Linux 2.6.31"
++ depends on !BR2_TARGET_ARMADEUS
+ select BR2_KERNEL_BASE
+
config BR2_LINUX_2_6_30
bool "Linux 2.6.30"
+ depends on !BR2_TARGET_ARMADEUS
select BR2_KERNEL_BASE
config BR2_LINUX_2_6_29
-@@ -133,6 +135,7 @@
+@@ -146,6 +148,7 @@
config BR2_LINUX_2_6_28
bool "Linux 2.6.28"
@@ -24,7 +34,7 @@ Index: buildroot/target/linux/Config.in.advanced
select BR2_KERNEL_BASE
config BR2_LINUX_2_6_27
-@@ -141,18 +144,22 @@
+@@ -141,14 +144,17 @@
config BR2_LINUX_2_6_26
bool "Linux 2.6.26"
@@ -41,9 +51,4 @@ Index: buildroot/target/linux/Config.in.advanced
+ depends on !BR2_TARGET_ARMADEUS
select BR2_KERNEL_BASE
- config BR2_LINUX_2_6_31
- bool "Linux 2.6.31"
-+ depends on !BR2_TARGET_ARMADEUS
- select BR2_KERNEL_BASE
-
config BR2_LINUX26_CUSTOM
diff --git a/patches/buildroot/2010.02/102-mplayer-replace_us_charset_with_utf8_one.patch b/patches/buildroot/2010.02/102-mplayer-replace_us_charset_with_utf8_one.patch
deleted file mode 100644
index ce149b3..0000000
--- a/patches/buildroot/2010.02/102-mplayer-replace_us_charset_with_utf8_one.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-The mplayer configure script was failing with:
-
- Checking for iconv program ... no
- No working iconv program found, use
- --charset=UTF-8 to continue anyway.
- If you also have problems with iconv library functions use --charset=noconv.
- Messages in the GTK-2 interface will be broken then.
-
-Therefore, we pass --charset=UTF-8 instead of --charset=US-ASCII.
-
-Signed-off-by: Thomas Petazzoni <tho...@fr...>
-
-diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
-index 3d56ee0..538bac9 100644
---- a/package/multimedia/mplayer/mplayer.mk
-+++ b/package/multimedia/mplayer/mplayer.mk
-@@ -54,7 +54,7 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
- --as=$(TARGET_CROSS)as \
- --with-extraincdir=$(STAGING_DIR)/usr/include \
- --with-extralibdir=$(STAGING_DIR)/lib \
-- --charset=US-ASCII \
-+ --charset=UTF-8 \
- --enable-mad \
- --enable-fbdev \
- $(MPLAYER_ENDIAN) \
--- 1.6.3.3
hooks/post-receive
--
armadeus
|
