summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/build.mk4
-rw-r--r--package/intltool/Makefile25
-rwxr-xr-xscripts/adkprepare.sh10
-rw-r--r--scripts/rstrip.sh9
-rw-r--r--target/config/Config.in2
-rw-r--r--target/packages/pkg-available/test1
-rw-r--r--toolchain/glibc/Makefile7
-rw-r--r--toolchain/musl/Makefile7
-rw-r--r--toolchain/uClibc/Makefile7
9 files changed, 23 insertions, 49 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 37f27b12b..8c1e73743 100644
--- a/mk/build.mk
+++ b/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; \
diff --git a/package/intltool/Makefile b/package/intltool/Makefile
deleted file mode 100644
index 120658360..000000000
--- a/package/intltool/Makefile
+++ /dev/null
@@ -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
diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh
index 022a978c1..08d1ee1a1 100755
--- a/scripts/adkprepare.sh
+++ b/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
diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh
index bacf25ca7..46a4586da 100644
--- a/scripts/rstrip.sh
+++ b/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
diff --git a/target/config/Config.in b/target/config/Config.in
index c8e566cc8..44ee685fe 100644
--- a/target/config/Config.in
+++ b/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 \
diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test
index 8af24a816..d7bbcf26a 100644
--- a/target/packages/pkg-available/test
+++ b/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.
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 00bd67cbc..41987bada 100644
--- a/toolchain/glibc/Makefile
+++ b/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
diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile
index abb7af366..d675dc4cc 100644
--- a/toolchain/musl/Makefile
+++ b/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
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 7e53b5d21..4ee9af510 100644
--- a/toolchain/uClibc/Makefile
+++ b/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 04:42:03 +0000