Merge branch 'master' of git://openadk.org/git/openadk

13 files changed, 93 insertions, 93 deletions

diff --git a/mk/build.mk b/mk/build.mk
index b1a2c814f..f3c0aec23 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -252,10 +252,10 @@ endif
 			echo $$symbol >> $(TOPDIR)/.defconfig; \
 		done; \
 	fi
-ifneq (,$(filter %_qemu,${TARGET}))
+ifneq (,$(filter qemu%,${TARGET}))
 	@echo ADK_LINUX_QEMU=y >> $(TOPDIR)/.defconfig
 endif
-ifneq (,$(filter %_rescue,${TARGET}))
+ifneq (,$(filter rescue%,${TARGET}))
 	@echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/.defconfig
 endif
 ifneq (,$(filter rb%,${TARGET}))
diff --git a/package/eglibc/Config.in b/package/eglibc/Config.in
index 6265c5b58..6e1daf463 100644
--- a/package/eglibc/Config.in
+++ b/package/eglibc/Config.in
@@ -9,7 +9,7 @@ config ADK_PACKAGE_EGLIBC
 
 config ADK_PACKAGE_EGLIBC_DEV
 	prompt "eglibc-dev........................... development files"
-	bool
+	tristate
 	default n
 	depends on ADK_TARGET_LIB_EGLIBC
 	help
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index a7cf97fbe..de7c80e45 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -14,6 +14,10 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,EGLIBC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,EGLIBC_DEV,$(PKG_NAME)-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_EGLIBC_DEV}+=	eglibc-dev-install
+
 EGLIBC_CONFOPTS:=	\
 			--build=$(GNU_HOST_NAME) \
 			--host=$(REAL_GNU_TARGET_NAME) \
@@ -40,16 +44,11 @@ EGLIBC_ENV:=		PATH='${TARGET_PATH}' \
 			libc_cv_gnu99_inline=yes \
 			libc_cv_slibdir="/lib" 
 
-do-extract:
-
-# do nothing, eglibc is already build in toolchain directory
-do-install:
+# compile nothing, eglibc is already build in toolchain directory
+do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc $(IDIR_EGLIBC)/usr/lib
 	# install /etc/localtime from host system (FIXME)
 	${CP} /etc/localtime $(IDIR_EGLIBC)/etc
-ifeq ($(ADK_SSP),y)
-	$(CP) $(STAGING_DIR)/lib/libssp.so* $(IDIR_EGLIBC)/lib/
-endif
 	$(CP) $(STAGING_DIR)/lib/ld-* $(IDIR_EGLIBC)/lib/
 	$(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_EGLIBC)/lib/
 	-for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
@@ -63,8 +62,11 @@ endif
 	cd $(IDIR_EGLIBC)/lib && ln -sf librt.so.1 librt.so
 	cd $(IDIR_EGLIBC)/lib && ln -sf libcrypt.so.1 libcrypt.so
 	cd $(IDIR_EGLIBC)/lib && ln -sf libdl.so.2 libdl.so
+
+eglibc-dev-install:
 	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
+		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_EGLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \
@@ -77,6 +79,6 @@ endif
 	PATH='${TARGET_PATH}' \
 	$(MAKE) -C $(WRKBUILD) \
 		install-headers install-bootstrap-headers=yes
-	@find $(IDIR_EGLIBC_DEV) -name .install -delete
+	@find $(IDIR_EGLIBC_DEV) -name .install -exec rm {} \;
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/glibc/Config.in b/package/glibc/Config.in
index b6879a384..6e7db32c9 100644
--- a/package/glibc/Config.in
+++ b/package/glibc/Config.in
@@ -9,7 +9,7 @@ config ADK_PACKAGE_GLIBC
 
 config ADK_PACKAGE_GLIBC_DEV
 	prompt "glibc-dev........................... development files"
-	bool
+	tristate
 	default n
 	depends on ADK_TARGET_LIB_GLIBC
 	help
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 3cd49f64b..45145d230 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -28,17 +28,17 @@ GLIBC_CONFOPTS:=          \
 			--enable-add-ons
 
 $(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,GLIBC_DEV,glibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-do-extract:
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_GLIBC_DEV}+=		glibc-dev-install
 
-# do nothing, glibc is already build in toolchain directory
-do-install:
+# compile nothing, glibc is already build in toolchain directory
+do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc
 	# install /etc/localtime from host system (FIXME)
 	${CP} /etc/localtime $(IDIR_GLIBC)/etc
-ifeq ($(ADK_SSP),y)
-	$(CP) $(STAGING_DIR)/lib/libssp.so* $(IDIR_GLIBC)/lib/
-endif
 	$(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_GLIBC)/lib/
 	$(CP) $(STAGING_DIR)/lib/ld-*.so* $(IDIR_GLIBC)/lib/
 	-for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
@@ -47,8 +47,11 @@ endif
 	done
 	# create ld.so link for mips gcc linker option
 	cd $(IDIR_GLIBC)/lib && ln -sf ld-linux.so.2 ld.so.1
+
+glibc-dev-install:
 	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
+		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \
@@ -63,6 +66,6 @@ endif
 		install-headers
 	touch $(IDIR_GLIBC_DEV)/usr/include/gnu/stubs.h
 	touch $(IDIR_GLIBC_DEV)/usr/include/bits/stdio_lim.h
-	@find $(IDIR_GLIBC_DEV) -name .install -delete
+	@find $(IDIR_GLIBC_DEV) -name .install -exec rm {} \;
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 8cc828864..4100fd313 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -9,7 +9,7 @@ config ADK_PACKAGE_UCLIBC
 
 config ADK_PACKAGE_UCLIBC_DEV
 	prompt "uClibc-dev........................... development files"
-	bool
+	tristate
 	default n
 	depends on ADK_TARGET_LIB_UCLIBC
 	help
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index 4d96eceae..e6d080a37 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -14,8 +14,12 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,UCLIBC_DEV,uclibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_UCLIBC_DEV}+=	uclibc-dev-install
+
 # do nothing, uClibc is already build in toolchain directory
-do-install:
+do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} $(IDIR_UCLIBC)/lib $(IDIR_UCLIBC)/etc
 	# create timezone file
 	echo 'CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00' > $(IDIR_UCLIBC)/etc/TZ
@@ -28,6 +32,8 @@ do-install:
 		$(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_UCLIBC)/lib/; \
 		$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_UCLIBC)/lib/; \
 	done
+
+uclibc-dev-install:
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index fe94d8317..894bb3a57 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -18,7 +18,7 @@ test -z "$BASH_VERSION$KSH_VERSION" && exec $BASH $0 "$@"
 
 [[ -n $BASH_VERSION ]] && shopt -s extglob
 topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-OStype=$(env NOFAKE=yes uname)
+OStype=$(uname)
 out=0
 
 . $topdir/.config
@@ -88,6 +88,10 @@ if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
 	NEED_XMLTO="$NEED_XMLTO libXfont"
 fi
 
+if [[ -n $ADK_PACKAGE_EGLIBC ]]; then
+	NEED_GPERF="$NEED_GPERF eglibc"
+fi
+
 if [[ -n $NEED_GETTEXT ]]; then
 	if ! which xgettext >/dev/null 2>&1; then
 		echo >&2 You need gettext to build $NEED_GETTEXT
@@ -141,6 +145,13 @@ if [[ -n $NEED_BISON ]]; then
 	fi
 fi
 
+if [[ -n $NEED_GPERF ]]; then
+	if ! which gperf >/dev/null 2>&1; then
+		echo >&2 You need gperf to build $NEED_GPERF
+		out=1
+	fi
+fi
+
 if [[ -n $NEED_GXX ]]; then
 	if ! which g++ >/dev/null 2>&1; then
 		echo >&2 You need GNU c++ compiler to build $NEED_GXX
diff --git a/target/Config.in b/target/Config.in
index 2ff9ce4dd..738d50b31 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -694,44 +694,6 @@ config ADK_COMPRESSION_TOOL
 	default "lzma -9" if ADK_TARGET_INITRAMFS_COMPRESSION_LZMA
 	help
 
-choice
-prompt "Root filesystem type"
-	depends on ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
-	default ADK_TARGET_ROOT_XFS
-
-config ADK_TARGET_ROOT_XFS_MOD
-	boolean
-	prompt "XFS filesystem"
-	select ADK_KPACKAGE_KMOD_XFS_FS
-	select ADK_PACKAGE_XFSPROGS
-	help
-	  Select XFS filesystem kernel module and filesystem utilities.
-
-config ADK_TARGET_ROOT_EXT2_MOD
-	boolean
-	prompt "EXT2 filesystem"
-	select ADK_KPACKAGE_KMOD_EXT2_FS
-	select ADK_PACKAGE_E2FSPROGS
-	help
-	  Select EXT2 filesystem kernel module and filesystem utilities.
-
-config ADK_TARGET_ROOT_EXT3_MOD
-	boolean
-	prompt "EXT3 filesystem"
-	select ADK_KPACKAGE_KMOD_EXT3_FS
-	select ADK_PACKAGE_E2FSPROGS
-	help
-	  Select EXT3 filesystem kernel module and filesystem utilities.
-
-config ADK_TARGET_ROOT_EXT4_MOD
-	boolean
-	prompt "EXT4 filesystem"
-	select ADK_KPACKAGE_KMOD_EXT4_FS
-	select ADK_PACKAGE_E2FSPROGS
-	help
-	  Select EXT4 filesystem kernel module and filesystem utilities.
-
-endchoice
 
 choice
 prompt "Root filesystem type"
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index ec0f4f639..d6cf99e27 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -44,7 +44,7 @@ $(WRKBUILD)/.headers_configure:
 	mkdir -p $(EGLIBC_BUILD_DIR_INITIAL)
 	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \
 		ln -sf ../ports ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc);
-	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc; autoconf --force);
+	#(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc; autoconf --force);
 	$(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \
 		$(EGLIBC_BUILD_DIR_INITIAL)
 	(cd $(EGLIBC_BUILD_DIR_INITIAL); \
diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc
index 4f11fba45..0e8b1dc20 100644
--- a/toolchain/eglibc/Makefile.inc
+++ b/toolchain/eglibc/Makefile.inc
@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		eglibc
-PKG_VERSION:=		2.10.1
+PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1b5d08c87de09018dcabd9974ba754d4
 PKG_SITES:=		http://www.openadk.org/distfiles/
diff --git a/toolchain/eglibc/eglibc.config b/toolchain/eglibc/eglibc.config
index 198741139..b7f5f96e1 100644
--- a/toolchain/eglibc/eglibc.config
+++ b/toolchain/eglibc/eglibc.config
@@ -1,26 +1,42 @@
-OPTION_EGLIBC_ADVANCED_INET6=y
-OPTION_EGLIBC_BACKTRACE=n
-OPTION_EGLIBC_BSD=y
-OPTION_EGLIBC_CXX_TESTS=n
-OPTION_EGLIBC_CATGETS=y
-OPTION_EGLIBC_CHARSETS=y
-OPTION_EGLIBC_DB_ALIASES=y
-OPTION_EGLIBC_ENVZ=y
-OPTION_EGLIBC_FSTAB=y
-OPTION_EGLIBC_GETLOGIN=y
-OPTION_EGLIBC_INET=y
-OPTION_EGLIBC_LIBM=y
-OPTION_EGLIBC_LOCALES=n
-OPTION_EGLIBC_LOCALE_CODE=y
-OPTION_EGLIBC_NIS=n
-OPTION_EGLIBC_NSSWITCH=y
-OPTION_EGLIBC_RCMD=y
-OPTION_EGLIBC_SPAWN=y
-OPTION_EGLIBC_STREAMS=y
-OPTION_EGLIBC_SUNRPC=y
-OPTION_EGLIBC_UTMP=y
-OPTION_EGLIBC_UTMPX=y
-OPTION_EGLIBC_WORDEXP=y
-OPTION_POSIX_C_LANG_WIDE_CHAR=y
-OPTION_POSIX_REGEXP=y
-OPTION_POSIX_WIDE_CHAR_DEVICE_IO=y
+# This file sets default values for all option group variables
+# mentioned in option-groups.def; see that file for a description of
+# each option group.
+#
+# Subdirectory makefiles include this file before including the user's
+# settings from option-groups.config at the top of the build tree;
+# that file need only refer to those options whose default settings
+# are to be changed.
+#
+# By default, all option groups are enabled.
+OPTION_EGLIBC_ADVANCED_INET6 = y
+OPTION_EGLIBC_BACKTRACE = n
+OPTION_EGLIBC_BIG_MACROS = y
+OPTION_EGLIBC_BSD = y
+OPTION_EGLIBC_CXX_TESTS = n
+OPTION_EGLIBC_CATGETS = n
+OPTION_EGLIBC_CHARSETS = n
+OPTION_EGLIBC_DB_ALIASES = n
+OPTION_EGLIBC_ENVZ = y
+OPTION_EGLIBC_FCVT = y
+OPTION_EGLIBC_FMTMSG = y
+OPTION_EGLIBC_FSTAB = y
+OPTION_EGLIBC_FTRAVERSE = y
+OPTION_EGLIBC_GETLOGIN = y
+OPTION_EGLIBC_INET = y
+OPTION_EGLIBC_LIBM = y
+OPTION_EGLIBC_LOCALES = n
+OPTION_EGLIBC_LOCALE_CODE = n
+OPTION_EGLIBC_MEMUSAGE = y
+OPTION_EGLIBC_NIS = n
+OPTION_EGLIBC_NSSWITCH = n
+OPTION_EGLIBC_RCMD = y
+OPTION_EGLIBC_SPAWN = y
+OPTION_EGLIBC_STREAMS = y
+OPTION_EGLIBC_SUNRPC = y
+OPTION_EGLIBC_UTMP = y
+OPTION_EGLIBC_UTMPX = y
+OPTION_EGLIBC_WORDEXP = y
+OPTION_POSIX_C_LANG_WIDE_CHAR = y
+OPTION_POSIX_REGEXP = y
+OPTION_POSIX_REGEXP_GLIBC = n
+OPTION_POSIX_WIDE_CHAR_DEVICE_IO = y
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index 3ba08efa3..596c71955 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		glibc
-PKG_VERSION:=		2.10.1
+PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		adfbd93cada84dc16259f4dffa60dc34
-PKG_SITES:=		http://www.openadk.org/distfiles
+PKG_MD5SUM:=		55d50abb2d7c366bde6fb5e35e681f9b
+PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}