чување 2d5d072f3ccc4bc8e57304866988cb47fc2addcd
родитељ 8e55a4a8846deaff72325137201cb9fc02baa51e
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Fri, 5 Aug 2022 23:15:48 +0200
Add mkpk to bootstrap; apply changes to doas.conf to bootstrap
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
измењених датотека: 4, додавања: 33(+), брисања: 4(-)
diff --git a/03-packages.sh b/03-packages.sh
@@ -5860,7 +5860,7 @@ mkpk_install()
# Adjust as necessary
cat <<@ >../build/etc/doas.conf
deny root
-permit nopass :wheel
+permit nopass setenv { PATH=/bin:/sucks/bin:/plan9/bin EDITOR } :wheel
@
chmod 4755 ../build/bin/doas
diff --git a/04-finale.sh b/04-finale.sh
@@ -269,6 +269,33 @@ mkpk_install()
fi
end_substep
+begin_substep mkpk-20220805
+if [ -x /bin/mkpk ]; then
+ msg info "%s exists, skipping %s" /bin/mkpk ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ /plan9/bin/mk DESTDIR=/build PREFIX='' install
+}
+!
+ mkpk ${pkg}
+ #remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+end_substep
+
msg info "makewhatis /share/man"
makewhatis /share/man
msg info "makewhatis /sucks/share/man"
diff --git a/lib/fun.sh b/lib/fun.sh
@@ -347,7 +347,7 @@ mkpk()
fi
cd ..
- mkdir -p bin build dev etc include share sucks tmp tools
+ mkdir -p bin build dev etc include plan9 share sucks tmp tools
bm()
{
@@ -368,6 +368,7 @@ mkpk()
rbm etc
rbm include
rbm lib
+ rbm plan9
rbm share
rbm sucks
bm tmp
@@ -414,6 +415,7 @@ mkpk()
umount ../tmp
umount ../sucks
umount ../share
+ umount ../plan9
umount ../lib
umount ../include
umount ../etc
@@ -440,7 +442,7 @@ mkpk()
rm -fr sucks
rm -fr share
rm usr
- rmdir bin dev etc include tmp tools
+ rmdir bin dev etc include plan9 tmp tools
exit ${fail}
) || {
msg err "mkpk failed"
diff --git a/lib/pkgs.tsv b/lib/pkgs.tsv
@@ -1,6 +1,7 @@
URL Directory/Tarball MD5 Sum
ftp://ftp.vim.org/pub/vim/unix/vim-8.1.tar.bz2 1739a1df312305155285f0cfa6118294
git+https://git.adelielinux.org/adelie/musl-locales.git musl-locales-20220708
+git+https://git.sr.ht/~strahinja/mkpk mkpk-20220805
git+https://git.sr.ht/~strahinja/reflow reflow-20220716
git+https://git.sr.ht/~strahinja/sbase sbase-20220801
git+https://git.sr.ht/~strahinja/svc svc-20220720
@@ -85,7 +86,6 @@ https://github.com/libarchive/libarchive/releases/download/v3.6.1/libarchive-3.6
https://github.com/libcheck/check/releases/download/0.15.2/check-0.15.2.tar.gz 50fcafcecde5a380415b12e9c574e0b2
https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz libevent-2.1.12.tar.gz b5333f021f880fe76490d8a799cd79f4
https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz 294b921e6cf9ab0fbaea4b639f8fdbe8
-https://github.com/martanne/vis/releases/download/v0.7/vis-0.7.tar.gz a45ba03d1fa4785ee5693f9619f22e85
https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz 8998d77313d753a0c474d9bdf1738b2e
https://github.com/michaelforney/samurai/releases/download/1.2/samurai-1.2.tar.gz 3ad6771de19a93660fdb36dc67687727
https://github.com/p11-glue/p11-kit/releases/download/0.24.1/p11-kit-0.24.1.tar.xz 67b2539bdca6b4bedaeecc12864d2796
