cleanup: remove symlink creation and file deletion from package build

We already have a micro managed list of files we include in the packages.

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
This commit is contained in:
David Oberhollenzer 2019-03-06 21:51:55 +01:00
parent dd643ca334
commit 93a0cb1ca5
8 changed files with 2 additions and 35 deletions

View File

@ -18,7 +18,6 @@ build() {
deploy() {
make DESTDIR="$PKGDEPLOYDIR" install
ln -sv bash "$PKGDEPLOYDIR/bin/sh"
cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$PKGDEPLOYDIR"
cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"

View File

@ -11,9 +11,6 @@ deploy() {
cp -r ${SOURCE}/boot/* "$PKGDEPLOYDIR/"
rm "$PKGDEPLOYDIR/kernel7.img" "$PKGDEPLOYDIR/kernel.img"
rm "$PKGDEPLOYDIR/COPYING.linux"
cp "$SCRIPTDIR/pkg/boot-rpi3/config.txt" "$PKGDEPLOYDIR/config.txt"
cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
}

View File

@ -28,13 +28,6 @@ build() {
deploy() {
make PREFIX="$PKGDEPLOYDIR" install
rm ${PKGDEPLOYDIR}/bin/{bzegrep,bzfgrep,bzless,bzcmp}
ln -s "/bin/bzgrep" "$PKGDEPLOYDIR/bin/bzegrep"
ln -s "/bin/bzgrep" "$PKGDEPLOYDIR/bin/bzfgrep"
ln -s "/bin/bzmore" "$PKGDEPLOYDIR/bin/bzless"
ln -s "/bin/bzdiff" "$PKGDEPLOYDIR/bin/bzcmp"
cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
}

View File

@ -16,14 +16,8 @@ build() {
}
deploy() {
local target
make DESTDIR="$PKGDEPLOYDIR" install
cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
for target in depmod insmod lsmod modinfo modprobe rmmod; do
ln -sf kmod $PKGDEPLOYDIR/bin/$target
done
}
check_update() {

View File

@ -21,21 +21,9 @@ build() {
deploy() {
make DESTDIR="$PKGDEPLOYDIR" install
cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
rm "$PKGDEPLOYDIR/bin/ncursesw6-config"
mkdir -p "$PKGDEPLOYDIR/include/ncurses"
for hdr in ${PKGDEPLOYDIR}/include/ncursesw/*.h; do
local fname=$(basename $hdr)
local target="../$fname"
mv "$hdr" "${PKGDEPLOYDIR}/include"
ln -s "$target" "${PKGDEPLOYDIR}/include/ncursesw/${fname}"
ln -s "$target" "${PKGDEPLOYDIR}/include/ncurses/${fname}"
done
ln -s "libncursesw.so.$VERSION" "$PKGDEPLOYDIR/lib/libtinfo.so"
ln -s "libncursesw.so.$VERSION" "$PKGDEPLOYDIR/lib/libtinfo.so.$VERSION"
ln -s "libncursesw.a" "$PKGDEPLOYDIR/lib/libtinfo.a"
mv ${PKGDEPLOYDIR}/include/ncursesw/*.h "$PKGDEPLOYDIR/include"
}
check_update() {

View File

@ -23,8 +23,7 @@ deploy() {
make DESTDIR="$PKGDEPLOYDIR" install
cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
mkdir -p "$PKGDEPLOYDIR/var/lib/sshd"
install -v -m755 "$SOURCE/contrib/ssh-copy-id" "$PKGDEPLOYDIR/bin"
cp "$SOURCE/contrib/ssh-copy-id" "$PKGDEPLOYDIR/bin"
cat_file_override "sshd_config" > "$PKGDEPLOYDIR/etc/sshd_config"
}

View File

@ -25,7 +25,6 @@ deploy() {
# *hrmpf*
if [ -e "$PKGDEPLOYDIR/sbin" ]; then
mv ${PKGDEPLOYDIR}/sbin/* "$PKGDEPLOYDIR/bin"
rmdir "$PKGDEPLOYDIR/sbin"
fi
}

View File

@ -20,8 +20,6 @@ deploy() {
cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
sed -i 's@/usr@@g' "$PKGDEPLOYDIR/bin/tzselect"
rm "$PKGDEPLOYDIR/bin/zdump"
rm "$PKGDEPLOYDIR/bin/zic"
}
check_update() {