diff options
| -rw-r--r-- | docs/docs.html | 2 | ||||
| -rw-r--r-- | package/java/classpath/classpath.mk | 7 | ||||
| -rw-r--r-- | target/Config.in.arch | 1 | ||||
| -rw-r--r-- | toolchain/external-toolchain/Config.in | 25 | ||||
| -rw-r--r-- | toolchain/external-toolchain/ext-tool.mk | 75 | ||||
| -rw-r--r-- | toolchain/kernel-headers/Config.in | 4 |
6 files changed, 85 insertions, 29 deletions
diff --git a/docs/docs.html b/docs/docs.html index afc10f247..a31d797a5 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -20,7 +20,7 @@ Current documentation for buildroot includes: <li> If you find that you need help with buildroot, you can ask for help on the - <a href= "lists/uClibc/">buildroot mailing list</a> at buildroot at mail.uclibc.org. + <a href= "/lists/buildroot/">buildroot mailing list</a> at buildroot at mail.uclibc.org. In addition the BusyBox, uClibc, and buildroot developers are also known to hang out on the uClibc IRC channel: #uclibc on irc.freenode.net. </li> diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk index faa634143..71c18a045 100644 --- a/package/java/classpath/classpath.mk +++ b/package/java/classpath/classpath.mk @@ -3,7 +3,7 @@ # classpath 0.96.1 # ############################################################# -CLASSPATH_VERSION = 0.97.1 +CLASSPATH_VERSION = 0.98 CLASSPATH_SOURCE = classpath-$(CLASSPATH_VERSION).tar.gz CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath CLASSPATH_AUTORECONF = NO @@ -51,9 +51,10 @@ CLASSPATH_CONF_OPT = \ --enable-static \ --disable-glibtest --enable-explicit-deps=no \ --disable-debug \ - --disable-gconf-peer --disable-examples --disable-plugin + --disable-gconf-peer --disable-examples --disable-plugin \ + --disable-Werror -CLASSPATH_DEPENDENCIES = uclibc host-pkgconfig libpng jpeg tiff +CLASSPATH_DEPENDENCIES = uclibc host-pkgconfig libpng jpeg ifeq ($(BR2_PACKAGE_ALSA_LIB),y) CLASSPATH_DEPENDENCIES+= alsa-lib diff --git a/target/Config.in.arch b/target/Config.in.arch index 4a20e44ef..611210e87 100644 --- a/target/Config.in.arch +++ b/target/Config.in.arch @@ -465,6 +465,7 @@ config BR2_ARCH default "i486" if BR2_x86_i486 default "i586" if BR2_x86_i586 default "i586" if BR2_x86_pentium_mmx + default "i586" if BR2_x86_geode default "i686" if BR2_x86_i686 default "i686" if BR2_x86_pentium2 default "i686" if BR2_x86_pentium3 diff --git a/toolchain/external-toolchain/Config.in b/toolchain/external-toolchain/Config.in index 71dad0d76..efc8378c0 100644 --- a/toolchain/external-toolchain/Config.in +++ b/toolchain/external-toolchain/Config.in @@ -1,22 +1,17 @@ # if BR2_TOOLCHAIN_EXTERNAL -config BR2_TOOLCHAIN_EXTERNAL_LIB_C - string "The core C library from the external toolchain" - default "libc.so.0" - help - Specify the core C shared library found in the external - toolchain. This is required in addition to any other - libraries to be copied. +choice + prompt "External toolchain C library" + default BR2_TOOLCHAIN_EXTERNAL_UCLIBC -config BR2_TOOLCHAIN_EXTERNAL_LIBS - string "Libraries to copy from the external toolchain" - default "ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0" - help - A space separated list of the shared libraries to be copied - from the external toolchain into the root filesystem. Only - the top-level name is needed, i.e. libc.so, libpthread.so as - the actual shared library symlinked to will be copied also. +config BR2_TOOLCHAIN_EXTERNAL_UCLIBC + bool "uClibc" + +config BR2_TOOLCHAIN_EXTERNAL_GLIBC + bool "glibc" + +endchoice config BR2_TOOLCHAIN_EXTERNAL_STRIP bool diff --git a/toolchain/external-toolchain/ext-tool.mk b/toolchain/external-toolchain/ext-tool.mk index 1c9197b95..b904775f4 100644 --- a/toolchain/external-toolchain/ext-tool.mk +++ b/toolchain/external-toolchain/ext-tool.mk @@ -21,7 +21,6 @@ copy_toolchain_lib_root = \ for FILE in `find $${LIB_DIR} -maxdepth 1 -type l -name "$${LIB}*"`; do \ LIB=`basename $${FILE}`; \ while test \! -z "$${LIB}"; do \ - echo "copy_toolchain_lib_root lib=$${LIB} dst=$${DST}"; \ rm -fr $(TARGET_DIR)$${DST}/$${LIB}; \ mkdir -p $(TARGET_DIR)$${DST}; \ if test -h $${LIB_DIR}/$${LIB}; then \ @@ -49,14 +48,74 @@ copy_toolchain_sysroot = \ if [ -n "$${SYSROOT_DIR}" ]; then cp -a $${SYSROOT_DIR}/* $(STAGING_DIR)/ ; \ find $(STAGING_DIR) -type d | xargs chmod 755; fi -uclibc: dependencies $(TARGET_DIR)/lib/$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_LIB_C))) +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) +EXTERNAL_LIBC=libc.so.0 +EXTERNAL_LIBS=ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0 +else +EXTERNAL_LIBC=libc.so.6 +EXTERNAL_LIBS=ld-linux.so.3 libcrypt.so.1 libdl.so.2 libgcc_s.so.1 libm.so.6 libnsl.so.1 libpthread.so.0 libresolv.so.2 librt.so.1 libutil.so.1 libnss_files.so.2 +endif -$(TARGET_DIR)/lib/$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_LIB_C))): -#")) +check_clibrary = \ + if ! test -f `$(TARGET_CC) -print-file-name=$(EXTERNAL_LIBC)` ; then \ + echo "Incorrect selection of the C library"; \ + exit -1; \ + fi + +# 1: Buildroot option name +# 2: message +check_glibc_feature = \ + if [ x$($(1)) != x"y" ] ; then \ + echo "$(2) available in C library, please enable $(1)" ; \ + exit 1 ; \ + fi + +check_glibc = \ + $(call check_glibc_feature,BR2_LARGEFILE,Large file support) ;\ + $(call check_glibc_feature,BR2_INET_IPV6,IPv6 support) ;\ + $(call check_glibc_feature,BR2_INET_RPC,RPC support) ;\ + $(call check_glibc_feature,BR2_ENABLE_LOCALE,Locale support) ;\ + $(call check_glibc_feature,BR2_USE_WCHAR,Wide char support) + +# 1: uClibc macro name +# 2: Buildroot option name +# 3: uClibc config file +# 4: message +check_uclibc_feature = \ + IS_IN_LIBC=`grep -q "\#define $(1) 1" $(3) && echo y` ; \ + if [ x$($(2)) != x"y" -a x$${IS_IN_LIBC} == x"y" ] ; then \ + echo "$(4) available in C library, please enable $(2)" ; \ + exit 1 ; \ + fi ; \ + if [ x$($(2)) == x"y" -a x$${IS_IN_LIBC} != x"y" ] ; then \ + echo "$(4) not available in C library, please disable $(2)" ; \ + exit 1 ; \ + fi + +check_uclibc = \ + SYSROOT_DIR=`$(TARGET_CC) -v 2>&1 | grep ^Configured | tr " " "\n" | grep -- "--with-sysroot" | cut -f2 -d=`; \ + UCLIBC_CONFIG_FILE=$${SYSROOT_DIR}/usr/include/bits/uClibc_config.h ; \ + $(call check_uclibc_feature,__UCLIBC_HAS_LFS__,BR2_LARGEFILE,$${UCLIBC_CONFIG_FILE},Large file support) ;\ + $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_INET_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\ + $(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_INET_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\ + $(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ + $(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\ + +uclibc: dependencies $(TARGET_DIR)/lib/$(EXTERNAL_LIBC) + +$(TARGET_DIR)/lib/$(EXTERNAL_LIBC): + @echo "Checking external toolchain settings" + @$(call check_clibrary) +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) + @$(call check_uclibc) +else + @$(call check_glibc) +endif mkdir -p $(TARGET_DIR)/lib - @$(call copy_toolchain_lib_root, $(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_LIB_C))), /lib, $(BR2_TOOLCHAIN_EXTERNAL_STRIP)) -#"))) - for libs in $(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_LIBS))); do \ + @echo "Copy external toolchain libraries to target..." + @$(call copy_toolchain_lib_root, $(EXTERNAL_LIBC), /lib, $(BR2_TOOLCHAIN_EXTERNAL_STRIP)) + @for libs in $(EXTERNAL_LIBS); do \ $(call copy_toolchain_lib_root, $$libs, /lib, $(BR2_TOOLCHAIN_EXTERNAL_STRIP)); \ done - $(call copy_toolchain_sysroot) + @echo "Copy external toolchain sysroot to staging..." + @$(call copy_toolchain_sysroot) diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 9fd090360..8a98d3557 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -49,9 +49,9 @@ config BR2_KERNEL_HEADERS_RT config BR2_DEFAULT_KERNEL_HEADERS string default "2.6.26.8" if BR2_KERNEL_HEADERS_2_6_26 - default "2.6.27.24" if BR2_KERNEL_HEADERS_2_6_27 + default "2.6.27.25" if BR2_KERNEL_HEADERS_2_6_27 default "2.6.28.10" if BR2_KERNEL_HEADERS_2_6_28 - default "2.6.29.4" if BR2_KERNEL_HEADERS_2_6_29 + default "2.6.29.5" if BR2_KERNEL_HEADERS_2_6_29 default "2.6.30" if BR2_KERNEL_HEADERS_2_6_30 default "2.6" if BR2_KERNEL_HEADERS_SNAP |