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

mk/build.mk

@@ -561,8 +561,8 @@ test-framework:
 	for libc in uclibc glibc musl;do \
 		mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \
 		( \
-			for arch in arm mips mipsel x86 x86_64;do \
-				tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#"); \
+			for arch in arm mips mipsel i686 x86_64;do \
+				tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#"); \
 				echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \
 				$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive COLLECTION=test defconfig; \

package/intltool/Makefile

@@ -1,25 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		intltool
-PKG_VERSION:=		0.50.2
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		23fbd879118253cb99aeac067da5f591
-PKG_DESCR:=		Internationalization Tool Collection
-PKG_SECTION:=		misc
-PKG_SITES:=		https://launchpad.net/intltool/trunk/0.50.2/+download/
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,INTLTOOL,intltool,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-XAKE_FLAGS+=		PERL="/usr/bin/perl"
-
-intltool-install:
-	$(INSTALL_DIR) $(IDIR_INTLTOOL)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/intltool* \
-		$(IDIR_INTLTOOL)/usr/bin
-
-include ${TOPDIR}/mk/pkg-bottom.mk

scripts/adkprepare.sh

@@ -21,17 +21,12 @@ openbsd() {
 	PKG_PATH="ftp://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/"
 	export PKG_PATH
 	pkg_add -v gmake
-	pkg_add -v rsync--
 	pkg_add -v git
 	pkg_add -v bash
-	pkg_add -v unzip
 	pkg_add -v wget
 	pkg_add -v gtar--
 	pkg_add -v gawk
 	pkg_add -v gsed
-	pkg_add -v xz
-	pkg_add -v lzop
-	pkg_add -v intltool
 	pkg_add -v screen--
 	pkg_add -v vim--no_x11
 	pkg_add -v py-libxml
@@ -41,16 +36,13 @@ netbsd() {
 	echo "Preparing NetBSD for OpenADK"
 	PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/${ver}/All/"
 	export PKG_PATH
-	pkg_add -vu xz
 	pkg_add -vu scmgit
 	pkg_add -vu gmake
 	pkg_add -vu bash
 	pkg_add -vu wget
-	pkg_add -vu unzip
 	pkg_add -vu gtar
 	pkg_add -vu gsed
 	pkg_add -vu gawk
-	pkg_add -vu intltool
 	pkg_add -vu vim
 	pkg_add -vu screen
 	pkg_add -vu mksh
@@ -58,7 +50,7 @@ netbsd() {
 
 freebsd() {
 	echo "Preparing FreeBSD for OpenADK"
-	pkg_add -r git gmake bash wget unzip gtar gsed gawk intltool screen mksh vim
+	pkg_add -r git gmake bash wget gtar gsed gawk screen mksh vim
 }
 
 case $os in 

scripts/rstrip.sh

@@ -5,10 +5,6 @@
 
 SELF=${0##*/}
 
-if [[ -z $debug ]];then
-	debug=1
-fi
-
 if [[ -z $prefix ]]; then
 	echo >&2 "$SELF: strip command not defined ('prefix' variable not set)"
 	exit 1
@@ -64,12 +60,13 @@ find $TARGETS -type f -a -exec file {} \; | \
 	echo "$SELF: $V:$S"
 	echo "-> $T $F"
 	eval "chmod u+w $F"
-	if [[ $debug -eq 1 ]];then
+	if [[ $debug -ne 0 ]];then
+		echo "mkdir for $D" >> /tmp/debug
 		eval "mkdir -p $D/usr/lib/debug/$Q"
 		eval "$O --only-keep-debug $F $D/usr/lib/debug/$P.debug"
 	fi
 	eval "$T $F"
-	if [[ $debug -eq 1 ]];then
+	if [[ $debug -ne 0 ]];then
 		eval "cd $D/usr/lib/debug/$Q && $O --add-gnu-debuglink=$R.debug $F"
 	fi
 done

target/config/Config.in

@@ -180,7 +180,7 @@ endchoice
 config ADK_TARGET_LIBC_PATH
 	string
 	default "lib32" if ADK_n32
-	default "lib" if ADK_x32
+	default "libx32" if ADK_x32
 	default "lib64" if ADK_n64 \
 				|| ADK_64 \
 				|| ADK_LINUX_SPARC64 \

target/packages/pkg-available/test

@@ -3,6 +3,7 @@ config ADK_PKG_TEST
 	default n
 	select ADK_PACKAGE_STRACE
 	select ADK_PACKAGE_SOCAT
+	select ADK_PACKAGE_MAKE
 	help
 	  Package collection used to build adk-test-framework root
 	  filesystem.

toolchain/glibc/Makefile

@@ -73,8 +73,11 @@ $(WRKBUILD)/.fixup:
 	-find $(STAGING_TARGET_DIR) -type f -name \*_pic\* -delete
 	rm -rf $(STAGING_TARGET_DIR)/usr/share/locale $(STAGING_TARGET_DIR)/usr/share/i18n
 	rm -rf $(STAGING_TARGET_DIR)/usr/lib/gconv
-	PATH="$(TARGET_PATH)" debug='' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
-	debug='' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)/bin $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/
+ifeq ($(ADK_TOOLCHAIN),y)
+	# strip target libs and host tools for toolchain builds
+	PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
+	debug='0' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)/bin $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/
+endif
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk

toolchain/musl/Makefile

@@ -59,8 +59,11 @@ $(WRKBUILD)/.fixup:
 	$(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install
 	# cleanup toolchain
 	-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete
-	PATH="$(TARGET_PATH)" debug='' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
-	debug='' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)
+ifeq ($(ADK_TOOLCHAIN),y)
+	# strip target libs and host tools for toolchain builds
+	PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
+	debug='0' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)
+endif
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk

toolchain/uClibc/Makefile

@@ -120,8 +120,11 @@ endif
 	ln -s libc.so.0 $(STAGING_TARGET_DIR)/lib/libc.so
 	# cleanup toolchain
 	-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete
-	PATH="$(TARGET_PATH)" debug='' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
-	debug='' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)
+ifeq ($(ADK_TOOLCHAIN),y)
+	# strip target libs and host tools for toolchain builds
+	PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
+	debug='0' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)
+endif
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk