From fc0b5870749ae79bbe9b20055344ebbfada11445 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sat, 17 Feb 2018 14:47:42 +0100 Subject: [PATCH] Cleanup deployed files and directories - Remove empty directories installed to / by install targets - Make sure we strip everything - Remove charset.alias file installed by every pacakge, add centralized version to rootfs package Signed-off-by: David Oberhollenzer --- pkg/bash/build | 1 + pkg/btrfs-progs/build | 2 +- pkg/bzip2/build | 1 + pkg/coreutils/build | 2 +- pkg/diffutils/build | 2 +- pkg/findutils/build | 2 +- pkg/gmp/build | 1 + pkg/grep/build | 2 +- pkg/inetutils/build | 3 ++- pkg/libevent/build | 1 + pkg/libiconv/build | 4 +++- pkg/libunistring/build | 1 + pkg/musl/build | 2 ++ pkg/nano/build | 2 +- pkg/ncurses/build | 2 +- pkg/nettle/build | 1 + pkg/openrc/build | 3 ++- pkg/openssl/build | 1 + pkg/readline/build | 4 +++- pkg/rootfs/build | 1 + pkg/rootfs/lib/charset.alias | 2 ++ pkg/sed/build | 2 +- pkg/tar/build | 4 +--- pkg/tc-gcc2/build | 2 ++ pkg/unbound/build | 1 + pkg/zlib/build | 1 + 26 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 pkg/rootfs/lib/charset.alias diff --git a/pkg/bash/build b/pkg/bash/build index 838ff30..c9d67fd 100755 --- a/pkg/bash/build +++ b/pkg/bash/build @@ -33,4 +33,5 @@ deploy() { cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$DEPLOY" split_dev_deploy "$DEPLOY" "$DEVDEPLOY" + rm -r "$DEPLOY/lib" } diff --git a/pkg/btrfs-progs/build b/pkg/btrfs-progs/build index 31f6184..6cf18a1 100755 --- a/pkg/btrfs-progs/build +++ b/pkg/btrfs-progs/build @@ -31,6 +31,6 @@ deploy() { # just some script that tells you to use a different command rm "$DEPLOY/bin/fsck.btrfs" - strip_files ${DEPLOY}/bin/* + strip_files ${DEPLOY}/{bin,lib}/* split_dev_deploy "$DEPLOY" "$DEVDEPLOY" } diff --git a/pkg/bzip2/build b/pkg/bzip2/build index 244d785..66bfa06 100755 --- a/pkg/bzip2/build +++ b/pkg/bzip2/build @@ -37,4 +37,5 @@ deploy() { ln -s "/bin/bzdiff" "$DEPLOY/bin/bzcmp" split_dev_deploy "$DEPLOY" "$DEVDEPLOY" + rmdir "$DEPLOY/lib" } diff --git a/pkg/coreutils/build b/pkg/coreutils/build index e1a42f6..3a13532 100755 --- a/pkg/coreutils/build +++ b/pkg/coreutils/build @@ -21,5 +21,5 @@ deploy() { local DEPLOY="$2" make DESTDIR="$DEPLOY" install-strip - rm -r "$DEPLOY/share" + rm -r "$DEPLOY/share" "$DEPLOY/lib" } diff --git a/pkg/diffutils/build b/pkg/diffutils/build index 4a51dbf..28591c4 100755 --- a/pkg/diffutils/build +++ b/pkg/diffutils/build @@ -21,5 +21,5 @@ deploy() { make DESTDIR="$DEPLOY" install-strip - rm -r "$DEPLOY/share" + rm -r "$DEPLOY/share" "$DEPLOY/lib" } diff --git a/pkg/findutils/build b/pkg/findutils/build index 4db7d96..3a85a96 100755 --- a/pkg/findutils/build +++ b/pkg/findutils/build @@ -22,5 +22,5 @@ deploy() { make DESTDIR="$DEPLOY" install-strip - rm -r "$DEPLOY/share" + rm -r "$DEPLOY/share" "$DEPLOY/lib" } diff --git a/pkg/gmp/build b/pkg/gmp/build index dc9e6ad..fe772b9 100755 --- a/pkg/gmp/build +++ b/pkg/gmp/build @@ -25,4 +25,5 @@ deploy() { rm -r "$DEPLOY/share" split_dev_deploy "$DEPLOY" "$DEVDEPLOY" + strip_files ${DEPLOY}/lib/*.so* } diff --git a/pkg/grep/build b/pkg/grep/build index 4c6285a..104b029 100755 --- a/pkg/grep/build +++ b/pkg/grep/build @@ -20,5 +20,5 @@ deploy() { local DEPLOY="$2" make DESTDIR="$DEPLOY" install-strip - rm -r "$DEPLOY/share" + rm -r "$DEPLOY/share" "$DEPLOY/lib" } diff --git a/pkg/inetutils/build b/pkg/inetutils/build index 84a11b4..c48e15f 100755 --- a/pkg/inetutils/build +++ b/pkg/inetutils/build @@ -24,5 +24,6 @@ deploy() { make DESTDIR="$DEPLOY" install-strip - rm -r "$DEPLOY/share" + rm -r "$DEPLOY/share" "$DEPLOY/lib" + (rmdir "$DEPLOY/libexec" || true) 2> /dev/null ; } diff --git a/pkg/libevent/build b/pkg/libevent/build index 8d52e5f..8e71a6d 100755 --- a/pkg/libevent/build +++ b/pkg/libevent/build @@ -25,4 +25,5 @@ deploy() { rm -r "$DEPLOY/bin" split_dev_deploy "$DEPLOY" "$DEVDEPLOY" + strip_files ${DEPLOY}/lib/* } diff --git a/pkg/libiconv/build b/pkg/libiconv/build index 7431566..a8f06bd 100755 --- a/pkg/libiconv/build +++ b/pkg/libiconv/build @@ -20,9 +20,11 @@ deploy() { local DEPLOY="$2" local DEVDEPLOY="$3" - make DESTDIR="$DEPLOY" install-strip + make DESTDIR="$DEPLOY" install rm -r "$DEPLOY/share" + rm "$DEPLOY/lib/charset.alias" split_dev_deploy "$DEPLOY" "$DEVDEPLOY" + strip_files ${DEPLOY}/{bin,lib}/* } diff --git a/pkg/libunistring/build b/pkg/libunistring/build index 8f94c5d..eb0940a 100755 --- a/pkg/libunistring/build +++ b/pkg/libunistring/build @@ -23,6 +23,7 @@ deploy() { make DESTDIR="$DEPLOY" install-strip rm -r "$DEPLOY/share" + rm "$DEPLOY/lib/charset.alias" split_dev_deploy "$DEPLOY" "$DEVDEPLOY" } diff --git a/pkg/musl/build b/pkg/musl/build index e214ea7..ddc460b 100755 --- a/pkg/musl/build +++ b/pkg/musl/build @@ -33,4 +33,6 @@ deploy() { if [ -e "$SCRIPTDIR/board/$BOARD/LDPATH" ]; then cat "$SCRIPTDIR/board/$BOARD/LDPATH" >> "$DEPLOY/etc/ld-musl-${MUSL_CPU}.path" fi + + strip_files ${DEPLOY}/lib/* } diff --git a/pkg/nano/build b/pkg/nano/build index 69458e1..df95ca9 100644 --- a/pkg/nano/build +++ b/pkg/nano/build @@ -21,5 +21,5 @@ deploy() { make DESTDIR="$DEPLOY" install-strip - rm -r "$DEPLOY/share/" + rm -r "$DEPLOY/share" "$DEPLOY/lib" } diff --git a/pkg/ncurses/build b/pkg/ncurses/build index 6d1d167..8209fe4 100755 --- a/pkg/ncurses/build +++ b/pkg/ncurses/build @@ -28,7 +28,7 @@ deploy() { rm -r "$DEPLOY/share/man" rm "$DEPLOY/bin/ncursesw6-config" - strip_files ${DEPLOY}/bin/* + strip_files ${DEPLOY}/bin/* ${DEPLOY}/lib/*.so* split_dev_deploy "$DEPLOY" "$DEVDEPLOY" diff --git a/pkg/nettle/build b/pkg/nettle/build index 8f3ab00..1388802 100755 --- a/pkg/nettle/build +++ b/pkg/nettle/build @@ -23,4 +23,5 @@ deploy() { make DESTDIR="$DEPLOY" install split_dev_deploy "$DEPLOY" "$DEVDEPLOY" + strip_files ${DEPLOY}/{bin,lib}/* } diff --git a/pkg/openrc/build b/pkg/openrc/build index f9835fe..9f6991d 100755 --- a/pkg/openrc/build +++ b/pkg/openrc/build @@ -44,7 +44,8 @@ deploy() { rm -r ${DEPLOY}/share rm -r ${DEPLOY}/etc - strip_files ${DEPLOY}/bin/* ${DEPLOY}/libexec/rc/{bin,sbin}/* + chmod 755 ${DEPLOY}/lib/*.so* + strip_files ${DEPLOY}/{bin,lib}/* ${DEPLOY}/libexec/rc/{bin,sbin}/* mkdir -p ${DEPLOY}/etc/{conf.d,init.d,runlevels,sysctl.d} mkdir -p ${DEPLOY}/etc/runlevels/{boot,sysinit,shutdown,default} diff --git a/pkg/openssl/build b/pkg/openssl/build index ee4ba2f..2643002 100755 --- a/pkg/openssl/build +++ b/pkg/openssl/build @@ -30,4 +30,5 @@ deploy() { rm -r "$DEPLOY/share" split_dev_deploy "$DEPLOY" "$DEVDEPLOY" + strip_files ${DEPLOY}/bin/* ${DEPLOY}/lib/*.so* } diff --git a/pkg/readline/build b/pkg/readline/build index 77fc6ce..0e47b9c 100755 --- a/pkg/readline/build +++ b/pkg/readline/build @@ -22,7 +22,9 @@ deploy() { make SHLIB_LIBS="-lncursesw" DESTDIR="$DEPLOY" install - rm -r "$DEPLOY/share" + rm -r "$DEPLOY/share" "$DEPLOY/bin" split_dev_deploy "$DEPLOY" "$DEVDEPLOY" + chmod 755 ${DEPLOY}/lib/* + strip_files ${DEPLOY}/lib/* } diff --git a/pkg/rootfs/build b/pkg/rootfs/build index 956428b..57f006b 100755 --- a/pkg/rootfs/build +++ b/pkg/rootfs/build @@ -11,6 +11,7 @@ build() { mkdir -pv ${PKGBUILDDIR}/cfg/{preserve,overlay} cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$PKGBUILDDIR" + cp -r "$SCRIPTDIR/pkg/$PKGNAME/lib" "$PKGBUILDDIR" # install packages to rootfs dependencies | tsort | tac | \ diff --git a/pkg/rootfs/lib/charset.alias b/pkg/rootfs/lib/charset.alias new file mode 100644 index 0000000..22f4e6d --- /dev/null +++ b/pkg/rootfs/lib/charset.alias @@ -0,0 +1,2 @@ +ISO_646.IRV:1983 ASCII +UTF-8 UTF-8 diff --git a/pkg/sed/build b/pkg/sed/build index 512423f..f3a1c0d 100755 --- a/pkg/sed/build +++ b/pkg/sed/build @@ -21,5 +21,5 @@ deploy() { make DESTDIR="$DEPLOY" install-strip - rm -r "$DEPLOY/share" + rm -r "$DEPLOY/share" "$DEPLOY/lib" } diff --git a/pkg/tar/build b/pkg/tar/build index 6d36c4b..bbe7e62 100755 --- a/pkg/tar/build +++ b/pkg/tar/build @@ -21,7 +21,5 @@ deploy() { make DESTDIR="$DEPLOY" install-strip - rm -r "$DEPLOY/share/info" - rm -r "$DEPLOY/share/man" - rm -r "$DEPLOY/share/locale" + rm -r "$DEPLOY/share" "$DEPLOY/lib" } diff --git a/pkg/tc-gcc2/build b/pkg/tc-gcc2/build index 59c72ec..549f909 100755 --- a/pkg/tc-gcc2/build +++ b/pkg/tc-gcc2/build @@ -51,4 +51,6 @@ deploy() { rm ${DEVDEPLOY}/lib/*.la mv ${DEVDEPLOY}/lib/*.so* "$DEPLOY/lib" mv ${DEPLOY}/lib/*.py "$DEVDEPLOY/lib" + + strip_files ${DEPLOY}/lib/* } diff --git a/pkg/unbound/build b/pkg/unbound/build index f3b5605..d8363cb 100644 --- a/pkg/unbound/build +++ b/pkg/unbound/build @@ -28,4 +28,5 @@ deploy() { rm -r "$DEPLOY/share" split_dev_deploy "$DEPLOY" "$DEVDEPLOY" + strip_files ${DEPLOY}/{bin,lib}/* } diff --git a/pkg/zlib/build b/pkg/zlib/build index 4bd8850..765fc4a 100644 --- a/pkg/zlib/build +++ b/pkg/zlib/build @@ -27,4 +27,5 @@ deploy() { mv "$DEPLOY/share/pkgconfig" "$DEVDEPLOY/lib" rm -r ${DEPLOY}/share + strip_files ${DEPLOY}/lib/* }