commit e0026941dfa9f8dcb367eb21aebe4b1207923089
parent e25162dd6216bcb29c44390dced778a9ae5564e5
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Wed, 26 Nov 2025 14:08:53 +0000
update system-config
Diffstat:
12 files changed, 24 insertions(+), 274 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -2270,6 +2270,7 @@ f3cfdbc950c7c787397bbfc57b9a70a7bd2e5c5d sources/skalibs
fe6a7178c290979b822e287014f7c2f93aa0a732 sources/skalibs
ff066bd37e692daadc573fbd3ef622c3f1e8ec6a sources/skalibs
e9d8af262eb5e25536ea9778e3ed57aebb55488c sources/snaprep
+20f1fc8e70e98fa5e8e6e378ff53ce79628a45ca sources/system-config
ddb20e067ab184cd18ee8b88d74044dfeeaaad4c sources/system-config
f9d071a4c5870d42d00d0ca496efac527388e6f4 sources/system-config
dc793695cc0632a808af9d4415f3b0cf0f4dfba2 sources/system-config-scripts
diff --git a/templates/pkg/system-config b/templates/pkg/system-config
@@ -20,6 +20,7 @@
#+{{pkg_install_name("s6-rc")}}
#+{{pkg_install_name("s6")}}
#+{{pkg_install_name("zsh")}}
+#+{{pkg_install_name("libcgroup")}}
#+{{pkg_install_name("system-config-scripts")}}
#+{{pkg_install_name("logincaps")}}
#+{{pkg_install_name(["busybox-modutils", "busybox:modutils"][kernel is defined|int])}}
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -88,9 +88,9 @@
#+squashfs-tools.e7bea5b78e0e2b577342fa09ed7d9691f38e8aea480a107a27f59ffe1b5ec12f
#+mandoc.873388061ad4acc4a497ac4e216fa15837d2be004538344b7e99a4c0f288d773
#+tinyssh.b691a3785f950c64522766f5f43f05f24d72e6cad9320d8706cd9722ef763051
-#+system-config.4361ce6d25613705ddfe4552d8bea10d1e90b08214fce7f596f52aadda4e5c73
-#+system-config-rc.117c3de79f7b68afad10175a0a2e7adb76e6f7297b728a6dee27e515b38272b5
+#+system-config.778700e49de39fe37cd772dc7c9f51fa23be8b98c29bae117b3376b0b88ad7d6
+#+system-config-rc.5d7b1f01ed699cc09943212acfed2eaee05b44b2f864ff76119add1e2e01f935
#+system-config-scripts.a983668711783d5c36b32ca9859fe7c99b0cf3588bbeeb315b8ba5ca6b692831
-#+system-config-init.81feb16a99dc322b42eca38e74d695287886fec1b0134459f5b76b57c7a5ac6b
+#+system-config-init.6b29bd35ad2ce5934294c05499a0e1f125d120f0036db27325dc984d382d5c1f
#+system-config-zsh.9a3b5f12d36aa21000726f1da1e351fd62945101f5bb54392a52203d82c5aef9
#+busybox.2ef5301e1fcabd1b3cd0b88f9dda6a41d4e7b432be5e555dffa5aae865334e41
\ No newline at end of file
diff --git a/variants/ccx-x86_64/patchelf:bootstrap b/variants/ccx-x86_64/patchelf:bootstrap
@@ -1,127 +0,0 @@
-#!/usr/bin/env pthbs-build
-#@pragma:nosandbox
-#@pragma:nopath
-#@git:523f401584d9584e76c9c77004e7abeb9e6c4551:patchelf
-
-
-# - build script start -
-
-autotools_config() {
- prefix=/home/ccx/versions/$pthbs_package
- ./configure -C \
- --prefix="$prefix" \
- --build="$(${CC:-gcc} -dumpmachine)" \
- --bindir="$prefix/command" \
- --sbindir="$prefix/command" \
- --infodir="$prefix/info" \
- --localedir="$prefix/locale" \
- --mandir="$prefix/man" \
- --libdir="$prefix/library" \
- --docdir="$prefix/doc/patchelf" \
- --datadir="$prefix/data" \
- --datarootdir="$prefix/data" \
- --localstatedir='/var/pthbs' \
- "$@"
-
-}
-
-autotools_config_static() {
- build_env_static
- autotools_config "$@" --enable-static --disable-shared
-}
-
-build_env_static() {
- export LD_LIBRARY_PATH="$pthbs_build_environment/library"
- export CPATH="$pthbs_build_environment/include"
- export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
-}
-
-check_static() {
- local exe || true
- exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1
- if ! test -f $exe; then
- printf '%s\n' "Error: file '$1' doesn't exist!"
- exit 1
- fi
- local interp_info || true
- interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
- if test x '!=' "x$interp_info"; then
- printf '%s\n' "Error: '$1' is a dynamic binary!"
- exit 1
- fi
-}
-
-prefix=/home/ccx/versions/$pthbs_package
-dest=${pthbs_destdir%/}${prefix}
-cd 'patchelf'
-
-./bootstrap.sh
-autotools_config_static . --disable-nls
-
-make -j${JOBS:-1} -l$((1+${JOBS:-1}))
-
-make DESTDIR="$pthbs_destdir" install
-
-
-
-check_static command/patchelf
-
-
-cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
-find -type d -o -print | awk -F/ '
-BEGIN {
- x["./command/patchelf"]=1
- x["./man/man1/patchelf.1"]=1
-}
-
-function r1(s) {
- sub("^[.]/[^/]*", ".", s)
- return s
-}
-function s1(repl, s) {
- sub("^[.]/[^/]*", "./"repl, s)
- return s
-}
-function link(src) {
- x[$0]=0
- printf "%s\t%s\n", $0, src
- printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
-}
-$1!="."{exit 1}
-
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "env" { link($0); next }
-$2 == "command" { link($0); next }
-$2 == "bin" { link(s1("command", $0)); next }
-
-$2 == "library.so" { link($0); next }
-$2 == "library" { link($0); next }
-$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
-$2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
-
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "man" { link($0); next }
-$2 == "info" { link($0); next }
-$2 == "doc" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-$2 == "data" { link($0); next }
-$2 == "include" { link($0); next }
-
-{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
-
-END {
- for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
- for(fname in x) {
- if(x[fname]) {
- printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
- exit 3
- }
- }
-}' >.install-links.new
-mv .install-links.new .install-links
-
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -58,10 +58,11 @@
#+s6-rc.4d74c77acd02ea124bc1c47fe8fefee11c8a915c5cd1cd34f10b4c1e22c0777e
#+s6.79622d6af54c647d88dfcc4911740c099871a4432fdfab421fdbbcb9b58bed1b
#+zsh.08bac2dd5a59108ff97c33e090b80edb1f96413026c95358eb03d4ef039a75a9
+#+libcgroup.47fc0a178b2a901cf3cfd3d7bd66ff0ab6972b20ee5909c4defd74b1c4e765f4
#+system-config-scripts.a983668711783d5c36b32ca9859fe7c99b0cf3588bbeeb315b8ba5ca6b692831
#+logincaps.039ebc02fb33effb49147c0198b3568dfbd8f5f9037b79db9f088508ecdf96e6
#+busybox.2ef5301e1fcabd1b3cd0b88f9dda6a41d4e7b432be5e555dffa5aae865334e41
-#@git:ddb20e067ab184cd18ee8b88d74044dfeeaaad4c:system-config
+#@git:20f1fc8e70e98fa5e8e6e378ff53ce79628a45ca:system-config
# - build script start -
@@ -88,8 +89,8 @@ linkdep() {
printf '%s\n' >config/etc/motd \
"Welcome to $(cat ./config/hostname)!" \
- 'Current running configuration was generated from system-config:ddb20e067ab184cd18ee8b88d74044dfeeaaad4c' \
- 'Last change on 2025-10-12 12:39:15 +0000 by Jan Pobrislo'
+ 'Current running configuration was generated from system-config:20f1fc8e70e98fa5e8e6e378ff53ce79628a45ca' \
+ 'Last change on 2025-11-26 14:06:43 +0000 by Jan Pobrislo'
printf '%s\n' >config/etc/skel/loginexec \
"#!$(which execlineb) -S0" \
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -51,7 +51,7 @@
#+s6-portable-utils.fa90b6f86108ac7a4ddce358490855648382b94551a754d68db43ac1e4ecaa04
#+s6-linux-init.876ecf8fa063a4679c1c5f343731568bf65107894662e5c25afe563ab5c1c6f9
#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757
-#+system-config-rc.117c3de79f7b68afad10175a0a2e7adb76e6f7297b728a6dee27e515b38272b5
+#+system-config-rc.5d7b1f01ed699cc09943212acfed2eaee05b44b2f864ff76119add1e2e01f935
# - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/home/ccx/versions/system-config-rc.117c3de79f7b68afad10175a0a2e7adb76e6f7297b728a6dee27e515b38272b5/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.5d7b1f01ed699cc09943212acfed2eaee05b44b2f864ff76119add1e2e01f935/config/s6-rc-db
# Generate init (${dest} must not exist but parent dir does)
mkdir -p "$pthbs_destdir//home/ccx/versions"
diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc
@@ -30,7 +30,7 @@
#+busybox-diffutils.30a803a8b8dd1d4f18bc5e5952cc4b15aea625caf2af34dd424af233786ba0d0
#+s6-rc.4d74c77acd02ea124bc1c47fe8fefee11c8a915c5cd1cd34f10b4c1e22c0777e
#+fileset.0e14bac5fb53f8712c33088f26d59687fb3f05f5abdafd093e94f542d5a5e76b
-#+system-config.4361ce6d25613705ddfe4552d8bea10d1e90b08214fce7f596f52aadda4e5c73
+#+system-config.778700e49de39fe37cd772dc7c9f51fa23be8b98c29bae117b3376b0b88ad7d6
# - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/home/ccx/versions/system-config.4361ce6d25613705ddfe4552d8bea10d1e90b08214fce7f596f52aadda4e5c73/config/s6-rc-source
+src=/home/ccx/versions/system-config.778700e49de39fe37cd772dc7c9f51fa23be8b98c29bae117b3376b0b88ad7d6/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -88,9 +88,9 @@
#+squashfs-tools.938e7e32dd335cb8ff87bc4f032ef2d043469fb907ea33f2602fd187efefbbed
#+mandoc.1b22f8e455f4928966706ab2888397852cccbc8e9eb7ab45e2bed87f42ab1a65
#+tinyssh.445ba94c5bf6644a74cd6f0eaeb6c009747ee28c7646e42f21cba54eb9842546
-#+system-config.984a8d70464249fa56ac32d4f4078bf24c60eacfd0056d51e66303e469ac8c89
-#+system-config-rc.aca00041da330043b368f929f01306e947a06da948501cda2ddb7d2f6ff4094c
+#+system-config.02db2e310b8a3e0ad736c3785d10f4a5259c35196eef2f693dbca3e794dde3a0
+#+system-config-rc.b1c27e76d5485f594d1bf47335b8f6e4a21b689747db27841598356fa564dafc
#+system-config-scripts.7d77b0deaa9d944986b14e83dd01b0eb7d9f61a87286e7c516e8f5fc4bf931be
-#+system-config-init.c51a8cb0571cf34966cad48c309cc2272bcc3a8fe3fbda7d1c660daa35c16834
+#+system-config-init.368ea3ba375989ad36d787e4daea300522f2ad0a92f454941016f05b7d779884
#+system-config-zsh.e37469ac124ea9906e672882182d56b08ba04f68788cd9c7b14807614b2896d4
#+busybox-modutils.f424154ecd9e763d06daf39d5b6bbcd5055b977c1cfaced5b87bb7731f4a243a
\ No newline at end of file
diff --git a/variants/root-x86_64/patchelf:bootstrap b/variants/root-x86_64/patchelf:bootstrap
@@ -1,127 +0,0 @@
-#!/usr/bin/env pthbs-build
-#@pragma:nosandbox
-#@pragma:nopath
-#@git:523f401584d9584e76c9c77004e7abeb9e6c4551:patchelf
-
-
-# - build script start -
-
-autotools_config() {
- prefix=/versions/$pthbs_package
- ./configure -C \
- --prefix="$prefix" \
- --build="$(${CC:-gcc} -dumpmachine)" \
- --bindir="$prefix/command" \
- --sbindir="$prefix/command" \
- --infodir="$prefix/info" \
- --localedir="$prefix/locale" \
- --mandir="$prefix/man" \
- --libdir="$prefix/library" \
- --docdir="$prefix/doc/patchelf" \
- --datadir="$prefix/data" \
- --datarootdir="$prefix/data" \
- --localstatedir='/var/pthbs' \
- "$@"
-
-}
-
-autotools_config_static() {
- build_env_static
- autotools_config "$@" --enable-static --disable-shared
-}
-
-build_env_static() {
- export LD_LIBRARY_PATH="$pthbs_build_environment/library"
- export CPATH="$pthbs_build_environment/include"
- export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
-}
-
-check_static() {
- local exe || true
- exe=$pthbs_destdir'/versions'/$pthbs_package/$1
- if ! test -f $exe; then
- printf '%s\n' "Error: file '$1' doesn't exist!"
- exit 1
- fi
- local interp_info || true
- interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
- if test x '!=' "x$interp_info"; then
- printf '%s\n' "Error: '$1' is a dynamic binary!"
- exit 1
- fi
-}
-
-prefix=/versions/$pthbs_package
-dest=${pthbs_destdir%/}${prefix}
-cd 'patchelf'
-
-./bootstrap.sh
-autotools_config_static . --disable-nls
-
-make -j${JOBS:-1} -l$((1+${JOBS:-1}))
-
-make DESTDIR="$pthbs_destdir" install
-
-
-
-check_static command/patchelf
-
-
-cd "$pthbs_destdir/versions/$pthbs_package"
-find -type d -o -print | awk -F/ '
-BEGIN {
- x["./command/patchelf"]=1
- x["./man/man1/patchelf.1"]=1
-}
-
-function r1(s) {
- sub("^[.]/[^/]*", ".", s)
- return s
-}
-function s1(repl, s) {
- sub("^[.]/[^/]*", "./"repl, s)
- return s
-}
-function link(src) {
- x[$0]=0
- printf "%s\t%s\n", $0, src
- printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
-}
-$1!="."{exit 1}
-
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "env" { link($0); next }
-$2 == "command" { link($0); next }
-$2 == "bin" { link(s1("command", $0)); next }
-
-$2 == "library.so" { link($0); next }
-$2 == "library" { link($0); next }
-$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
-$2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
-
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "man" { link($0); next }
-$2 == "info" { link($0); next }
-$2 == "doc" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-$2 == "data" { link($0); next }
-$2 == "include" { link($0); next }
-
-{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
-
-END {
- for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
- for(fname in x) {
- if(x[fname]) {
- printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
- exit 3
- }
- }
-}' >.install-links.new
-mv .install-links.new .install-links
-
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -58,10 +58,11 @@
#+s6-rc.fabff0205f425cf314f8687b5c768a18715b7d22aa3b52752c20160d3a67303b
#+s6.2e2793774764c8588ce384e3ce7578a897572b326ba4a8261db4b459cea48cce
#+zsh.b0949d51b3d7ccb490ccfe5dcc09633254eb6744e865719d6a380931e2dce8aa
+#+libcgroup.ece45f8c1ee456789e29ea12ebc1a734546e1d0f415790b975ba4d63563c799f
#+system-config-scripts.7d77b0deaa9d944986b14e83dd01b0eb7d9f61a87286e7c516e8f5fc4bf931be
#+logincaps.c4e40ff1a9ad654c6fc81f4c6fbc16d3fb3636ca3cd9fa2c22c94eaa8aa4f390
#+busybox-modutils.f424154ecd9e763d06daf39d5b6bbcd5055b977c1cfaced5b87bb7731f4a243a
-#@git:ddb20e067ab184cd18ee8b88d74044dfeeaaad4c:system-config
+#@git:20f1fc8e70e98fa5e8e6e378ff53ce79628a45ca:system-config
# - build script start -
@@ -88,8 +89,8 @@ linkdep() {
printf '%s\n' >config/etc/motd \
"Welcome to $(cat ./config/hostname)!" \
- 'Current running configuration was generated from system-config:ddb20e067ab184cd18ee8b88d74044dfeeaaad4c' \
- 'Last change on 2025-10-12 12:39:15 +0000 by Jan Pobrislo'
+ 'Current running configuration was generated from system-config:20f1fc8e70e98fa5e8e6e378ff53ce79628a45ca' \
+ 'Last change on 2025-11-26 14:06:43 +0000 by Jan Pobrislo'
printf '%s\n' >config/etc/skel/loginexec \
"#!$(which execlineb) -S0" \
diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init
@@ -51,7 +51,7 @@
#+s6-portable-utils.5ebbd138d0235eeb3b6501c09ff2299e50a3528600b4f4de5ff177d16060668c
#+s6-linux-init.4343fa35d119ddda96471d42a9b5c9a1b32d5e770bc3505074d284e65bea9450
#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6
-#+system-config-rc.aca00041da330043b368f929f01306e947a06da948501cda2ddb7d2f6ff4094c
+#+system-config-rc.b1c27e76d5485f594d1bf47335b8f6e4a21b689747db27841598356fa564dafc
# - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/versions/system-config-rc.aca00041da330043b368f929f01306e947a06da948501cda2ddb7d2f6ff4094c/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.b1c27e76d5485f594d1bf47335b8f6e4a21b689747db27841598356fa564dafc/config/s6-rc-db
# Generate init (${dest} must not exist but parent dir does)
mkdir -p "$pthbs_destdir//versions"
diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc
@@ -30,7 +30,7 @@
#+busybox-diffutils.9b52fd5ef8d705039558ba31d05f7933c588d7fe6f2a223a2ffece523ae679a3
#+s6-rc.fabff0205f425cf314f8687b5c768a18715b7d22aa3b52752c20160d3a67303b
#+fileset.3e5161307c504f434368b2c1318de73b3ba88b52a461f82c65f7219bc46cf239
-#+system-config.984a8d70464249fa56ac32d4f4078bf24c60eacfd0056d51e66303e469ac8c89
+#+system-config.02db2e310b8a3e0ad736c3785d10f4a5259c35196eef2f693dbca3e794dde3a0
# - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/versions/system-config.984a8d70464249fa56ac32d4f4078bf24c60eacfd0056d51e66303e469ac8c89/config/s6-rc-source
+src=/versions/system-config.02db2e310b8a3e0ad736c3785d10f4a5259c35196eef2f693dbca3e794dde3a0/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
