[Armadeus-commitlog] SF.net SVN: armadeus: [666] trunk
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus: [666] trunk
|
From: <jo...@us...> - 2007-10-28 19:42:56
|
Revision: 666
http://armadeus.svn.sourceforge.net/armadeus/?rev=666&view=rev
Author: jorasse
Date: 2007-10-28 12:42:55 -0700 (Sun, 28 Oct 2007)
Log Message:
-----------
[buildroot] updated to snapshoot 20071027: fixed g++ compilation failure
Modified Paths:
--------------
trunk/Makefile
trunk/buildroot/target/device/armadeus/Makefile.in
trunk/buildroot/target/device/armadeus/uClibc.config.arm
trunk/patches/004-Buildroot-defconfig.diff
trunk/patches/030-buildroot-gcc.diff
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2007-10-28 18:32:15 UTC (rev 665)
+++ trunk/Makefile 2007-10-28 19:42:55 UTC (rev 666)
@@ -26,8 +26,8 @@
BUILDROOT_NAME=buildroot
BUILDROOT_FILE_PATH:=downloads
-BUILDROOT_SITE:=ftp://ftp2.armadeus.com/armadeus/download
-BUILDROOT_VERSION:=20071006
+BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
+BUILDROOT_VERSION:=20071027
BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
PATCH_DIR=patches
Modified: trunk/buildroot/target/device/armadeus/Makefile.in
===================================================================
--- trunk/buildroot/target/device/armadeus/Makefile.in 2007-10-28 18:32:15 UTC (rev 665)
+++ trunk/buildroot/target/device/armadeus/Makefile.in 2007-10-28 19:42:55 UTC (rev 666)
@@ -1,20 +1,20 @@
# Override the default uClibc configuration
ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
-ARMADEUS_PATH=target/device/armadeus
-ARMADEUS_TARGET_NAME=$(strip $(subst ",, $(BR2_TARGET_ARMADEUS_NAME)))
-ARMADEUS_CONFIG_PATH=$(ARMADEUS_PATH)/$(ARMADEUS_TARGET_NAME)
+ARMADEUS_PATH:=target/device/armadeus
+ARMADEUS_TARGET_NAME:=$(strip $(subst ",, $(BR2_TARGET_ARMADEUS_NAME)))
+ARMADEUS_CONFIG_PATH:=$(ARMADEUS_PATH)/$(ARMADEUS_TARGET_NAME)
include target/device/armadeus/u-boot/u-boot.mk
include target/device/armadeus/linux/linux.mk
include target/device/armadeus/rootfs/Makefile.in
include target/device/armadeus/$(ARMADEUS_TARGET_NAME)/Makefile.in
-LINUX26_KCONFIG=$(ARMADEUS_CONFIG_PATH)/linux-$(BR2_PACKAGE_LINUX_VERSION).config
-LINUX26_VERSION=$(strip $(subst ",, $(BR2_PACKAGE_LINUX_VERSION)))
-DOWNLOAD_LINUX26_VERSION=$(strip $(subst ",, $(BR2_PACKAGE_LINUX_VERSION)))
+LINUX26_KCONFIG:=$(ARMADEUS_CONFIG_PATH)/linux-$(BR2_PACKAGE_LINUX_VERSION).config
+LINUX26_VERSION:=$(strip $(subst ",, $(BR2_PACKAGE_LINUX_VERSION)))
+DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_PACKAGE_LINUX_VERSION)))
-BR2_PACKAGE_BUSYBOX_CONFIG=$(ARMADEUS_PATH)/busybox.config
-UCLIBC_CONFIG_FILE=$(ARMADEUS_PATH)/uClibc.config.$(ARCH)
+BR2_PACKAGE_BUSYBOX_CONFIG:=$(ARMADEUS_PATH)/busybox.config
+UCLIBC_CONFIG_FILE:=$(ARMADEUS_PATH)/uClibc.config.$(ARCH)
endif
Modified: trunk/buildroot/target/device/armadeus/uClibc.config.arm
===================================================================
--- trunk/buildroot/target/device/armadeus/uClibc.config.arm 2007-10-28 18:32:15 UTC (rev 665)
+++ trunk/buildroot/target/device/armadeus/uClibc.config.arm 2007-10-28 19:42:55 UTC (rev 666)
@@ -1,9 +1,10 @@
#
# Automatically generated make config: don't edit
-# Sat Oct 20 00:54:41 2007
+# Sun Oct 28 19:53:00 2007
#
# TARGET_alpha is not set
TARGET_arm=y
+# TARGET_avr32 is not set
# TARGET_bfin is not set
# TARGET_cris is not set
# TARGET_e1 is not set
@@ -65,7 +66,7 @@
# UCLIBC_HAS_FPU is not set
UCLIBC_HAS_SOFT_FLOAT=y
DO_C99_MATH=y
-KERNEL_HEADERS="/home/eric/arm/armaocto2/buildroot/toolchain_build_arm_nofpu/linux/include"
+KERNEL_HEADERS="/home/eric/arm/armahead/buildroot/toolchain_build_arm/linux/include"
HAVE_DOT_CONFIG=y
#
@@ -198,7 +199,7 @@
#
# uClibc development/debugging options
#
-CROSS_COMPILER_PREFIX="/home/eric/arm/armaocto2/buildroot/build_arm/staging_dir/usr/bin/arm-linux-uclibc-"
+CROSS_COMPILER_PREFIX="/home/eric/arm/armahead/buildroot/build_arm/staging_dir/usr/bin/arm-linux-uclibc-"
UCLIBC_EXTRA_CFLAGS=""
# DODEBUG is not set
# DODEBUG_PT is not set
Modified: trunk/patches/004-Buildroot-defconfig.diff
===================================================================
--- trunk/patches/004-Buildroot-defconfig.diff 2007-10-28 18:32:15 UTC (rev 665)
+++ trunk/patches/004-Buildroot-defconfig.diff 2007-10-28 19:42:55 UTC (rev 666)
@@ -1,617 +1,136 @@
---- buildroot/.defconfig.ori 2007-10-06 09:15:54.000000000 +0200
-+++ buildroot/.defconfig 2007-10-20 19:58:01.000000000 +0200
-@@ -1,19 +1,150 @@
+--- buildroot/.defconfigori 2007-10-28 19:45:33.000000000 +0100
++++ buildroot/.defconfig 2007-10-28 19:48:01.000000000 +0100
+@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-+# Sat Oct 20 19:58:01 2007
+-# Sat Oct 20 19:58:01 2007
++# Sun Oct 28 19:48:01 2007
#
BR2_HAVE_DOT_CONFIG=y
--# BR2_arm is not set
-+BR2_VERSION="0.10.0-svn"
-+# BR2_alpha is not set
-+BR2_arm=y
- # BR2_armeb is not set
-+# BR2_avr32 is not set
- # BR2_cris is not set
--BR2_i386=y
-+# BR2_ia64 is not set
-+# BR2_i386 is not set
- # BR2_m68k is not set
- # BR2_mips is not set
- # BR2_mipsel is not set
-+# BR2_nios2 is not set
- # BR2_powerpc is not set
-+# BR2_s390 is not set
- # BR2_sh is not set
-+# BR2_sh64 is not set
- # BR2_sparc is not set
--BR2_ARCH="i386"
-+# BR2_sparc64 is not set
-+# BR2_x86_64 is not set
-+# BR2_generic_arm is not set
-+# BR2_arm7tdmi is not set
-+# BR2_arm610 is not set
-+# BR2_arm710 is not set
-+# BR2_arm720t is not set
-+BR2_arm920t=y
-+# BR2_arm922t is not set
-+# BR2_arm926t is not set
-+# BR2_arm10t is not set
-+# BR2_arm1136jf_s is not set
-+# BR2_arm1176jz_s is not set
-+# BR2_arm1176jzf_s is not set
-+# BR2_sa110 is not set
-+# BR2_sa1100 is not set
-+# BR2_xscale is not set
-+# BR2_iwmmxt is not set
-+BR2_ARM_TYPE="ARM920T"
-+BR2_ARM_OABI=y
-+# BR2_ARM_EABI is not set
-+BR2_ARCH="arm"
-+BR2_ENDIAN="LITTLE"
-+BR2_GCC_TARGET_TUNE="arm920t"
-+
-+#
-+# Target options
-+#
-+
-+#
-+# Project Options
-+#
-+BR2_PROJECT="armadeus"
-+BR2_HOSTNAME="armadeus"
-+BR2_BANNER="Welcome to the Armadeus development environment."
-+
-+#
-+# Preset Devices
-+#
-+# BR2_TARGET_ARM is not set
-+# BR2_TARGET_ATMEL is not set
-+# BR2_TARGET_SHARP is not set
-+
-+#
-+# Armadeus project Specific Device Support
-+#
-+BR2_TARGET_ARMADEUS=y
-+BR2_TARGET_ARMADEUS_APF9328=y
-+# BR2_TARGET_ARMADEUS_APM9328 is not set
-+BR2_TARGET_ARMADEUS_NAME="apf9328"
-+# BR2_TARGET_ARMADEUS_SDRAM_8 is not set
-+BR2_TARGET_ARMADEUS_SDRAM_16=y
-+# BR2_TARGET_ARMADEUS_SDRAM_32 is not set
-+# BR2_TARGET_ARMADEUS_SDRAM_64 is not set
-+BR2_TARGET_ARMADEUS_SDRAM_SIZE="16"
-+BR2_ARMADEUS_PACKAGE=y
-+# BR2_PACKAGE_MAX5821CTRL is not set
-+
-+#
-+# ---
-+#
-+# BR2_PACKAGE_CH7024CTRL is not set
-+
-+#
-+# ---
-+#
-+BR2_PACKAGE_LINUX_ARM=y
-+# BR2_PACKAGE_LINUX_VERSION_2_6_12 is not set
-+# BR2_PACKAGE_LINUX_VERSION_2_6_17 is not set
-+BR2_PACKAGE_LINUX_VERSION_2_6_18_1=y
-+BR2_PACKAGE_LINUX_VERSION="2.6.18.1"
-+BR2_TARGET_U-BOOT=y
-+
-+#
-+# Generic System Support
-+#
-+# BR2_TARGET_GENERIC_ACCESS_POINT is not set
-+# BR2_TARGET_GENERIC_FIREWALL is not set
-+# BR2_TARGET_GENERIC_DEV_SYSTEM is not set
-+
-+#
-+# Build options
-+#
- BR2_WGET="wget --passive-ftp"
-+BR2_SVN_CO="svn co"
-+BR2_SVN_UP="svn up"
-+BR2_GIT="git clone"
-+BR2_ZCAT="gzip -d -c"
-+BR2_BZCAT="bzcat"
-+BR2_TAR_OPTIONS=""
-+BR2_DL_DIR="$(BASE_DIR)/../downloads"
-+
-+#
-+# Mirrors and Download locations
-+#
-+BR2_SOURCEFORGE_MIRROR="easynews"
-+
-+#
-+# Atmel Mirrors
-+#
-+BR2_ATMEL_MIRROR="ftp://at91dist:distrib@81.80.104.162/AT91_Third_Party_Design_Flow/Linux_Host/"
-+BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-+BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-+BR2_TOPDIR_PREFIX=""
-+BR2_TOPDIR_SUFFIX=""
-+BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-+BR2_GNU_TARGET_SUFFIX="linux-uclibc"
-+BR2_JLEVEL=1
-+# BR2_PREFER_IMA is not set
-+# BR2_DEPRECATED is not set
-+BR2_STRIP_strip=y
-+# BR2_STRIP_sstrip is not set
-+# BR2_STRIP_none is not set
-+# BR2_PREFER_STATIC_LIB is not set
-+# BR2_HAVE_MANPAGES is not set
-+# BR2_HAVE_INFOPAGES is not set
-+BR2_UPDATE_CONFIG=y
-+
-+#
-+# Toolchain
-+#
-+BR2_TOOLCHAIN_BUILDROOT=y
-+# BR2_TOOLCHAIN_EXTERNAL is not set
-+# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-+BR2_TOOLCHAIN_SOURCE=y
+ BR2_VERSION="0.10.0-svn"
+@@ -62,10 +62,6 @@
+ # BR2_TARGET_ARM is not set
+ # BR2_TARGET_ATMEL is not set
+ # BR2_TARGET_SHARP is not set
+-
+-#
+-# Armadeus project Specific Device Support
+-#
+ BR2_TARGET_ARMADEUS=y
+ BR2_TARGET_ARMADEUS_APF9328=y
+ # BR2_TARGET_ARMADEUS_APM9328 is not set
+@@ -75,17 +71,6 @@
+ # BR2_TARGET_ARMADEUS_SDRAM_32 is not set
+ # BR2_TARGET_ARMADEUS_SDRAM_64 is not set
+ BR2_TARGET_ARMADEUS_SDRAM_SIZE="16"
+-BR2_ARMADEUS_PACKAGE=y
+-# BR2_PACKAGE_MAX5821CTRL is not set
+-
+-#
+-# ---
+-#
+-# BR2_PACKAGE_CH7024CTRL is not set
+-
+-#
+-# ---
+-#
+ BR2_PACKAGE_LINUX_ARM=y
+ # BR2_PACKAGE_LINUX_VERSION_2_6_12 is not set
+ # BR2_PACKAGE_LINUX_VERSION_2_6_17 is not set
+@@ -123,13 +108,17 @@
+ BR2_ATMEL_MIRROR="ftp://at91dist:distrib@81.80.104.162/AT91_Third_Party_Design_Flow/Linux_Host/"
+ BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
+ BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
++# BR2_FPU_SUFFIX is not set
+ BR2_TOPDIR_PREFIX=""
+ BR2_TOPDIR_SUFFIX=""
++BR2_ROOTFS_PREFIX="rootfs"
++BR2_ROOTFS_SUFFIX=""
+ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
+ BR2_GNU_TARGET_SUFFIX="linux-uclibc"
+ BR2_JLEVEL=1
+ # BR2_PREFER_IMA is not set
+ # BR2_DEPRECATED is not set
++BR2_RECENT=y
+ BR2_STRIP_strip=y
+ # BR2_STRIP_sstrip is not set
+ # BR2_STRIP_none is not set
+@@ -145,6 +134,11 @@
+ # BR2_TOOLCHAIN_EXTERNAL is not set
+ # BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
+ BR2_TOOLCHAIN_SOURCE=y
++BR2_EXT_GCC_VERSION_4_1_2=y
++BR2_EXT_GCC_VERSION_4_2_1=y
++BR2_EXT_BINUTILS_VERSION_2_17=y
++BR2_EXT_UCLIBC_VERSION_0_9_29=y
++BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
#
# Kernel Header Options
-@@ -25,8 +156,14 @@
- # BR2_KERNEL_HEADERS_2_6_9 is not set
- # BR2_KERNEL_HEADERS_2_6_11 is not set
- # BR2_KERNEL_HEADERS_2_6_12 is not set
-+# BR2_KERNEL_HEADERS_2_6_20_4 is not set
-+# BR2_KERNEL_HEADERS_2_6_20 is not set
-+# BR2_KERNEL_HEADERS_2_6_21_5 is not set
-+# BR2_KERNEL_HEADERS_2_6_21 is not set
-+# BR2_KERNEL_HEADERS_2_6_22_1 is not set
+@@ -161,9 +155,11 @@
+ # BR2_KERNEL_HEADERS_2_6_21_5 is not set
+ # BR2_KERNEL_HEADERS_2_6_21 is not set
+ # BR2_KERNEL_HEADERS_2_6_22_1 is not set
++# BR2_KERNEL_HEADERS_2_6_22_10 is not set
BR2_KERNEL_HEADERS_2_6_22=y
--BR2_DEFAULT_KERNEL_HEADERS="2.6.22.8"
-+# BR2_KERNEL_HEADERS_SNAP is not set
-+BR2_DEFAULT_KERNEL_HEADERS="2.6.22.9"
++# BR2_KERNEL_HEADERS_2_6_23 is not set
+ # BR2_KERNEL_HEADERS_SNAP is not set
+-BR2_DEFAULT_KERNEL_HEADERS="2.6.22.9"
++BR2_DEFAULT_KERNEL_HEADERS="2.6.22.10"
#
# uClibc Options
-@@ -34,7 +171,6 @@
- # BR2_UCLIBC_VERSION_0_9_28_3 is not set
- BR2_UCLIBC_VERSION_0_9_29=y
- # BR2_UCLIBC_VERSION_SNAPSHOT is not set
--BR2_USE_UCLIBC_SNAPSHOT="snapshot"
- BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.29.config"
- # BR2_ENABLE_LOCALE is not set
- # BR2_PTHREADS_NONE is not set
-@@ -42,35 +178,428 @@
- BR2_PTHREADS_OLD=y
- # BR2_PTHREADS_NATIVE is not set
- # BR2_PTHREAD_DEBUG is not set
-+# BR2_UCLIBC_PROGRAM_INVOCATION is not set
-
- #
- # Binutils Options
- #
-+# BR2_BINUTILS_VERSION_2_17 is not set
-+# BR2_BINUTILS_VERSION_2_17_50_0_17 is not set
- BR2_BINUTILS_VERSION_2_18=y
- # BR2_BINUTILS_VERSION_2_18_50_0_1 is not set
- BR2_BINUTILS_VERSION="2.18"
- BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
-
--
- #
--# Gcc Options
-+# GCC Options
- #
--# BR2_GCC_VERSION_3_4_6 is not set
-+BR2_GCC_VERSION_3_4_6=y
- # BR2_GCC_VERSION_4_0_4 is not set
- # BR2_GCC_VERSION_4_1_2 is not set
- # BR2_GCC_VERSION_4_2_0 is not set
--BR2_GCC_VERSION_4_2_1=y
-+# BR2_GCC_VERSION_4_2_1 is not set
- # BR2_GCC_IS_SNAP is not set
--BR2_GCC_VERSION="4.2.1"
-+# BR2_GCC_SUPPORTS_SYSROOT is not set
-+# BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
-+BR2_GCC_VERSION="3.4.6"
+@@ -204,9 +200,10 @@
+ BR2_GCC_VERSION="3.4.6"
# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
BR2_EXTRA_GCC_CONFIG_OPTIONS=""
--BR2_GCC_SHARED_LIBGCC=y
-+# BR2_GCC_CROSS_CXX is not set
-+# BR2_GCC_CROSS_FORTRAN is not set
- # BR2_INSTALL_LIBSTDCPP is not set
-+# BR2_INSTALL_OBJC is not set
-+# BR2_INSTALL_FORTRAN is not set
-+BR2_GCC_SHARED_LIBGCC=y
-+
-+#
-+# Ccache Options
-+#
-+BR2_CCACHE=y
-+
-+#
-+# Gdb Options
-+#
- # BR2_PACKAGE_GDB is not set
--# BR2_PACKAGE_GDB_SERVER is not set
--# BR2_ENABLE_MULTILIB is not set
-+BR2_PACKAGE_GDB_SERVER=y
-+BR2_PACKAGE_GDB_HOST=y
-+# BR2_GDB_VERSION_6_2_1 is not set
-+# BR2_GDB_VERSION_6_3 is not set
-+# BR2_GDB_VERSION_6_4 is not set
-+# BR2_GDB_VERSION_6_5 is not set
-+BR2_GDB_VERSION_6_6=y
-+# BR2_GDB_VERSION_SNAPSHOT is not set
-+BR2_GDB_VERSION="6.6"
-+
-+#
-+# elf2flt
-+#
-+# BR2_ELF2FLT is not set
-+# BR2_MKLIBS is not set
-+
-+#
-+# Common Toolchain Options
-+#
-+BR2_PACKAGE_SSTRIP_TARGET=y
-+# BR2_PACKAGE_SSTRIP_HOST is not set
-+BR2_ENABLE_MULTILIB=y
- BR2_LARGEFILE=y
-+BR2_INET_IPV6=y
-+BR2_INET_RPC=y
-+BR2_USE_WCHAR=y
-+BR2_SOFT_FLOAT=y
- BR2_TARGET_OPTIMIZATION="-Os -pipe"
-+BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
-
-+#
-+# Package Selection for the target
-+#
-+BR2_PACKAGE_BUSYBOX=y
-+# BR2_BUSYBOX_VERSION_1_2_2_1 is not set
-+# BR2_BUSYBOX_VERSION_1_6_1 is not set
-+# BR2_BUSYBOX_VERSION_1_7_0 is not set
-+# BR2_BUSYBOX_VERSION_1_7_1 is not set
-+BR2_BUSYBOX_VERSION_1_7_2=y
-+# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-+BR2_BUSYBOX_VERSION="1.7.2"
-+BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS=y
-+BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.6.0.config"
- BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
-+# BR2_PACKAGE_BUSYBOX_SKELETON is not set
-+
-+#
-+# The minimum needed to build a uClibc development system
-+#
-+# BR2_PACKAGE_BASH is not set
-+# BR2_PACKAGE_BZIP2 is not set
-+# BR2_PACKAGE_DIFFUTILS is not set
-+# BR2_PACKAGE_FLEX is not set
-+# BR2_PACKAGE_GCC_TARGET is not set
-+# BR2_PACKAGE_MAKE is not set
-
-+#
-+# Other development stuff
-+#
-+# BR2_PACKAGE_AUTOCONF is not set
-+# BR2_PACKAGE_AUTOMAKE is not set
-+# BR2_PACKAGE_BISON is not set
-+# BR2_PACKAGE_CCACHE_TARGET is not set
-+# BR2_PACKAGE_CVS is not set
-+# BR2_PACKAGE_DISTCC is not set
-+# BR2_PACKAGE_DMALLOC is not set
-+# BR2_PACKAGE_EXPAT is not set
-+# BR2_PACKAGE_FAKEROOT is not set
-+BR2_HOST_FAKEROOT=y
-+# BR2_PACKAGE_FPGAREGS is not set
-+# BR2_PACKAGE_GETTEXT is not set
-+# BR2_PACKAGE_LIBINTL is not set
-+# BR2_PACKAGE_LIBGMP is not set
-+# BR2_PACKAGE_LIBMPFR is not set
-+# BR2_PACKAGE_LIBTOOL is not set
-+# BR2_PACKAGE_M4 is not set
-+# BR2_PACKAGE_PKGCONFIG is not set
-+# BR2_READLINE is not set
-+# BR2_PACKAGE_XERCES is not set
-+
-+#
-+# Other stuff
-+#
-+# BR2_PACKAGE_AT is not set
-+# BR2_PACKAGE_BERKELEYDB is not set
-+# BR2_PACKAGE_BSDIFF is not set
-+# BR2_PACKAGE_CUSTOMIZE is not set
-+# BR2_PACKAGE_DASH is not set
-+# BR2_PACKAGE_FILE is not set
-+# BR2_PACKAGE_IPKG_C is not set
-+# BR2_PACKAGE_IPKG_SH is not set
-+# BR2_PACKAGE_KEXEC is not set
-+# BR2_PACKAGE_LIBDAEMON is not set
-+# BR2_PACKAGE_LIBELF is not set
-+# BR2_PACKAGE_LIBEVENT is not set
-+# BR2_PACKAGE_LIBFLOAT is not set
-+# BR2_PACKAGE_LIBGCRYPT is not set
-+# BR2_PACKAGE_LIBGPG_ERROR is not set
-+# BR2_PACKAGE_LIBLOCKFILE is not set
-+# BR2_PACKAGE_LIBSYSFS is not set
-+# BR2_PACKAGE_LIBXML2 is not set
-+# BR2_PACKAGE_LOCKFILE_PROGS is not set
-+# BR2_PACKAGE_LSOF is not set
-+# BR2_PACKAGE_LTP-TESTSUITE is not set
-+# BR2_PACKAGE_LTRACE is not set
-+# BR2_PACKAGE_LTT is not set
-+# BR2_PACKAGE_LUA is not set
-+# BR2_PACKAGE_PORTAGE is not set
-+# BR2_PACKAGE_SQLITE is not set
-+# BR2_PACKAGE_STRACE is not set
-+# BR2_PACKAGE_SUDO is not set
-+BR2_NETWORK_SUPPORT=y
-+
-+#
-+# Networking applications
-+#
-+# BR2_PACKAGE_ARGUS is not set
-+# BR2_PACKAGE_AVAHI is not set
-+# BR2_PACKAGE_BOA is not set
-+# BR2_PACKAGE_BIND is not set
-+# BR2_PACKAGE_BRIDGE is not set
-+# BR2_PACKAGE_CURL is not set
-+# BR2_PACKAGE_LIBCURL is not set
-+# BR2_PACKAGE_DNSMASQ is not set
-+# BR2_PACKAGE_DROPBEAR is not set
-+# BR2_PACKAGE_ETHTOOL is not set
-+# BR2_PACKAGE_HASERL is not set
-+# BR2_PACKAGE_IRDA_UTILS is not set
-+# BR2_PACKAGE_IPERF is not set
-+# BR2_PACKAGE_IPROUTE2 is not set
-+# BR2_PACKAGE_IPSEC_TOOLS is not set
-+# BR2_PACKAGE_IPTABLES is not set
-+# BR2_PACKAGE_L2TP is not set
-+# BR2_PACKAGE_LIBCGI is not set
-+# BR2_PACKAGE_LIBCGICC is not set
-+# BR2_PACKAGE_LIBPCAP is not set
-+# BR2_PACKAGE_LINKS is not set
-+# BR2_PACKAGE_LMBENCH is not set
-+# BR2_PACKAGE_LRZSZ is not set
-+# BR2_PACKAGE_MDNSRESPONDER is not set
-+# BR2_PACKAGE_MROUTED is not set
-+# BR2_PACKAGE_MUTT is not set
-+# BR2_PACKAGE_NBD is not set
-+# BR2_PACKAGE_NCFTP is not set
-+# BR2_PACKAGE_NETKITBASE is not set
-+# BR2_PACKAGE_NETKITTELNET is not set
-+# BR2_PACKAGE_NETPLUG is not set
-+# BR2_PACKAGE_NETSNMP is not set
-+# BR2_PACKAGE_NFS_UTILS is not set
-+# BR2_PACKAGE_NTP is not set
-+# BR2_PACKAGE_OLSR is not set
-+# BR2_PACKAGE_OPENNTPD is not set
-+# BR2_PACKAGE_OPENSSH is not set
-+# BR2_PACKAGE_OPENSSL is not set
-+# BR2_PACKAGE_OPENVPN is not set
-+# BR2_PACKAGE_OPENSWAN is not set
-+BR2_PACKAGE_PORTMAP=y
-+# BR2_PACKAGE_PPPD is not set
-+# BR2_PACKAGE_RP_PPPOE is not set
-+# BR2_PACKAGE_PPTP_LINUX is not set
-+# BR2_PACKAGE_PROFTPD is not set
-+# BR2_PACKAGE_QUAGGA is not set
-+
-+#
-+# quagga suite
-+#
-+# BR2_PACKAGE_QUAGGA_ZEBRA is not set
-+# BR2_PACKAGE_QUAGGA_BGPD is not set
-+# BR2_PACKAGE_QUAGGA_RIPD is not set
-+# BR2_PACKAGE_QUAGGA_RIPNGD is not set
-+# BR2_PACKAGE_QUAGGA_OSPFD is not set
-+# BR2_PACKAGE_QUAGGA_OSPF6D is not set
-+# BR2_PACKAGE_QUAGGA_WATCHQUAGGA is not set
-+# BR2_PACKAGE_QUAGGA_ISISD is not set
-+# BR2_PACKAGE_RSYNC is not set
-+# BR2_PACKAGE_SAMBA is not set
-+# BR2_PACKAGE_SOCAT is not set
-+# BR2_PACKAGE_STUNNEL is not set
-+# BR2_PACKAGE_TCPDUMP is not set
-+# BR2_PACKAGE_DHCPDUMP is not set
-+# BR2_PACKAGE_TFTPD is not set
-+# BR2_PACKAGE_TN5250 is not set
-+# BR2_PACKAGE_TTCP is not set
-+# BR2_PACKAGE_VPNC is not set
-+# BR2_PACKAGE_VTUN is not set
-+# BR2_PACKAGE_WIRELESS_TOOLS is not set
-+BR2_BLOCKDEV_SUPPORT=y
-+# BR2_PACKAGE_DBUS is not set
-+# BR2_PACKAGE_DM is not set
-+# BR2_PACKAGE_DMRAID is not set
-+# BR2_PACKAGE_E2FSPROGS is not set
-+# BR2_PACKAGE_GADGETFS_TEST is not set
-+# BR2_PACKAGE_HAL is not set
-+# BR2_PACKAGE_HWDATA is not set
-+# BR2_PACKAGE_IMXREGS is not set
-+# BR2_PACKAGE_IOSTAT is not set
-+# BR2_PACKAGE_LIBAIO is not set
-+# BR2_PACKAGE_LIBRAW1394 is not set
-+# BR2_PACKAGE_LIBUSB is not set
-+# BR2_PACKAGE_LM_SENSORS is not set
-+# BR2_PACKAGE_LVM2 is not set
-+# BR2_PACKAGE_MDADM is not set
-+# BR2_PACKAGE_MEMTESTER is not set
-+# BR2_PACKAGE_MKDOSFS is not set
-+BR2_PACKAGE_MTD=y
-+BR2_PACKAGE_MTD_UTILS=y
-+# BR2_PACKAGE_MTD_20061007 is not set
-+# BR2_PACKAGE_MTD_20050122 is not set
-+# BR2_PACKAGE_MTD_SNAPSHOT is not set
-+
-+#
-+# MTD tools selection
-+#
-+BR2_PACKAGE_MTD_FLASH_ERASE=y
-+BR2_PACKAGE_MTD_FLASH_ERASEALL=y
-+BR2_PACKAGE_MTD_FLASH_INFO=y
-+BR2_PACKAGE_MTD_FLASH_LOCK=y
-+BR2_PACKAGE_MTD_FLASH_UNLOCK=y
-+BR2_PACKAGE_MTD_FLASHCP=y
-+BR2_PACKAGE_MTD_ERASE=y
-+BR2_PACKAGE_MTD_JFFS2DUMP=y
-+BR2_PACKAGE_MTD_JFFS3DUMP=y
-+BR2_PACKAGE_MTD_SUMTOOL=y
-+BR2_PACKAGE_MTD_FTL_CHECK=y
-+BR2_PACKAGE_MTD_FTL_FORMAT=y
-+BR2_PACKAGE_MTD_NFTL_FORMAT=y
-+BR2_PACKAGE_MTD_NFTLDUMP=y
-+BR2_PACKAGE_MTD_MKFSJFFS2=y
-+BR2_PACKAGE_MTD_MKFSJFFS=y
-+BR2_PACKAGE_MTD_NANDDUMP=y
-+BR2_PACKAGE_MTD_NANDWRITE=y
-+BR2_PACKAGE_MTD_MTD_DEBUG=y
-+BR2_PACKAGE_MTD_DOCFDISK=y
-+BR2_PACKAGE_MTD_DOC_LOADBIOS=y
-+# BR2_PACKAGE_PCIUTILS is not set
-+# BR2_PACKAGE_RAIDTOOLS is not set
-+# BR2_PACKAGE_SETSERIAL is not set
-+# BR2_PACKAGE_SMARTMONTOOLS is not set
-+# BR2_PACKAGE_USBMOUNT is not set
-+# BR2_PACKAGE_USBUTILS is not set
-+# BR2_PACKAGE_WIPE is not set
-+# BR2_PACKAGE_XFSPROGS is not set
-+BR2_AUDIO_SUPPORT=y
-+# BR2_PACKAGE_ALSA_LIB is not set
-+# BR2_PACKAGE_ASTERISK is not set
-+# BR2_PACKAGE_AUMIX is not set
-+# BR2_PACKAGE_LIBMAD is not set
-+# BR2_PACKAGE_LIBSNDFILE is not set
-+# BR2_PACKAGE_LIBVORBIS is not set
-+# BR2_PACKAGE_MADPLAY is not set
-+# BR2_PACKAGE_MPG123 is not set
-+BR2_GRAPHIC_SUPPORT=y
-+
-+#
-+# text rendering libraries
-+#
-+# BR2_PACKAGE_NCURSES is not set
-+# BR2_PACKAGE_NEWT is not set
-+# BR2_PACKAGE_SLANG is not set
-+
-+#
-+# text rendering applications
-+#
-+# BR2_PACKAGE_DIALOG is not set
-+
-+#
-+# graphic libraries
-+#
-+# BR2_PACKAGE_ALLEGRO is not set
-+# BR2_PACKAGE_DIRECTFB is not set
-+# BR2_PACKAGE_IMAGEMAGICK is not set
-+# BR2_PACKAGE_JPEG is not set
-+# BR2_PACKAGE_LCD4LINUX is not set
-+# BR2_PACKAGE_LIBPNG is not set
-+# BR2_PACKAGE_LIBUNGIF is not set
-+# BR2_PACKAGE_SDL is not set
-+# BR2_PACKAGE_TIFF is not set
-+
-+#
-+# busybox graphic applications
-+#
-+
-+#
-+# --> (May be broken in busybox)
-+#
-+# BR2_PACKAGE_FBV is not set
-+# BR2_PACKAGE_FBSET is not set
-+
-+#
-+# other GUIs
-+#
-+# BR2_PACKAGE_QTE is not set
-+# BR2_PACKAGE_QTOPIA4 is not set
-+BR2_PACKAGE_XSERVER_none=y
-+# BR2_PACKAGE_XSERVER_x11r7 is not set
-+# BR2_PACKAGE_XSERVER_xorg is not set
-+# BR2_PACKAGE_XSERVER_tinyx is not set
-+BR2_X11_PREFIX="/usr"
-+
-+#
-+# X libraries and helper libraries
-+#
-+# BR2_PACKAGE_ATK is not set
-+# BR2_PACKAGE_PANGO is not set
-+# BR2_PACKAGE_LIBDRM is not set
-+# BR2_PACKAGE_LIBGLIB12 is not set
-+# BR2_PACKAGE_LIBGLIB2 is not set
-+# BR2_PACKAGE_FONTCONFIG is not set
-+# BR2_PACKAGE_FREETYPE is not set
-+# BR2_PACKAGE_TSLIB is not set
-+
-+#
-+# X Window managers
-+#
-+# BR2_PACKAGE_MATCHBOX is not set
-+
-+#
-+# X applications
-+#
-+
-+#
-+# Video libraries/codecs and applications
-+#
-+# BR2_PACKAGE_MPLAYER is not set
-+BR2_COMPRESSOR_SUPPORT=y
-+BR2_PACKAGE_LZO=y
-+# BR2_PACKAGE_LZMA_TARGET is not set
-+# BR2_PACKAGE_LZMA_HOST is not set
-+BR2_PACKAGE_ZLIB=y
-+# BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
-+BR2_SCRIPTING_SUPPORT=y
-+# BR2_PACKAGE_MICROPERL is not set
-+# BR2_PACKAGE_PYTHON is not set
-+# BR2_PACKAGE_RUBY is not set
-+# BR2_PACKAGE_TCL is not set
-+# BR2_PACKAGE_PHP is not set
-+
-+#
-+# Target filesystem options
-+#
-+
-+#
-+# filesystem for target device
-+#
-+# BR2_TARGET_ROOTFS_CRAMFS is not set
-+# BR2_TARGET_ROOTFS_CLOOP is not set
-+# BR2_TARGET_ROOTFS_EXT2 is not set
-+BR2_TARGET_ROOTFS_JFFS2=y
-+BR2_TARGET_ROOTFS_JFFS2_FLASH=y
-+# BR2_TARGET_ROOTFS_JFFS2_DATAFLASH is not set
-+BR2_TARGET_ROOTFS_JFFS2_PAGESIZE=0x1000
-+BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x20000
-+# BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER is not set
-+# BR2_JFFS2_TARGET_SREC is not set
-+BR2_TARGET_ROOTFS_JFFS2_PAD=y
-+BR2_TARGET_ROOTFS_JFFS2_PADSIZE=0x0
-+BR2_TARGET_ROOTFS_JFFS2_LE=y
-+# BR2_TARGET_ROOTFS_JFFS2_BE is not set
-+# BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
-+BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-+BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
-+# BR2_TARGET_ROOTFS_SQUASHFS is not set
-+BR2_TARGET_ROOTFS_TAR=y
-+BR2_TARGET_ROOTFS_TAR_NONE=y
-+# BR2_TARGET_ROOTFS_TAR_GZIP is not set
-+# BR2_TARGET_ROOTFS_TAR_BZIP2 is not set
-+# BR2_TARGET_ROOTFS_TAR_LZMA is not set
-+BR2_TARGET_ROOTFS_TAR_OPTIONS=""
-+BR2_TARGET_ROOTFS_TAR_COPYTO=""
-+# BR2_TARGET_ROOTFS_CPIO is not set
-+# BR2_TARGET_ROOTFS_INITRAMFS is not set
-+
-+#
-+# bootloader for target device
-+#
-+
-+#
-+# Kernel
-+#
-+# BR2_KERNEL_none is not set
-+BR2_KERNEL_LINUX=y
-+# BR2_KERNEL_HURD is not set
-+# BR2_PACKAGE_LINUX is not set
+-# BR2_GCC_CROSS_CXX is not set
++BR2_GCC_CROSS_CXX=y
+ # BR2_GCC_CROSS_FORTRAN is not set
+-# BR2_INSTALL_LIBSTDCPP is not set
++BR2_INSTALL_LIBSTDCPP=y
++# BR2_INSTALL_LIBGCJ is not set
+ # BR2_INSTALL_OBJC is not set
+ # BR2_INSTALL_FORTRAN is not set
+ BR2_GCC_SHARED_LIBGCC=y
+@@ -283,6 +280,7 @@
+ # BR2_PACKAGE_AUTOMAKE is not set
+ # BR2_PACKAGE_BISON is not set
+ # BR2_PACKAGE_CCACHE_TARGET is not set
++# BR2_PACKAGE_CH7024CTRL is not set
+ # BR2_PACKAGE_CVS is not set
+ # BR2_PACKAGE_DISTCC is not set
+ # BR2_PACKAGE_DMALLOC is not set
+@@ -296,6 +294,7 @@
+ # BR2_PACKAGE_LIBMPFR is not set
+ # BR2_PACKAGE_LIBTOOL is not set
+ # BR2_PACKAGE_M4 is not set
++# BR2_PACKAGE_MAX5821CTRL is not set
+ # BR2_PACKAGE_PKGCONFIG is not set
+ # BR2_READLINE is not set
+ # BR2_PACKAGE_XERCES is not set
+@@ -568,8 +567,11 @@
+ # BR2_TARGET_ROOTFS_CLOOP is not set
+ # BR2_TARGET_ROOTFS_EXT2 is not set
+ BR2_TARGET_ROOTFS_JFFS2=y
+-BR2_TARGET_ROOTFS_JFFS2_FLASH=y
+-# BR2_TARGET_ROOTFS_JFFS2_DATAFLASH is not set
++# BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set
++# BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
++BR2_TARGET_ROOTFS_JFFS2_FLASH_128=y
++# BR2_TARGET_ROOTFS_JFFS2_FLASH_64 is not set
++# BR2_TARGET_ROOTFS_JFFS2_CUSTOM is not set
+ BR2_TARGET_ROOTFS_JFFS2_PAGESIZE=0x1000
+ BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x20000
+ # BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER is not set
+@@ -599,7 +601,8 @@
+ #
+ # Kernel
+ #
+-# BR2_KERNEL_none is not set
+-BR2_KERNEL_LINUX=y
++BR2_KERNEL_none=y
++# BR2_KERNEL_LINUX_ADVANCED is not set
++# BR2_KERNEL_LINUX is not set
+ # BR2_KERNEL_HURD is not set
+ # BR2_PACKAGE_LINUX is not set
Modified: trunk/patches/030-buildroot-gcc.diff
===================================================================
--- trunk/patches/030-buildroot-gcc.diff 2007-10-28 18:32:15 UTC (rev 665)
+++ trunk/patches/030-buildroot-gcc.diff 2007-10-28 19:42:55 UTC (rev 666)
@@ -1,43 +0,0 @@
-diff -purN -x .svn -x '*~' buildrootref/toolchain/gcc/gcc-uclibc-3.x.mk buildroot/toolchain/gcc/gcc-uclibc-3.x.mk
---- buildrootref/toolchain/gcc/gcc-uclibc-3.x.mk 2007-10-15 22:41:00.000000000 +0200
-+++ buildroot/toolchain/gcc/gcc-uclibc-3.x.mk 2007-10-20 18:04:02.000000000 +0200
-@@ -327,8 +327,8 @@ endif
- #
- mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin
- touch $@
-
--$(GCC_BUILD_DIR2)/.libs_installed: $(GCC_BUILD_DIR2)/.installed
-+$(TARGET_DIR)/lib/libgcc_s*: $(GCC_BUILD_DIR2)/.installed
- ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
- # These are in /lib, so...
- rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
-@@ -336,6 +335,8 @@ ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
- $(TARGET_DIR)/lib/
- -strip --strip-unneeded $(TARGET_DIR)/lib/libgcc_s*
- endif
-+
-+$(GCC_BUILD_DIR2)/.libs_installed: $(GCC_BUILD_DIR2)/.installed $(TARGET_DIR)/lib/libgcc_s*
- ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
- cp -dpf $(STAGING_DIR)/lib/libstdc++.so* $(TARGET_DIR)/usr/lib/
- -strip --strip-unneeded $(TARGET_DIR)/usr/lib/libstdc++.so*
-diff -purN -x .svn -x '*~' buildrootref/toolchain/gcc/gcc-uclibc-4.x.mk buildroot/toolchain/gcc/gcc-uclibc-4.x.mk
---- buildrootref/toolchain/gcc/gcc-uclibc-4.x.mk 2007-10-15 22:41:00.000000000 +0200
-+++ buildroot/toolchain/gcc/gcc-uclibc-4.x.mk 2007-10-20 18:06:25.000000000 +0200
-@@ -340,14 +340,16 @@ endif
- #
- mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin
- touch $@
-
--$(GCC_BUILD_DIR2)/.libs_installed: $(GCC_BUILD_DIR2)/.installed
-+$(TARGET_DIR)/lib/libgcc_s*: $(GCC_BUILD_DIR2)/.installed
- ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
- # These are in /lib, so...
- rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
- cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* \
- $(TARGET_DIR)/lib/
- endif
-+
-+$(GCC_BUILD_DIR2)/.libs_installed: $(GCC_BUILD_DIR2)/.installed $(TARGET_DIR)/lib/libgcc_s*
- ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
- cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libstdc++.so* \
- $(TARGET_DIR)/usr/lib/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
