чување cdeae9e4e3616ff06661fe6da3ebaded84ac491a
родитељ 78dfec04d8f8193eacae0ab0567c83c7ac9b46dd
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Sun, 31 Jul 2022 21:46:44 +0200
Add docutils; tar needs fixing
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
измењених датотека: 5, додавања: 67(+), брисања: 1(-)
diff --git a/03-packages.sh b/03-packages.sh
@@ -3251,6 +3251,49 @@ mkpk_install()
fi
end_substep
+# Needed for PRoot
+begin_substep docutils-0.19
+if [ -e /sucks/bin/rst2man.py ]; then
+ msg info "%s exists, skipping %s" /sucks/bin/rst2man.py ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.gz "" touch
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ sleep 1
+
+ CFLAGS='-Os -pipe'
+ LDFLAGS='-s'
+ DESTDIR=/build
+ export CFLAGS LDFLAGS DESTDIR YACC
+
+ python3 setup.py build || exit 1
+ python3 setup.py install --optimize=1 \\
+ --prefix=/sucks --root=/build
+ for py in \$(find /build/sucks/bin -name '*.py')
+ do
+ ln -s \${py##*/} \${py%%.py}
+ done
+ sh
+}
+!
+ mkpk ${pkg}
+ remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+end_substep
+
begin_substep dosfstools-4.2
if [ -x /bin/fsck.vfat ]; then
msg info "%s exists, skipping %s" /bin/fsck.vfat ${pkg}
@@ -3805,6 +3848,7 @@ mkpk_install()
fi
end_substep
+if false; then
begin_substep proot-5.3.1
if [ -e /sucks/bin/proot ]; then
msg info "%s exists, skipping %s" /sucks/lib/libtalloc.so.2.3.4 ${pkg}
@@ -3833,8 +3877,21 @@ mkpk_install()
make -C src loader.elf loader-m32.elf build.h || exit 1
make -C src proot || exit 1
+ make -C doc || exit 1
install -Dm755 src/proot /build/sucks/bin/proot
+ install -Dm644 doc/proot/man.1 /build/sucks/share/man/man1/proot.1
+ install -Dm644 doc/proot/index.html \\
+ /build/sucks/share/doc/${pkg}/index.html
+ install -Dm644 doc/proot/changelog.txt \\
+ /build/sucks/share/doc/${pkg}/changelog.txt
+ install -Dm644 doc/proot/manual.txt \\
+ /build/sucks/share/doc/${pkg}/manual.txt
+ install -Dm644 doc/proot/roadmap.txt \\
+ /build/sucks/share/doc/${pkg}/roadmap.txt
+ install -dm755 /build/sucks/share/doc/${pkg}/stylesheets
+ install -m644 doc/proot/stylesheets/* \\
+ /build/sucks/share/doc/${pkg}/stylesheets/
}
!
mkpk ${pkg}
@@ -3843,6 +3900,7 @@ mkpk_install()
) || exit 1
fi
end_substep
+fi
begin_substep texinfo-6.8
if [ -x /sucks/bin/texi2dvi ]; then
diff --git a/04-finale.sh b/04-finale.sh
@@ -121,6 +121,8 @@ mkpk_install()
fi
end_substep
+HOST_TAR=0
+export HOST_TAR
begin_substep sbase-20220709
if [ -e /bin/ls ] && [ ! -L /bin/ls ]; then
msg info "%s exists, skipping %s" /bin/ls ${pkg}
@@ -169,6 +171,9 @@ mkpk_install()
fi
end_substep
+HOST_TAR=1
+export HOST_TAR
+
begin_substep ubase-20220709
if [ -x /bin/id ]; then
msg info "%s exists, skipping %s" /bin/id ${pkg}
diff --git a/TODO b/TODO
@@ -5,6 +5,8 @@ TODO
[ ] Add sacc
[ ] Add neomutt
+[ ] Fix sbase tar - split long names into prefix + name instead of choking
+
Low priority
------------
diff --git a/lib/fun.sh b/lib/fun.sh
@@ -584,5 +584,5 @@ unpack_pkg()
fi
cd_or_fail $1
msg info "Unpacking %s" ${G_SPKG}/${pkg}.tar.xz
- xz -dc ${G_SPKG}/${pkg}.tar.xz | tar -xf -
+ xz -dc ${G_SPKG}/${pkg}.tar.xz | g_tar -xf -
}
diff --git a/lib/pkgs.tsv b/lib/pkgs.tsv
@@ -140,3 +140,4 @@ https://www.zlib.net/pigz/pigz-2.7.tar.gz 2d084221ba829d29f344305845a313f3
https://github.com/libarchive/libarchive/releases/download/v3.6.1/libarchive-3.6.1.tar.xz 9465f7995649c9ea84854a7fd8c76f30
https://www.samba.org/ftp/talloc/talloc-2.3.4.tar.gz ffdaf52a6572307cc3b6487b9e99cd61
https://gitlab.com/proot/proot/-/archive/v5.3.1/proot-v5.3.1.tar.bz2 proot-5.3.1.tar.bz2 1000e9eb93c14688359dfd2e7a549d81
+https://downloads.sourceforge.net/docutils/docutils-0.19.tar.gz 0afa992a6e93db892107c3f087d0d9df
