From f2006f74938fe97df6d9fb7ab344265096a73196 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 12 May 2019 10:31:18 +0300 Subject: [PATCH] puke: Fix bugs --- puke | 26 ++++--- repo/minibase/build | 4 + repo/minibase/checksums | 0 repo/minibase/manifest | 163 ++++++++++++++++++++++++++++++++++++++++ repo/minibase/sources | 1 + repo/minibase/version | 1 + repo/perl/manifest | 1 - repo/zlib/manifest | 1 - 8 files changed, 186 insertions(+), 11 deletions(-) create mode 100755 repo/minibase/build create mode 100644 repo/minibase/checksums create mode 100644 repo/minibase/manifest create mode 100644 repo/minibase/sources create mode 100644 repo/minibase/version diff --git a/puke b/puke index 9b583fbe..8b9dc95a 100755 --- a/puke +++ b/puke @@ -15,16 +15,18 @@ log() { clean() { rm -rf -- "$mak_dir" "$pkg_dir" - [ -n "$name" ] && + [ -n "$name" ] && { rm "$rep_dir/$name/.checksums" 2>/dev/null + rm "$rep_dir/$name/.manifest" 2>/dev/null + } } pkg_info() { - [ -z "$1" ] && die "No package specified." - cd "./repo/$1" || die "Package '$1' not in repository." - [ -f version ] || die "Version file not found." - [ -f sources ] || die "Sources file not found." - [ -f build ] || die "Build file not found." + [ -z "$1" ] && die "No package specified." + cd "$rep_dir/$1" || die "Package '$1' not in repository." + [ -f version ] || die "Version file not found." + [ -f sources ] || die "Sources file not found." + [ -f build ] || die "Build file not found." read -r version release < version name=$1 @@ -125,6 +127,8 @@ pkg_build() { cd "$rep_dir/$name" cp -R "$rep_dir/$name" "$pkg_dir/$dbs_dir" + touch "$pkg_dir/$dbs_dir/$name/manifest" + log "Sucessfully built $pkg." } @@ -135,6 +139,7 @@ pkg_manifest() { _ -not -type d > "$OLDPWD/manifest" _ -type d | sort -r >> "$OLDPWD/manifest" + cp "$OLDPWD/manifest" "$pkg_dir/$dbs_dir/$name" cd - >/dev/null } @@ -162,6 +167,8 @@ pkg_install() { pkg_remove() { pkg_list "$name" || return 1 + cp "$sys_dir/$dbs_dir/$name/manifest" .manifest + while read -r file; do [ "${file%/*}" = "/etc" ] && continue @@ -174,7 +181,7 @@ pkg_remove() { fi [ "$?" = 0 ] && log "Removed $file" - done < "$sys_dir/$dbs_dir/$name/manifest" + done < .manifest return 0 } @@ -206,8 +213,9 @@ pkg_list() { args() { [ -n "${1##l*}" ] && [ -n "${1##u*}" ] && { - mkdir -p sources build pkg/var/db/puke sys bin || - die "Couldn't create directories at '$PWD'". + mkdir -p "$src_dir" "$mak_dir" "$pkg_dir/$dbs_dir" \ + "$sys_dir" "$bin_dir" || + die "Couldn't create directories at '$PWD'". pkg_info "$2" } diff --git a/repo/minibase/build b/repo/minibase/build new file mode 100755 index 00000000..381d9113 --- /dev/null +++ b/repo/minibase/build @@ -0,0 +1,4 @@ +./configure + +make +make DESTDIR="$pkg_dir" install diff --git a/repo/minibase/checksums b/repo/minibase/checksums new file mode 100644 index 00000000..e69de29b diff --git a/repo/minibase/manifest b/repo/minibase/manifest new file mode 100644 index 00000000..22503cce --- /dev/null +++ b/repo/minibase/manifest @@ -0,0 +1,163 @@ +/sbin/logcat +/sbin/strings +/sbin/wifi +/sbin/ip4addr +/sbin/hexdump +/sbin/time +/sbin/bcp +/sbin/msh +/sbin/date +/sbin/lr +/sbin/lsusb +/sbin/sysinfo +/sbin/chmod +/sbin/pstree +/sbin/tictl +/sbin/service/svhub +/sbin/service/ifmon +/sbin/service/udevmod +/sbin/service/timed +/sbin/service/keymon +/sbin/service/sockmod +/sbin/service/wsupp +/sbin/service/mountd +/sbin/service/sysklogd +/sbin/service/suhub +/sbin/service/acpid +/sbin/service/vtmux +/sbin/service/badsrv +/sbin/sudo +/sbin/system/findblk +/sbin/system/rootsh +/sbin/system/stubvt +/sbin/system/reboot +/sbin/system/xorgvt +/sbin/system/ctrlvt +/sbin/system/switchroot +/sbin/system/passblk +/sbin/pslist +/sbin/lsdri +/sbin/stat +/sbin/cpy +/sbin/ren +/sbin/modinfo +/sbin/whoami +/sbin/cat +/sbin/errno +/sbin/lsmod +/sbin/tail +/sbin/modprobe +/sbin/cal +/sbin/systime +/sbin/symlink +/sbin/clear +/sbin/ls +/sbin/dektool +/sbin/vtctl +/sbin/du +/sbin/df +/sbin/ifcfg +/sbin/dmcrypt +/sbin/kill +/sbin/elfinfo +/sbin/ifctl +/sbin/chown +/sbin/sync +/sbin/ip4info +/sbin/del +/sbin/kmount +/sbin/runwith +/sbin/dhcp +/sbin/svctl +/sbin/logger +/sbin/cmd +/sbin/locfg +/sbin/dmesg +/sbin/blkid +/sbin/deitool +/sbin/ff +/sbin/pmount +/sbin/fn +/sbin/lspci +/sbin/which +/sbin/depmod +/sbin/inputs +/sman/man5/blktab.5 +/sman/man8/mountd.8 +/sman/man8/sysinfo.8 +/sman/man8/udevmod.8 +/sman/man8/findblk.8 +/sman/man8/sockmod.8 +/sman/man8/deitool.8 +/sman/man8/suhub.8 +/sman/man8/kmount.8 +/sman/man8/dmcrypt.8 +/sman/man8/acpid.8 +/sman/man8/locfg.8 +/sman/man8/blkid.8 +/sman/man8/keymon.8 +/sman/man8/switchroot.8 +/sman/man8/dmesg.8 +/sman/man8/dektool.8 +/sman/man8/vtmux.8 +/sman/man8/passblk.8 +/sman/man8/sysklogd.8 +/sman/man8/systime.8 +/sman/man8/svhub.8 +/sman/man1/chown.1 +/sman/man1/kill.1 +/sman/man1/tail.1 +/sman/man1/ff.1 +/sman/man1/stat.1 +/sman/man1/hexdump.1 +/sman/man1/pmount.1 +/sman/man1/cmd.1 +/sman/man1/depmod.1 +/sman/man1/strings.1 +/sman/man1/cal.1 +/sman/man1/clear.1 +/sman/man1/modprobe.1 +/sman/man1/time.1 +/sman/man1/lsmod.1 +/sman/man1/lsusb.1 +/sman/man1/bcp.1 +/sman/man1/cat.1 +/sman/man1/vtctl.1 +/sman/man1/svctl.1 +/sman/man1/sudo.1 +/sman/man1/sync.1 +/sman/man1/pslist.1 +/sman/man1/df.1 +/sman/man1/symlink.1 +/sman/man1/du.1 +/sman/man1/logcat.1 +/sman/man1/ls.1 +/sman/man1/fn.1 +/sman/man1/date.1 +/sman/man1/inputs.1 +/sman/man1/chmod.1 +/sman/man1/which.1 +/sman/man1/errno.1 +/sman/man1/cpy.1 +/sman/man1/logger.1 +/sman/man1/del.1 +/sman/man1/lr.1 +/sman/man1/modinfo.1 +/sman/man1/ren.1 +/sman/man1/pstree.1 +/var/db/puke/minibase/sources +/var/db/puke/minibase/manifest +/var/db/puke/minibase/checksums +/var/db/puke/minibase/build +/var/db/puke/minibase/version +/var/db/puke/minibase +/var/db/puke +/var/db +/var +/sman/man8 +/sman/man5 +/sman/man1 +/sman +/sbin/system +/sbin/service +/sbin diff --git a/repo/minibase/sources b/repo/minibase/sources new file mode 100644 index 00000000..790a1432 --- /dev/null +++ b/repo/minibase/sources @@ -0,0 +1 @@ +git:https://github.com/arsv/minibase.git diff --git a/repo/minibase/version b/repo/minibase/version new file mode 100644 index 00000000..a383ea1a --- /dev/null +++ b/repo/minibase/version @@ -0,0 +1 @@ +git 1 diff --git a/repo/perl/manifest b/repo/perl/manifest index ecfb4582..463d17c5 100644 --- a/repo/perl/manifest +++ b/repo/perl/manifest @@ -2449,7 +2449,6 @@ /var/db/puke/perl/sources /var/db/puke/perl/manifest /var/db/puke/perl/checksums -/var/db/puke/perl/release /var/db/puke/perl/build /var/db/puke/perl/version /var/db/puke/perl diff --git a/repo/zlib/manifest b/repo/zlib/manifest index 032e1fe8..df2a128e 100644 --- a/repo/zlib/manifest +++ b/repo/zlib/manifest @@ -4,7 +4,6 @@ /var/db/puke/zlib/sources /var/db/puke/zlib/manifest /var/db/puke/zlib/checksums -/var/db/puke/zlib/post-install /var/db/puke/zlib/build /var/db/puke/zlib/version /lib/libz.so.1.2.11