чување 62b04fa382a7d5b1c00eacce19811be6b45219de
родитељ a33ee0205438e6a01e04fdc6926862a9975846fa
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Sun, 23 Apr 2023 21:00:11 +0200
Merge branch '2.2-wip' of git.sr.ht:~strahinja/galeb into 2.2-wip
Diffstat:
измењених датотека: 5, додавања: 41(+), брисања: 24(-)
diff --git a/03-packages.sh b/03-packages.sh
@@ -4654,6 +4654,7 @@ mkpk_install()
fi
patch -Np1 -i tcc-unicode-string-literals.patch
./do clean install
+ mv "\${PREFIX}/share/doc/table" "\${PREFIX}/share/doc/${pkg}"
}
!
mkpk ${pkg}
@@ -7340,6 +7341,13 @@ mkpk_install()
make ${JN} || exit 1
make DESTDIR="\${DESTDIR}" PREFIX="\${PREFIX}" install
+
+ mkdir -p "\${DESTDIR}/var/run/wpa_supplicant"
+ mkdir -p "\${DESTDIR}/etc"
+ cat <<@ >"\${DESTDIR}/etc/wpa_supplicant.conf"
+ctrl_interface=DIR=/var/run/wpa_supplicant
+update_config=1
+@
}
!
mkpk ${pkg}
@@ -7351,13 +7359,13 @@ timestamp=$(date +'%Y-%m-%d %T')
printf "%s\t%s\t%s\n" wpa_supplicant 2.10 "${timestamp}" >>${G_PKGDB}
end_substep
-begin_substep mkinitramfs-0.3
+begin_substep mkinitramfs-0.4
if [ -x /bin/mkinitramfs ]; then
msg info "%s exists, skipping %s" /bin/mkinitramfs ${pkg}
elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
unpack_pkg ${pkg} /
else
- extract_pkg ${G_SRC} galeb-mkinitramfs-v0.3 ${pkg}.tar.gz ${pkg}
+ extract_pkg ${G_SRC} galeb-mkinitramfs-v0.4 ${pkg}.tar.gz ${pkg}
(
cd_or_fail ${G_SRC}/${pkg}
cat <<! >MKPK
@@ -7368,7 +7376,7 @@ mkpk_name()
mkpk_install()
{
- FALLBACKVER=0.1
+ FALLBACKVER=0.4
DESTDIR=/build
export FALLBACKVER DESTDIR
@@ -7381,7 +7389,7 @@ mkpk_install()
) || exit 1
fi
timestamp=$(date +'%Y-%m-%d %T')
-printf "%s\t%s\t%s\n" mkinitramfs 0.3 "${timestamp}" >>${G_PKGDB}
+printf "%s\t%s\t%s\n" mkinitramfs 0.4 "${timestamp}" >>${G_PKGDB}
end_substep
end_step # packages
diff --git a/04-finale.sh b/04-finale.sh
@@ -127,18 +127,20 @@ timestamp=$(date +'%Y-%m-%d %T')
printf "%s\t%s\t%s\n" smdev 20230417 "${timestamp}" >>${G_PKGDB}
end_substep
-begin_substep sbase-20230417
+begin_substep sbase-0.2
if [ -e /bin/ls ] && [ ! -L /bin/ls ]; then
msg info "%s exists, skipping %s" /bin/ls ${pkg}
elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
unpack_pkg ${pkg} /
else
+ extract_pkg ${G_SRC} sbase-v0.2 ${pkg}.tar.gz ${pkg}
(
cd_or_fail ${G_SRC}/${pkg}
- git apply patches/0001-Split-path-into-prefix-name-on-c.patch \
+ patch -p1 < patches/0001-Split-path-into-prefix-name-on-c.patch \
|| exit 1
- git apply patches/0001-Add-n-equivalent-of-no-recursion.patch \
+ patch -p1 < \
+patches/0001-Add-both-T-filelist-and-n-equivalent-of-no-recursion.patch \
|| exit 1
cat <<! >MKPK
@@ -176,7 +178,7 @@ mkpk_install()
) || exit 1
fi
timestamp=$(date +'%Y-%m-%d %T')
-printf "%s\t%s\t%s\n" sbase 20230417 "${timestamp}" >>${G_PKGDB}
+printf "%s\t%s\t%s\n" sbase 0.2 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep ubase-20230412
@@ -260,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.1
+begin_substep svc-0.2
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.1 ${pkg}.tar.gz ${pkg}
+ extract_pkg ${G_SRC} svc-v0.2 ${pkg}.tar.gz ${pkg}
(
cd_or_fail ${G_SRC}/${pkg}
@@ -292,16 +294,16 @@ mkpk_install()
) || exit 1
fi
timestamp=$(date +'%Y-%m-%d %T')
-printf "%s\t%s\t%s\n" svc 0.1 "${timestamp}" >>${G_PKGDB}
+printf "%s\t%s\t%s\n" svc 0.2 "${timestamp}" >>${G_PKGDB}
end_substep
-begin_substep mkpk-0.1.10
+begin_substep mkpk-0.1.11
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
- extract_pkg ${G_SRC} mkpk-v0.1.10 ${pkg}.tar.gz ${pkg}
+ extract_pkg ${G_SRC} mkpk-v0.1.11 ${pkg}.tar.gz ${pkg}
(
cd_or_fail ${G_SRC}/${pkg}
@@ -322,7 +324,7 @@ mkpk_install()
) || exit 1
fi
timestamp=$(date +'%Y-%m-%d %T')
-printf "%s\t%s\t%s\n" mkpk 0.1.10 "${timestamp}" >>${G_PKGDB}
+printf "%s\t%s\t%s\n" mkpk 0.1.11 "${timestamp}" >>${G_PKGDB}
end_substep
msg info "Creating /boot/EFI"
@@ -347,6 +349,17 @@ cat <<! >/etc/galeb-release
Galeb musl/Linux ${G_VER}
!
+msg info "Generating /etc/hosts"
+cat <<! >/etc/hosts
+127.0.0.1 localhost.localdomain localhost
+::1 localhost.localdomain localhost
+127.0.0.1 ${GHOSTNAME}.localdomain ${GHOSTNAME}
+127.0.1.1 ${GHOSTNAME}.localdomain ${GHOSTNAME}
+!
+
+msg info "Creating /etc/resolv.conf"
+:>/etc/resolv.conf
+
msg info "Generating initramfs"
mkinitramfs
diff --git a/fil/rc.d/rc.init b/fil/rc.d/rc.init
@@ -14,9 +14,6 @@ printf "${green}===( ${bold}${white}%s${norm}${green} )=== booting${norm}\n" \
ctrlaltdel -s
-msg info "Mounted filesystems"
-mount
-sleep 10
msg info "Mounting essential filesystems"
mount -n -t proc -o nosuid,noexec,nodev proc /proc
mount -n -t sysfs -o nosuid,noexec,nodev sysfs /sys
diff --git a/lib/env.sh b/lib/env.sh
@@ -4,8 +4,7 @@
# necessity to run some scripts as root
GUSER=strajder
-
-CONFIG_EXTRA_FIRMWARE=""
+GHOSTNAME=galeb
# Enter custom firmware inclusion patterns
# Contents of this variable is sent as argument to rsync(1)
@@ -60,7 +59,7 @@ JN=${JN:- -j$(($(grep ^processor /proc/cpuinfo | wc -l) * 3))}
G_PKGDB=${G_SPKG}/pkgdb.tsv
-export GUSER INCLUDE_FIRMWARE
+export GUSER GHOSTNAME INCLUDE_FIRMWARE
export CT_TRI GR_TRI GHOME GUID GGID GR CTD FLD PTD TLD CT TL G_ARCH G_ARCH_EXT
export G_ARCH_EXT_ALT G_FIFO G_LGL G_LOG G_FIL G_LIB G_LOGFILE G_PAT G_PKG
export G_SHORTLOG G_SPKG G_SRC G_TARGET G_VER JN
diff --git a/lib/pkgs.tsv b/lib/pkgs.tsv
@@ -1,7 +1,6 @@
URL Directory/Tarball SHA512 Sum
ftp://ftp.vim.org/pub/vim/unix/vim-9.0.tar.bz2 e86adeaf4bfcf4d32cf9ad98825100dcd7cc0140c2e62d05ceefdf470ba94d5b6afa4bd8aa2b1083ff0a5092efd03afa2ded11c46e5cd1d87c3814939d9ff1e6
git+https://git.adelielinux.org/adelie/musl-locales.git musl-locales-20230413
-git+https://git.sr.ht/~strahinja/sbase sbase-20230417
git+https://github.com/cpeuvrel/usleep-aur usleep-20230414
git+https://github.com/mirbsd/mksh mksh-20230412
git+https://github.com/onetrueawk/awk awk-20230412
@@ -70,10 +69,11 @@ 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-mkinitramfs/archive/v0.3.tar.gz mkinitramfs-0.3.tar.gz 93b0f5fd870da4fe4b2fb42f6a7fdcd6047b075336544c3132c76714b64c6b355aba9bb42422b0de2af4aa20e112c86707a5f1c045a64cc536ea1a593f815a33
-https://git.sr.ht/~strahinja/mkpk/archive/v0.1.10.tar.gz mkpk-0.1.10.tar.gz 4fc1f20fb46a24ee96508890dc8928769b450153b914b83d20dc37834c4b229819b29fff97c64497fd567c9629f853e2eab80ff3bd07cbf42e8c3d51b2496c1d
+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.1.tar.gz svc-0.1.tar.gz b78b30b87ce5d3803eafa6999219d2db51f7ab5f01a0e7fcc871b3fa09da5834fefe6d3e9a83eb31b27251afaa142bb4ff320cfa100efda46531700103805e13
+https://git.sr.ht/~strahinja/svc/archive/v0.2.tar.gz svc-0.2.tar.gz f389894db177900169d92aa0c9f0ce31509f61edb8add8d1f23bd867504f51ec22690ab7faa53a1e964bcf36f824f667beb7c6119a13d4c2624621107e7ea78a
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
