pygos
/
build
mirror of https://github.com/pygos/build.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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 <david.oberhollenzer@tele2.at>
This commit is contained in:
David Oberhollenzer 2018-06-17 16:08:11 +02:00
parent 3d30afef75
commit 7204b9dd75
54 changed files with 39 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mk.sh
View File

@ -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"

3
pkg/bash/build
View File

@ -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"

3
pkg/bdb/build
View File

@ -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"
}

3
pkg/btrfs-progs/build
View File

@ -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() {

2
pkg/bzip2/build
View File

@ -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"

2
pkg/coreutils/build
View File

@ -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"
}

1
pkg/dhcpcd/build
View File

@ -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"
}

2
pkg/diffutils/build
View File

@ -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"
}

5
pkg/dnsmasq/build
View File

@ -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"
}

2
pkg/dosfstools/build
View File

@ -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"
}

2
pkg/ethtool/build
View File

@ -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"
}

3
pkg/eudev/build
View File

@ -25,8 +25,7 @@ deploy() {
local SOURCE="$1"
local DEPLOY="$2"
make DESTDIR="$DEPLOY" install-strip
make DESTDIR="$DEPLOY" install
rmdir "$DEPLOY/share"
}

3
pkg/expat/build
View File

@ -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"
}

3
pkg/file/build
View File

@ -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"
}

3
pkg/findutils/build
View File

@ -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"
}

2
pkg/gawk/build
View File

@ -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"
}

2
pkg/gmp/build
View File

@ -21,8 +21,6 @@ deploy() {
unfuck_libtool
make DESTDIR="$DEPLOY" install
strip_files ${DEPLOY}/lib/*.so*
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
}

2
pkg/grep/build
View File

@ -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"
}

2
pkg/gzip/build
View File

@ -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"
}

2
pkg/inetutils/build
View File

@ -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"
}

2
pkg/init/build
View File

@ -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"

2
pkg/iproute2/build
View File

@ -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() {

2
pkg/kbd/build
View File

@ -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"
}

2
pkg/kmod/build
View File

@ -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

2
pkg/less/build
View File

@ -21,8 +21,6 @@ deploy() {
make DESTDIR="$DEPLOY" install
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
strip_files ${DEPLOY}/bin/*
}
check_update() {

2
pkg/libbsd/build
View File

@ -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"
}

2
pkg/libiconv/build
View File

@ -20,8 +20,6 @@ deploy() {
local DEPLOY="$2"
make DESTDIR="$DEPLOY" install
strip_files ${DEPLOY}/{bin,lib}/*
}
check_update() {

2
pkg/libidn2/build
View File

@ -19,7 +19,7 @@ deploy() {
local SOURCE="$1"
local DEPLOY="$2"
make DESTDIR="$DEPLOY" install-strip
make DESTDIR="$DEPLOY" install
}
check_update() {

2
pkg/libmnl/build
View File

@ -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"
}

2
pkg/libnftnl/build
View File

@ -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"
}

2
pkg/libseccomp/build
View File

@ -19,7 +19,7 @@ deploy() {
local SOURCE="$1"
local DEPLOY="$2"
make DESTDIR="$DEPLOY" install-strip
make DESTDIR="$DEPLOY" install
}
check_update() {

2
pkg/libtasn1/build
View File

@ -19,7 +19,7 @@ deploy() {
local SOURCE="$1"
local DEPLOY="$2"
make DESTDIR="$DEPLOY" install-strip
make DESTDIR="$DEPLOY" install
}
check_update() {

2
pkg/libunistring/build
View File

@ -19,7 +19,7 @@ deploy() {
local SOURCE="$1"
local DEPLOY="$2"
make DESTDIR="$DEPLOY" install-strip
make DESTDIR="$DEPLOY" install
}
check_update() {

2
pkg/lzo/build
View File

@ -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"
}

2
pkg/musl/build
View File

@ -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"

2
pkg/nano/build
View File

@ -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"
}

4
pkg/ncurses/build
View File

@ -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

2
pkg/nettle/build
View File

@ -20,8 +20,6 @@ deploy() {
local DEPLOY="$2"
make DESTDIR="$DEPLOY" install
strip_files ${DEPLOY}/{bin,lib}/*
}
check_update() {

2
pkg/nftables/build
View File

@ -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"
}

4
pkg/openssh/build
View File

@ -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"
}

2
pkg/openssl/build
View File

@ -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() {

2
pkg/procps-ng/build
View File

@ -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"
}

2
pkg/psmisc/build
View File

@ -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"
}

2
pkg/readline/build
View File

@ -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() {

2
pkg/sed/build
View File

@ -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"
}

2
pkg/shadow/build
View File

@ -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

2
pkg/sqlite3/build
View File

@ -19,7 +19,7 @@ deploy() {
local SOURCE="$1"
local DEPLOY="$2"
make DESTDIR="$DEPLOY" install-strip
make DESTDIR="$DEPLOY" install
}
check_update() {

2
pkg/tar/build
View File

@ -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"
}

2
pkg/tc-gcc2/build
View File

@ -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"
}

2
pkg/unbound/build
View File

@ -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 |\

1
pkg/util-linux/build
View File

@ -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

2
pkg/xz/build
View File

@ -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"
}

2
pkg/zlib/build
View File

@ -22,8 +22,6 @@ deploy() {
make DESTDIR="$DEPLOY" install
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
strip_files ${DEPLOY}/lib/*
}
check_update() {

8
util/misc.sh
View File

@ -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