From 7204b9dd755aa348c81ac8b0c94275f197a46372 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 17 Jun 2018 16:08:11 +0200 Subject: [PATCH] Cleanup: strip executables in mk.sh Automagically strip all executables (recursively for subdirectories in lib and bin) inside the mk.sh build loop. This removes the necessity in the build scripts to strip the files. This also allows us to remove the error prone install-strip target from the build scripts. Signed-off-by: David Oberhollenzer --- mk.sh | 1 + pkg/bash/build | 3 --- pkg/bdb/build | 3 --- pkg/btrfs-progs/build | 3 --- pkg/bzip2/build | 2 -- pkg/coreutils/build | 2 +- pkg/dhcpcd/build | 1 - pkg/diffutils/build | 2 +- pkg/dnsmasq/build | 5 ----- pkg/dosfstools/build | 2 +- pkg/ethtool/build | 2 +- pkg/eudev/build | 3 +-- pkg/expat/build | 3 +-- pkg/file/build | 3 +-- pkg/findutils/build | 3 +-- pkg/gawk/build | 2 +- pkg/gmp/build | 2 -- pkg/grep/build | 2 +- pkg/gzip/build | 2 +- pkg/inetutils/build | 2 +- pkg/init/build | 2 +- pkg/iproute2/build | 2 -- pkg/kbd/build | 2 +- pkg/kmod/build | 2 +- pkg/less/build | 2 -- pkg/libbsd/build | 2 +- pkg/libiconv/build | 2 -- pkg/libidn2/build | 2 +- pkg/libmnl/build | 2 +- pkg/libnftnl/build | 2 +- pkg/libseccomp/build | 2 +- pkg/libtasn1/build | 2 +- pkg/libunistring/build | 2 +- pkg/lzo/build | 2 +- pkg/musl/build | 2 -- pkg/nano/build | 2 +- pkg/ncurses/build | 4 ---- pkg/nettle/build | 2 -- pkg/nftables/build | 2 +- pkg/openssh/build | 4 ---- pkg/openssl/build | 2 -- pkg/procps-ng/build | 2 +- pkg/psmisc/build | 2 +- pkg/readline/build | 2 -- pkg/sed/build | 2 +- pkg/shadow/build | 2 +- pkg/sqlite3/build | 2 +- pkg/tar/build | 2 +- pkg/tc-gcc2/build | 2 -- pkg/unbound/build | 2 -- pkg/util-linux/build | 1 - pkg/xz/build | 2 +- pkg/zlib/build | 2 -- util/misc.sh | 8 ++++++-- 54 files changed, 39 insertions(+), 86 deletions(-) diff --git a/mk.sh b/mk.sh index f194aa5..e28fe70 100755 --- a/mk.sh +++ b/mk.sh @@ -89,6 +89,7 @@ while read pkg; do run_pkg_command "build" run_pkg_command "deploy" deploy_dev_cleanup "$PKGDEPLOYDIR/$PKGNAME" + strip_files ${PKGDEPLOYDIR}/${PKGNAME}/{bin,lib} restore_toolchain rm -rf "$PKGBUILDDIR" diff --git a/pkg/bash/build b/pkg/bash/build index f3b7922..ab0a021 100755 --- a/pkg/bash/build +++ b/pkg/bash/build @@ -21,9 +21,6 @@ deploy() { local DEPLOY="$2" make DESTDIR="$DEPLOY" install - - strip_files ${DEPLOY}/bin/bash - ln -sv bash "$DEPLOY/bin/sh" cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$DEPLOY" diff --git a/pkg/bdb/build b/pkg/bdb/build index 5bd6f6b..7fcf230 100755 --- a/pkg/bdb/build +++ b/pkg/bdb/build @@ -22,10 +22,7 @@ deploy() { make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" - chmod 755 ${DEPLOY}/bin/db_* - strip_files ${DEPLOY}/lib/*.so ${DEPLOY}/bin/db_* - rm -r "$DEPLOY/docs" } diff --git a/pkg/btrfs-progs/build b/pkg/btrfs-progs/build index 57e5ee5..2919371 100755 --- a/pkg/btrfs-progs/build +++ b/pkg/btrfs-progs/build @@ -24,10 +24,7 @@ deploy() { local DEPLOY="$2" make DESTDIR="$DEPLOY" install - cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" - - strip_files ${DEPLOY}/{bin,lib}/* } check_update() { diff --git a/pkg/bzip2/build b/pkg/bzip2/build index c0a5b08..2faf976 100755 --- a/pkg/bzip2/build +++ b/pkg/bzip2/build @@ -21,8 +21,6 @@ deploy() { make PREFIX="$DEPLOY" install - strip_files ${DEPLOY}/bin/* - rm ${DEPLOY}/bin/{bzegrep,bzfgrep,bzless,bzcmp} ln -s "/bin/bzgrep" "$DEPLOY/bin/bzegrep" diff --git a/pkg/coreutils/build b/pkg/coreutils/build index 5d84cd2..0a1e538 100755 --- a/pkg/coreutils/build +++ b/pkg/coreutils/build @@ -20,7 +20,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/dhcpcd/build b/pkg/dhcpcd/build index 3fe7079..c17edc7 100755 --- a/pkg/dhcpcd/build +++ b/pkg/dhcpcd/build @@ -29,7 +29,6 @@ deploy() { make DESTDIR="$DEPLOY" install chmod 755 $DEPLOY/bin/* - strip_files $DEPLOY/bin/* cat_file_override "dhcpcd.conf" > "$DEPLOY/etc/dhcpcd.conf" cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/diffutils/build b/pkg/diffutils/build index 6382b18..4f85f52 100755 --- a/pkg/diffutils/build +++ b/pkg/diffutils/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/dnsmasq/build b/pkg/dnsmasq/build index 9a6c8a6..52afd08 100644 --- a/pkg/dnsmasq/build +++ b/pkg/dnsmasq/build @@ -20,13 +20,8 @@ deploy() { local DEPLOY="$2" make CC=${TARGET}-gcc PREFIX="/" BINDIR="/bin" DESTDIR="$DEPLOY" install - - strip_files "$DEPLOY/bin/dnsmasq" - mkdir -p "$DEPLOY/etc" - cat_file_override "dnsmasq.conf" > "$DEPLOY/etc/dnsmasq.conf" - cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/dosfstools/build b/pkg/dosfstools/build index 8e2b203..c9b356e 100755 --- a/pkg/dosfstools/build +++ b/pkg/dosfstools/build @@ -20,7 +20,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/ethtool/build b/pkg/ethtool/build index 7953901..2be6573 100755 --- a/pkg/ethtool/build +++ b/pkg/ethtool/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/eudev/build b/pkg/eudev/build index 62f834b..d7fc941 100755 --- a/pkg/eudev/build +++ b/pkg/eudev/build @@ -25,8 +25,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip - + make DESTDIR="$DEPLOY" install rmdir "$DEPLOY/share" } diff --git a/pkg/expat/build b/pkg/expat/build index 43eff29..86acd42 100644 --- a/pkg/expat/build +++ b/pkg/expat/build @@ -20,8 +20,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip - + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/file/build b/pkg/file/build index d330b06..7e49839 100755 --- a/pkg/file/build +++ b/pkg/file/build @@ -19,8 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip - + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/findutils/build b/pkg/findutils/build index ee24779..c2c58ed 100755 --- a/pkg/findutils/build +++ b/pkg/findutils/build @@ -20,8 +20,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip - + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/gawk/build b/pkg/gawk/build index 87449e0..d134888 100755 --- a/pkg/gawk/build +++ b/pkg/gawk/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/gmp/build b/pkg/gmp/build index 8527ba4..d0758d4 100755 --- a/pkg/gmp/build +++ b/pkg/gmp/build @@ -21,8 +21,6 @@ deploy() { unfuck_libtool make DESTDIR="$DEPLOY" install - - strip_files ${DEPLOY}/lib/*.so* cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/grep/build b/pkg/grep/build index 0a75810..a142bf3 100755 --- a/pkg/grep/build +++ b/pkg/grep/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/gzip/build b/pkg/gzip/build index 507b717..524d274 100755 --- a/pkg/gzip/build +++ b/pkg/gzip/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/inetutils/build b/pkg/inetutils/build index fbe721a..2042953 100755 --- a/pkg/inetutils/build +++ b/pkg/inetutils/build @@ -22,7 +22,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/init/build b/pkg/init/build index 7833caf..ecdfb13 100755 --- a/pkg/init/build +++ b/pkg/init/build @@ -24,7 +24,7 @@ deploy() { local DEPLOY="$2" local svc - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp -r ${SCRIPTDIR}/pkg/${PKGNAME}/{etc,lib,share} "$DEPLOY" cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" diff --git a/pkg/iproute2/build b/pkg/iproute2/build index 05e3a19..59c026f 100755 --- a/pkg/iproute2/build +++ b/pkg/iproute2/build @@ -22,8 +22,6 @@ deploy() { mkdir -p "$DEPLOY/var/lib/arpd" make DESTDIR="$DEPLOY" SYSROOT="$TCDIR/$TARGET" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" - - strip_files ${DEPLOY}/bin/* } check_update() { diff --git a/pkg/kbd/build b/pkg/kbd/build index af99e5e..674372a 100755 --- a/pkg/kbd/build +++ b/pkg/kbd/build @@ -20,7 +20,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/kmod/build b/pkg/kmod/build index 5fa0b39..dd01918 100644 --- a/pkg/kmod/build +++ b/pkg/kmod/build @@ -21,7 +21,7 @@ deploy() { local DEPLOY="$2" local target - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" for target in depmod insmod lsmod modinfo modprobe rmmod; do diff --git a/pkg/less/build b/pkg/less/build index 2fb75f5..0b9d44c 100755 --- a/pkg/less/build +++ b/pkg/less/build @@ -21,8 +21,6 @@ deploy() { make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" - - strip_files ${DEPLOY}/bin/* } check_update() { diff --git a/pkg/libbsd/build b/pkg/libbsd/build index 40563dd..eadeb38 100644 --- a/pkg/libbsd/build +++ b/pkg/libbsd/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/libiconv/build b/pkg/libiconv/build index 73ddd96..d0f9b23 100755 --- a/pkg/libiconv/build +++ b/pkg/libiconv/build @@ -20,8 +20,6 @@ deploy() { local DEPLOY="$2" make DESTDIR="$DEPLOY" install - - strip_files ${DEPLOY}/{bin,lib}/* } check_update() { diff --git a/pkg/libidn2/build b/pkg/libidn2/build index 0867c81..9f15479 100755 --- a/pkg/libidn2/build +++ b/pkg/libidn2/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install } check_update() { diff --git a/pkg/libmnl/build b/pkg/libmnl/build index 993cf75..2542708 100644 --- a/pkg/libmnl/build +++ b/pkg/libmnl/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/libnftnl/build b/pkg/libnftnl/build index 883e0dc..6a329eb 100644 --- a/pkg/libnftnl/build +++ b/pkg/libnftnl/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/libseccomp/build b/pkg/libseccomp/build index 107c726..b8be49a 100644 --- a/pkg/libseccomp/build +++ b/pkg/libseccomp/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install } check_update() { diff --git a/pkg/libtasn1/build b/pkg/libtasn1/build index 586bbc6..bd1753e 100755 --- a/pkg/libtasn1/build +++ b/pkg/libtasn1/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install } check_update() { diff --git a/pkg/libunistring/build b/pkg/libunistring/build index 4588569..4843e2e 100755 --- a/pkg/libunistring/build +++ b/pkg/libunistring/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install } check_update() { diff --git a/pkg/lzo/build b/pkg/lzo/build index 6be78b9..a178d9d 100644 --- a/pkg/lzo/build +++ b/pkg/lzo/build @@ -20,7 +20,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/musl/build b/pkg/musl/build index 4547a99..e175772 100755 --- a/pkg/musl/build +++ b/pkg/musl/build @@ -25,8 +25,6 @@ deploy() { cat_file_merge "LDPATH" > "$DEPLOY/etc/ld-musl-${MUSL_CPU}.path" - strip_files ${DEPLOY}/lib/* - find ${DEPLOY}/lib/*.so* -exec stat {} --printf="%n m %a 0 0\\n" \; | \ sed "s#^$DEPLOY/##g" | sed "s/644/444/g" | \ sed "s/755/555/g" > "$DEPLOY/rootfs_files.txt" diff --git a/pkg/nano/build b/pkg/nano/build index a74e4f4..ee005fb 100644 --- a/pkg/nano/build +++ b/pkg/nano/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/ncurses/build b/pkg/ncurses/build index 53466c6..f929618 100755 --- a/pkg/ncurses/build +++ b/pkg/ncurses/build @@ -24,11 +24,7 @@ deploy() { make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" - rm "$DEPLOY/bin/ncursesw6-config" - - strip_files ${DEPLOY}/bin/* ${DEPLOY}/lib/*.so* - mkdir -p "${DEPLOY}/include/ncurses" for hdr in ${DEPLOY}/include/ncursesw/*.h; do diff --git a/pkg/nettle/build b/pkg/nettle/build index 824ca0a..9b26cff 100755 --- a/pkg/nettle/build +++ b/pkg/nettle/build @@ -20,8 +20,6 @@ deploy() { local DEPLOY="$2" make DESTDIR="$DEPLOY" install - - strip_files ${DEPLOY}/{bin,lib}/* } check_update() { diff --git a/pkg/nftables/build b/pkg/nftables/build index 0690204..4e7ced4 100644 --- a/pkg/nftables/build +++ b/pkg/nftables/build @@ -20,7 +20,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/openssh/build b/pkg/openssh/build index 91102c6..11795dd 100644 --- a/pkg/openssh/build +++ b/pkg/openssh/build @@ -26,11 +26,7 @@ deploy() { make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" - mkdir -p "$DEPLOY/var/lib/sshd" - - strip_files ${DEPLOY}/bin/* ${DEPLOY}/libexec/* - install -v -m755 "$SOURCE/contrib/ssh-copy-id" "$DEPLOY/bin" } diff --git a/pkg/openssl/build b/pkg/openssl/build index aa89338..7a8ea01 100755 --- a/pkg/openssl/build +++ b/pkg/openssl/build @@ -24,8 +24,6 @@ deploy() { make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" - - strip_files ${DEPLOY}/bin/* ${DEPLOY}/lib/*.so* } check_update() { diff --git a/pkg/procps-ng/build b/pkg/procps-ng/build index c3ad2ef..20f8e04 100755 --- a/pkg/procps-ng/build +++ b/pkg/procps-ng/build @@ -23,7 +23,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/psmisc/build b/pkg/psmisc/build index c091c18..bdb30b6 100755 --- a/pkg/psmisc/build +++ b/pkg/psmisc/build @@ -22,7 +22,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/readline/build b/pkg/readline/build index 6744e1d..0f3f28a 100755 --- a/pkg/readline/build +++ b/pkg/readline/build @@ -21,9 +21,7 @@ deploy() { make SHLIB_LIBS="-lncursesw" DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" - chmod 755 ${DEPLOY}/lib/* - strip_files ${DEPLOY}/lib/* } check_update() { diff --git a/pkg/sed/build b/pkg/sed/build index b418f06..581a54d 100755 --- a/pkg/sed/build +++ b/pkg/sed/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/shadow/build b/pkg/shadow/build index 71e88a5..0a72cd5 100755 --- a/pkg/shadow/build +++ b/pkg/shadow/build @@ -24,7 +24,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" sed -i -e 's@HOME=/home@HOME=/usr@g' $DEPLOY/etc/default/useradd diff --git a/pkg/sqlite3/build b/pkg/sqlite3/build index d089014..f473396 100755 --- a/pkg/sqlite3/build +++ b/pkg/sqlite3/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install } check_update() { diff --git a/pkg/tar/build b/pkg/tar/build index 4159ca5..bc3b1b7 100755 --- a/pkg/tar/build +++ b/pkg/tar/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/tc-gcc2/build b/pkg/tc-gcc2/build index 2de3ea7..c1bbd23 100755 --- a/pkg/tc-gcc2/build +++ b/pkg/tc-gcc2/build @@ -44,7 +44,5 @@ deploy() { mkdir -p "$DEPLOY/lib" mv ${TCDIR}/${TARGET}/{include,lib} "$DEPLOY" rm ${DEPLOY}/lib/*.la - - strip_files ${DEPLOY}/lib/* cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/unbound/build b/pkg/unbound/build index 1a34425..7928e2a 100644 --- a/pkg/unbound/build +++ b/pkg/unbound/build @@ -28,8 +28,6 @@ deploy() { cat_file_override "unbound.conf" > "$DEPLOY/etc/unbound/unbound.conf" - strip_files ${DEPLOY}/{bin,lib}/* - echo "generating trust anchor root.key" curl --silent -L https://data.iana.org/root-anchors/root-anchors.xml |\ diff --git a/pkg/util-linux/build b/pkg/util-linux/build index 7388ed4..3f3e844 100755 --- a/pkg/util-linux/build +++ b/pkg/util-linux/build @@ -38,7 +38,6 @@ deploy() { unfuck_libtool make DESTDIR="$DEPLOY" install - strip_files ${DEPLOY}/{bin,lib}/* if [ -e "$DEPLOY/sbin" ]; then mv ${DEPLOY}/sbin/* ${DEPLOY}/bin diff --git a/pkg/xz/build b/pkg/xz/build index d6a397c..6ad7679 100644 --- a/pkg/xz/build +++ b/pkg/xz/build @@ -19,7 +19,7 @@ deploy() { local SOURCE="$1" local DEPLOY="$2" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" } diff --git a/pkg/zlib/build b/pkg/zlib/build index d199f10..4fbcf13 100644 --- a/pkg/zlib/build +++ b/pkg/zlib/build @@ -22,8 +22,6 @@ deploy() { make DESTDIR="$DEPLOY" install cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY" - - strip_files ${DEPLOY}/lib/* } check_update() { diff --git a/util/misc.sh b/util/misc.sh index d5ae831..b64eba9 100644 --- a/util/misc.sh +++ b/util/misc.sh @@ -12,10 +12,14 @@ strip_files() { local f for f in $@; do - if [ ! -f "$f" ]; then - continue + [ ! -L "$f" ] || continue; + + if [ -d "$f" ]; then + strip_files ${f}/* fi + [ -f "$f" ] || continue; + if file $f | grep -q -i elf; then ${TARGET}-strip --discard-all "$f" fi