чување b41ce54cc93ee16a7c631554289525ac088164f1
родитељ 5e9ee9014b2aa6dbdb278b43cd85517567d66d19
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Thu, 27 Apr 2023 20:27:33 +0200
* Add galeb-howtos
* Update svc to 0.3
* Add -T to xz in 05-mkbootimage.sh
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
измењених датотека: 6, додавања: 53(+), брисања: 11(-)
diff --git a/03-packages.sh b/03-packages.sh
@@ -33,7 +33,7 @@ msg info "Creating symlinks"
begin_step "packages"
-totalsubsteps=136
+totalsubsteps=137
substep=1
msg info "Creating temporary links"
@@ -3945,6 +3945,45 @@ timestamp=$(date +'%Y-%m-%d %T')
printf "%s\t%s\t%s\n" mksh 20230412 "${timestamp}" >>${G_PKGDB}
end_substep
+begin_substep galeb-howtos-0.2
+if [ -e /share/doc/howtos ]; then
+ msg info "%s exists, skipping %s" /share/doc/howtos ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ remove_dir ${G_SRC}/${pkg}
+ extract_pkg ${G_SRC} galeb-howtos-v0.2 ${pkg}.tar.gz ${pkg}
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ DESTDIR=/build
+ export DESTDIR
+
+ mkdir -p \${DESTDIR}/share/legal/${pkg}
+ cp LICENSE \${DESTDIR}/share/legal/${pkg}/
+
+ mkdir -p \${DESTDIR}/share/doc/${pkg}
+ cp *.howto \${DESTDIR}/share/doc/${pkg}/
+ ln -sf ${pkg} \${DESTDIR}/share/doc/howtos
+}
+!
+ mkpk ${pkg}
+ remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" galeb-howtos 0.2 "${timestamp}" >>${G_PKGDB}
+end_substep
+
begin_substep sled-0.11.5
if [ -x /bin/sled ]; then
msg info "%s exists, skipping %s" /bin/sled ${pkg}
diff --git a/04-finale.sh b/04-finale.sh
@@ -262,13 +262,13 @@ timestamp=$(date +'%Y-%m-%d %T')
printf "%s\t%s\t%s\n" ubase 20230412 "${timestamp}" >>${G_PKGDB}
end_substep
-begin_substep svc-0.2
+begin_substep svc-0.3
if [ -x /bin/svc ]; then
msg info "%s exists, skipping %s" /bin/svc ${pkg}
elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
unpack_pkg ${pkg} /
else
- extract_pkg ${G_SRC} svc-v0.2 ${pkg}.tar.gz ${pkg}
+ extract_pkg ${G_SRC} svc-v0.3 ${pkg}.tar.gz ${pkg}
(
cd_or_fail ${G_SRC}/${pkg}
@@ -294,7 +294,7 @@ mkpk_install()
) || exit 1
fi
timestamp=$(date +'%Y-%m-%d %T')
-printf "%s\t%s\t%s\n" svc 0.2 "${timestamp}" >>${G_PKGDB}
+printf "%s\t%s\t%s\n" svc 0.3 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep mkpk-0.1.11
diff --git a/05-mkbootimage.sh b/05-mkbootimage.sh
@@ -8,6 +8,8 @@ fi
. ./lib/env.sh
. ./lib/fun.sh
+T=$(echo $JN | sed 's,[^0-9]*\([0-9]\+\)[^0-9]*,\1,g')
+
if [ "$(id -u)" -ne 0 ]; then
msg err "You must run this script as root"
exit 1
@@ -68,6 +70,6 @@ e2fsck -p /dev/loop0p2 || exit 1
fsck.fat -p /dev/loop0p1 || exit 1
losetup -d /dev/loop0 || exit 1
-xz -9vvf "${diskimg}" || exit 1
+xz -T$T -9vvf "${diskimg}" || exit 1
chown ${GUSER}:${GUSER} "${diskimg}".xz
) || msg err "Image generation failed"
diff --git a/TODO b/TODO
@@ -9,11 +9,6 @@ High priority
[ ] Continue work on X.Org
[x] Add and test wpa_supplicant
-[ ] Adjust output of svc to account for service names longer than 8 chars (have
- one \t less in output in such a case)
-
-[ ] Add galeb-howtos to the list of packages installed by default
-
<~> Wireless support - needs testing!
[ ] git://r-36.net/conn
[ ] git://r-36.net/rfkilld
diff --git a/TODO.done b/TODO.done
@@ -4,6 +4,11 @@ Done todos
2.2
---
+[x] Adjust output of svc to account for service names longer than 8 chars (have
+ one \t less in output in such a case)
+
+[x] Add galeb-howtos to the list of packages installed by default
+
[x] Use elinks 0.17.GIT?
- Done.
diff --git a/lib/pkgs.tsv b/lib/pkgs.tsv
@@ -70,11 +70,12 @@ https://ftp.gnu.org/gnu/texinfo/texinfo-7.0.3.tar.xz 7d14f7458f2b7d0ee0b740e00a
https://ftp.gnu.org/gnu/which/which-2.21.tar.gz d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61
https://ftp.gnu.org/pub/gnu/gcc/gcc-12.2.0/gcc-12.2.0.tar.xz e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
https://ftpmirror.gnu.org/autoconf-archive/autoconf-archive-2023.02.20.tar.xz a744f5aa0c1a813b81ad1528aebf7511bde7f470f34626d2057ed6664127120182e031fec5d22027d4a204544266135f202b8ef453bff70a3b0315c506c82528
+https://git.sr.ht/~strahinja/galeb-howtos/archive/v0.2.tar.gz galeb-howtos-0.2.tar.gz efdd4d811ba98d3a44faf827bdbdf8e52ca159a9d485783fa7be0ebbf7e292d7a83d7dbd17f0a769018bd91328d6335aae9ee390a26c33a56fd7a4df8f5199f0
https://git.sr.ht/~strahinja/galeb-mkinitramfs/archive/v0.4.tar.gz mkinitramfs-0.4.tar.gz d94a7c1add578474da3554fc3101fd2f05291f706e9958ced1917a8433ad0cd9d2402fc8069384689a82f9df64387fc794f872ddd0de2b1ef981545b77b41a9f
https://git.sr.ht/~strahinja/mkpk/archive/v0.1.11.tar.gz mkpk-0.1.11.tar.gz 22a83219ee6377cd2e0cf3d4233d6ebc27346ddc40fa5ad093d9ceec5ed238de3ea7d9909aadf2440e6453bfcd75fd46027ca6f16632e7fc2db241e604dd0b4d
https://git.sr.ht/~strahinja/sbase/archive/v0.2.tar.gz sbase-0.2.tar.gz 931e57202aacc56b8114bf58c8e34f4f22ed501b330165432fd69ce732bbc7e1be997ac9551c9f34ef892a4dd4f696f30eee38adc8eaee641055de1a161d0355
https://git.sr.ht/~strahinja/sled/archive/v0.11.5.tar.gz sled-0.11.5.tar.gz c329eb5086ea5ab76f109a1b15d8ec3c94c37bc09e306490502fd0b8592c59feeb6afd041d6ad14aaedf1c32902fe254951d9af83319c35d50f302fccfe1e138
-https://git.sr.ht/~strahinja/svc/archive/v0.2.tar.gz svc-0.2.tar.gz f389894db177900169d92aa0c9f0ce31509f61edb8add8d1f23bd867504f51ec22690ab7faa53a1e964bcf36f824f667beb7c6119a13d4c2624621107e7ea78a
+https://git.sr.ht/~strahinja/svc/archive/v0.3.tar.gz svc-0.3.tar.gz f7ee2ae944b0360d58eba7a01a1b584a14d8b87fa14d471ac504f12bc47edfdd2d471611c328976650ff6fa34486031733ad262246955ac22bf33bf73823ee24
https://git.sr.ht/~strahinja/table/archive/v0.6.10.tar.gz table-0.6.10.tar.gz e608f3eb00ec45044f3a90fc57dfb720abfef0c8bd8892ea6c76d29430d7b791de5810d55c5748b9c79f37455c23caab80fadef333e0ebafbd0c2dc5e0bfcdac
https://github.com/ArtifexSoftware/urw-base35-fonts/archive/refs/tags/20200910.tar.gz urw-base35-20200910.tar.gz 71fb27baadf5abc4ff624cdede02038681acd5fffdc728a5b2e7808713b80cb2f2174f90a1862e69d390c4434c49d5167ab095100032fa3ba80b586eb8ae51d1
https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.1.tar.gz xxhash-0.8.1.tar.gz 12feedd6a1859ef55e27218dbd6dcceccbb5a4da34cd80240d2f7d44cd246c7afdeb59830c2d5b90189bb5159293532208bf5bb622250102e12d6e1bad14a193
