diff --git a/pkg/bash/build b/pkg/bash/build index 9d31ca1..a364111 100755 --- a/pkg/bash/build +++ b/pkg/bash/build @@ -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" diff --git a/pkg/boot-rpi3/build b/pkg/boot-rpi3/build index f904f43..58d0a87 100755 --- a/pkg/boot-rpi3/build +++ b/pkg/boot-rpi3/build @@ -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" } diff --git a/pkg/bzip2/build b/pkg/bzip2/build index 7be1ee9..88cf0c9 100755 --- a/pkg/bzip2/build +++ b/pkg/bzip2/build @@ -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" } diff --git a/pkg/kmod/build b/pkg/kmod/build index 1d2cbf0..604d3ae 100644 --- a/pkg/kmod/build +++ b/pkg/kmod/build @@ -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() { diff --git a/pkg/ncurses/build b/pkg/ncurses/build index c246629..a84711b 100755 --- a/pkg/ncurses/build +++ b/pkg/ncurses/build @@ -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() { diff --git a/pkg/openssh/build b/pkg/openssh/build index e3d71da..21781b7 100644 --- a/pkg/openssh/build +++ b/pkg/openssh/build @@ -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" } diff --git a/pkg/shadow/build b/pkg/shadow/build index 9ffab68..50519d5 100755 --- a/pkg/shadow/build +++ b/pkg/shadow/build @@ -25,7 +25,6 @@ deploy() { # *hrmpf* if [ -e "$PKGDEPLOYDIR/sbin" ]; then mv ${PKGDEPLOYDIR}/sbin/* "$PKGDEPLOYDIR/bin" - rmdir "$PKGDEPLOYDIR/sbin" fi } diff --git a/pkg/tzdata/build b/pkg/tzdata/build index 28defd8..9c3d840 100644 --- a/pkg/tzdata/build +++ b/pkg/tzdata/build @@ -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() {