mirror of
https://github.com/pygos/build.git
synced 2024-11-22 11:09:46 +01:00
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 <david.oberhollenzer@tele2.at>
This commit is contained in:
parent
2147fbb3b2
commit
fc0b587074
26 changed files with 35 additions and 15 deletions
|
@ -33,4 +33,5 @@ deploy() {
|
||||||
cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$DEPLOY"
|
cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$DEPLOY"
|
||||||
|
|
||||||
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
||||||
|
rm -r "$DEPLOY/lib"
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,6 +31,6 @@ deploy() {
|
||||||
# just some script that tells you to use a different command
|
# just some script that tells you to use a different command
|
||||||
rm "$DEPLOY/bin/fsck.btrfs"
|
rm "$DEPLOY/bin/fsck.btrfs"
|
||||||
|
|
||||||
strip_files ${DEPLOY}/bin/*
|
strip_files ${DEPLOY}/{bin,lib}/*
|
||||||
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,4 +37,5 @@ deploy() {
|
||||||
ln -s "/bin/bzdiff" "$DEPLOY/bin/bzcmp"
|
ln -s "/bin/bzdiff" "$DEPLOY/bin/bzcmp"
|
||||||
|
|
||||||
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
||||||
|
rmdir "$DEPLOY/lib"
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,5 +21,5 @@ deploy() {
|
||||||
local DEPLOY="$2"
|
local DEPLOY="$2"
|
||||||
|
|
||||||
make DESTDIR="$DEPLOY" install-strip
|
make DESTDIR="$DEPLOY" install-strip
|
||||||
rm -r "$DEPLOY/share"
|
rm -r "$DEPLOY/share" "$DEPLOY/lib"
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,5 +21,5 @@ deploy() {
|
||||||
|
|
||||||
make DESTDIR="$DEPLOY" install-strip
|
make DESTDIR="$DEPLOY" install-strip
|
||||||
|
|
||||||
rm -r "$DEPLOY/share"
|
rm -r "$DEPLOY/share" "$DEPLOY/lib"
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,5 +22,5 @@ deploy() {
|
||||||
|
|
||||||
make DESTDIR="$DEPLOY" install-strip
|
make DESTDIR="$DEPLOY" install-strip
|
||||||
|
|
||||||
rm -r "$DEPLOY/share"
|
rm -r "$DEPLOY/share" "$DEPLOY/lib"
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,4 +25,5 @@ deploy() {
|
||||||
rm -r "$DEPLOY/share"
|
rm -r "$DEPLOY/share"
|
||||||
|
|
||||||
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
||||||
|
strip_files ${DEPLOY}/lib/*.so*
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,5 +20,5 @@ deploy() {
|
||||||
local DEPLOY="$2"
|
local DEPLOY="$2"
|
||||||
|
|
||||||
make DESTDIR="$DEPLOY" install-strip
|
make DESTDIR="$DEPLOY" install-strip
|
||||||
rm -r "$DEPLOY/share"
|
rm -r "$DEPLOY/share" "$DEPLOY/lib"
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,5 +24,6 @@ deploy() {
|
||||||
|
|
||||||
make DESTDIR="$DEPLOY" install-strip
|
make DESTDIR="$DEPLOY" install-strip
|
||||||
|
|
||||||
rm -r "$DEPLOY/share"
|
rm -r "$DEPLOY/share" "$DEPLOY/lib"
|
||||||
|
(rmdir "$DEPLOY/libexec" || true) 2> /dev/null ;
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,4 +25,5 @@ deploy() {
|
||||||
rm -r "$DEPLOY/bin"
|
rm -r "$DEPLOY/bin"
|
||||||
|
|
||||||
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
||||||
|
strip_files ${DEPLOY}/lib/*
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,9 +20,11 @@ deploy() {
|
||||||
local DEPLOY="$2"
|
local DEPLOY="$2"
|
||||||
local DEVDEPLOY="$3"
|
local DEVDEPLOY="$3"
|
||||||
|
|
||||||
make DESTDIR="$DEPLOY" install-strip
|
make DESTDIR="$DEPLOY" install
|
||||||
|
|
||||||
rm -r "$DEPLOY/share"
|
rm -r "$DEPLOY/share"
|
||||||
|
rm "$DEPLOY/lib/charset.alias"
|
||||||
|
|
||||||
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
||||||
|
strip_files ${DEPLOY}/{bin,lib}/*
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,7 @@ deploy() {
|
||||||
make DESTDIR="$DEPLOY" install-strip
|
make DESTDIR="$DEPLOY" install-strip
|
||||||
|
|
||||||
rm -r "$DEPLOY/share"
|
rm -r "$DEPLOY/share"
|
||||||
|
rm "$DEPLOY/lib/charset.alias"
|
||||||
|
|
||||||
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,4 +33,6 @@ deploy() {
|
||||||
if [ -e "$SCRIPTDIR/board/$BOARD/LDPATH" ]; then
|
if [ -e "$SCRIPTDIR/board/$BOARD/LDPATH" ]; then
|
||||||
cat "$SCRIPTDIR/board/$BOARD/LDPATH" >> "$DEPLOY/etc/ld-musl-${MUSL_CPU}.path"
|
cat "$SCRIPTDIR/board/$BOARD/LDPATH" >> "$DEPLOY/etc/ld-musl-${MUSL_CPU}.path"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
strip_files ${DEPLOY}/lib/*
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,5 +21,5 @@ deploy() {
|
||||||
|
|
||||||
make DESTDIR="$DEPLOY" install-strip
|
make DESTDIR="$DEPLOY" install-strip
|
||||||
|
|
||||||
rm -r "$DEPLOY/share/"
|
rm -r "$DEPLOY/share" "$DEPLOY/lib"
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,7 @@ deploy() {
|
||||||
rm -r "$DEPLOY/share/man"
|
rm -r "$DEPLOY/share/man"
|
||||||
rm "$DEPLOY/bin/ncursesw6-config"
|
rm "$DEPLOY/bin/ncursesw6-config"
|
||||||
|
|
||||||
strip_files ${DEPLOY}/bin/*
|
strip_files ${DEPLOY}/bin/* ${DEPLOY}/lib/*.so*
|
||||||
|
|
||||||
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
||||||
|
|
||||||
|
|
|
@ -23,4 +23,5 @@ deploy() {
|
||||||
make DESTDIR="$DEPLOY" install
|
make DESTDIR="$DEPLOY" install
|
||||||
|
|
||||||
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
||||||
|
strip_files ${DEPLOY}/{bin,lib}/*
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,7 +44,8 @@ deploy() {
|
||||||
rm -r ${DEPLOY}/share
|
rm -r ${DEPLOY}/share
|
||||||
rm -r ${DEPLOY}/etc
|
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/{conf.d,init.d,runlevels,sysctl.d}
|
||||||
mkdir -p ${DEPLOY}/etc/runlevels/{boot,sysinit,shutdown,default}
|
mkdir -p ${DEPLOY}/etc/runlevels/{boot,sysinit,shutdown,default}
|
||||||
|
|
|
@ -30,4 +30,5 @@ deploy() {
|
||||||
rm -r "$DEPLOY/share"
|
rm -r "$DEPLOY/share"
|
||||||
|
|
||||||
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
||||||
|
strip_files ${DEPLOY}/bin/* ${DEPLOY}/lib/*.so*
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,9 @@ deploy() {
|
||||||
|
|
||||||
make SHLIB_LIBS="-lncursesw" DESTDIR="$DEPLOY" install
|
make SHLIB_LIBS="-lncursesw" DESTDIR="$DEPLOY" install
|
||||||
|
|
||||||
rm -r "$DEPLOY/share"
|
rm -r "$DEPLOY/share" "$DEPLOY/bin"
|
||||||
|
|
||||||
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
||||||
|
chmod 755 ${DEPLOY}/lib/*
|
||||||
|
strip_files ${DEPLOY}/lib/*
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,7 @@ build() {
|
||||||
mkdir -pv ${PKGBUILDDIR}/cfg/{preserve,overlay}
|
mkdir -pv ${PKGBUILDDIR}/cfg/{preserve,overlay}
|
||||||
|
|
||||||
cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$PKGBUILDDIR"
|
cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$PKGBUILDDIR"
|
||||||
|
cp -r "$SCRIPTDIR/pkg/$PKGNAME/lib" "$PKGBUILDDIR"
|
||||||
|
|
||||||
# install packages to rootfs
|
# install packages to rootfs
|
||||||
dependencies | tsort | tac | \
|
dependencies | tsort | tac | \
|
||||||
|
|
2
pkg/rootfs/lib/charset.alias
Normal file
2
pkg/rootfs/lib/charset.alias
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
ISO_646.IRV:1983 ASCII
|
||||||
|
UTF-8 UTF-8
|
|
@ -21,5 +21,5 @@ deploy() {
|
||||||
|
|
||||||
make DESTDIR="$DEPLOY" install-strip
|
make DESTDIR="$DEPLOY" install-strip
|
||||||
|
|
||||||
rm -r "$DEPLOY/share"
|
rm -r "$DEPLOY/share" "$DEPLOY/lib"
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,5 @@ deploy() {
|
||||||
|
|
||||||
make DESTDIR="$DEPLOY" install-strip
|
make DESTDIR="$DEPLOY" install-strip
|
||||||
|
|
||||||
rm -r "$DEPLOY/share/info"
|
rm -r "$DEPLOY/share" "$DEPLOY/lib"
|
||||||
rm -r "$DEPLOY/share/man"
|
|
||||||
rm -r "$DEPLOY/share/locale"
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,4 +51,6 @@ deploy() {
|
||||||
rm ${DEVDEPLOY}/lib/*.la
|
rm ${DEVDEPLOY}/lib/*.la
|
||||||
mv ${DEVDEPLOY}/lib/*.so* "$DEPLOY/lib"
|
mv ${DEVDEPLOY}/lib/*.so* "$DEPLOY/lib"
|
||||||
mv ${DEPLOY}/lib/*.py "$DEVDEPLOY/lib"
|
mv ${DEPLOY}/lib/*.py "$DEVDEPLOY/lib"
|
||||||
|
|
||||||
|
strip_files ${DEPLOY}/lib/*
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,4 +28,5 @@ deploy() {
|
||||||
rm -r "$DEPLOY/share"
|
rm -r "$DEPLOY/share"
|
||||||
|
|
||||||
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
|
||||||
|
strip_files ${DEPLOY}/{bin,lib}/*
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,4 +27,5 @@ deploy() {
|
||||||
mv "$DEPLOY/share/pkgconfig" "$DEVDEPLOY/lib"
|
mv "$DEPLOY/share/pkgconfig" "$DEVDEPLOY/lib"
|
||||||
|
|
||||||
rm -r ${DEPLOY}/share
|
rm -r ${DEPLOY}/share
|
||||||
|
strip_files ${DEPLOY}/lib/*
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue