commit dd3cdd89a64b3973e04511d020a9e73228e6c64c
parent ffb96c4f607fead19ed1370a1130af0526fc11df
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 17:37:32 +0000
Add gperf as dependency of libseccomp
Diffstat:
19 files changed, 274 insertions(+), 22 deletions(-)
diff --git a/downloadlist.sha256 b/downloadlist.sha256
@@ -51,3 +51,4 @@ f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb 189200 https://
1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332 271228 https://archive.hadrons.org/software/libmd/libmd-1.1.0.tar.xz
248a2c8a4d9b9858aa6baf52712c34afefcf9c9e94b76dce02c1c9aa25fb3375 642445 https://github.com/seccomp/libseccomp/releases/download/v2.5.5/libseccomp-2.5.5.tar.gz
83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc 685655 https://github.com/seccomp/libseccomp/releases/download/v2.6.0/libseccomp-2.6.0.tar.gz
+588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2 1215925 https://ftp.gnu.org/gnu/gperf/gperf-3.1.tar.gz
diff --git a/templates/pkg/gperf b/templates/pkg/gperf
@@ -0,0 +1,14 @@
+{% extends "autotools" %}
+{%- block extra_deps %}
+#@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
+{% endblock %}
+{% block at_script %}
+
+autotools_static gperf-3.1
+check_static command/gperf
+
+{% endblock %}
+{% block genlinks_begin %}
+ x["./command/gperf"]=1
+{% endblock %}
+
diff --git a/templates/pkg/libseccomp b/templates/pkg/libseccomp
@@ -1,6 +1,7 @@
{% extends "autotools" %}
{%- block extra_deps %}
#+{{pkg_install_name("pkgconf-pkg-config")}}
+#+{{pkg_install_name("gperf")}}
#@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
{% endblock %}
{% block at_script %}
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -15,4 +15,4 @@
#+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
-#+easyseccomp.9b4c02826b40a9e333d5962b3fe0029b05e932658d6390cf04d565ab8e34f70b-
\ No newline at end of file
+#+easyseccomp.98bc806e9ed08610a237d0811ccf7c130d1985166172bec70e9f5ebdda26322b+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -36,8 +36,8 @@
#+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
-#+system-config.069186d8ab1c4d2bf89f339eb00abeea5109e2dbfa6d8742cb719f17194bcf35
-#+system-config-rc.ef3915a063e3fdca139f9a665e0883fe8a4f5e81badd421f616300105062a1e7
+#+system-config.9a428c2ad2655c27966f7731d48d2496056e771ec3723e377c20e3986fd95520
+#+system-config-rc.5a052d88e9abeb87ee753b31be54650868561222a8fa7072e1c12db574a33878
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.94c821db7a4514072e81b46f04d745fcb27ba80cf072d7a0d5e2b2b44df64a71
+#+system-config-init.c8f1cd1e70043e1c7cd90d04dc8a6431a0e62941d01f87888d25e19fdf583770
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -6,7 +6,7 @@
#+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75
#+flex.322ebabc6eba6cdfd84b1b90f25790b8d917035872c2e6bb2f4c8e2f05eabcfd
#+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f
-#+libseccomp.110e3b316a159776281f8ae31bc27d3f75f48d9a68fd189c1ebe1d9a2b2ac746
+#+libseccomp.dc19a3c149552608acad74d74f61108b8d3149bd467a297a4605a3f196493b99
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf
@@ -0,0 +1,117 @@
+#!/usr/bin/env pthbs-build
+#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78
+#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b
+#+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3
+#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
+#+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75
+#@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
+
+
+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"
+}
+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/gperf" \
+ --datadir="$prefix/data" \
+ --datarootdir="$prefix/data" \
+ --localstatedir='/var/pthbs' \
+ "$@"
+
+}
+
+autotools() {
+ cd "$1"
+ shift
+ autotools_config "$@"
+ make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+ make DESTDIR="$pthbs_destdir" install
+}
+
+autotools_static() {
+ build_env_static
+ autotools "$@" --enable-static --disable-shared
+}
+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
+ 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
+}
+
+
+autotools_static gperf-3.1
+check_static command/gperf
+
+
+
+cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
+find -type d -o -print | awk -F/ '
+BEGIN {
+ x["./command/gperf"]=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 == "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/libseccomp b/variants/ccx-x86_64/libseccomp
@@ -5,6 +5,7 @@
#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
#+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75
#+pkgconf-pkg-config.86f9c193f6ccc64cc2ac696a7e3a258f01b8d0c539312ae37c08ea2354332e90
+#+gperf.e28c47e99256012f77eda6c66889b6f894f19527c4a0380e63e4f76bece02b16
#@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -52,7 +52,7 @@ printf '%s\n' >config/etc/skel/loginexec \
chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
- 'pthbs_path_containers=/home/ccx/versions/env.fc6e8abd3e3087596bf67b98b849f30504d58e20975584708d480b08c78c7de8' \
+ 'pthbs_path_containers=/home/ccx/versions/env.398b92376d3212e4059f94f318a216f465de6c48d4321d596e97a22ed3b3638c' \
'pthbs_path_mdevd=/home/ccx/versions/env.5049027ea8b6b4d373e16aadd3cdc63a940582ff297656e395f2131eef181671' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -5,9 +5,9 @@
#+s6-portable-utils.1b8fd31be72bfe84afb28c3dfff03b1fc45121d11fc85f79c90f085fe61bc132
#+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2
#+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f
-#+system-config-rc.ef3915a063e3fdca139f9a665e0883fe8a4f5e81badd421f616300105062a1e7
+#+system-config-rc.5a052d88e9abeb87ee753b31be54650868561222a8fa7072e1c12db574a33878
-s6rcdb=/home/ccx/versions/system-config-rc.ef3915a063e3fdca139f9a665e0883fe8a4f5e81badd421f616300105062a1e7/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.5a052d88e9abeb87ee753b31be54650868561222a8fa7072e1c12db574a33878/config/s6-rc-db
prefix=/home/ccx/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
#+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
-#+system-config.069186d8ab1c4d2bf89f339eb00abeea5109e2dbfa6d8742cb719f17194bcf35
+#+system-config.9a428c2ad2655c27966f7731d48d2496056e771ec3723e377c20e3986fd95520
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.069186d8ab1c4d2bf89f339eb00abeea5109e2dbfa6d8742cb719f17194bcf35/config/s6-rc-source
+src=/home/ccx/versions/system-config.9a428c2ad2655c27966f7731d48d2496056e771ec3723e377c20e3986fd95520/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/containers.environment b/variants/root-x86_64/containers.environment
@@ -15,4 +15,4 @@
#+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
-#+easyseccomp.6b87a88ad904a03eb4c83957a3bc16c3464fff53b83804a893d31d61332bbab9-
\ No newline at end of file
+#+easyseccomp.8e1ffebd1f84dd5e81d8a96967573db16a0d6a007f80cfa080918bfe40930d51+
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -36,8 +36,8 @@
#+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
-#+system-config.78bba4d8e5f29243cd119515adcb31bd193cf84f6fe7249dc566482803d17522
-#+system-config-rc.33cd211dac61c5b78d94eab6a977616efe62ac06050f1e4a1146fa38199107ab
+#+system-config.e59778883a2cc515c73f0df9b3615c0d0cadc762be22e6a79da59db06f32b864
+#+system-config-rc.b8a38d88293c4678365ee2a7acff7d83e770f7941a926f9ba85d0749b3f49ab2
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.ebbda43ecf67efb21a533f99fcdb7aca22e617b27c7238071c5c4a6bdf5089f8
+#+system-config-init.ae75f1339a0c477fe79f613f378820ef15aacc0eeb13567e2972460f8236dbd4
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -6,7 +6,7 @@
#+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3
#+flex.42bdab01fb2083e92a4417d5fb289c468b9a1a5b8092904b965455b74559262f
#+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0
-#+libseccomp.55e2598f0c946d0d49b60a365eb535e73d16976787cda5b5fce007bfaed67c25
+#+libseccomp.042810e90dddd911a9c64825b298efe4f3b642aef2edb24d545f935483fc8244
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf
@@ -0,0 +1,117 @@
+#!/usr/bin/env pthbs-build
+#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc
+#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465
+#+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089
+#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
+#+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3
+#@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
+
+
+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"
+}
+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/gperf" \
+ --datadir="$prefix/data" \
+ --datarootdir="$prefix/data" \
+ --localstatedir='/var/pthbs' \
+ "$@"
+
+}
+
+autotools() {
+ cd "$1"
+ shift
+ autotools_config "$@"
+ make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+ make DESTDIR="$pthbs_destdir" install
+}
+
+autotools_static() {
+ build_env_static
+ autotools "$@" --enable-static --disable-shared
+}
+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
+ 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
+}
+
+
+autotools_static gperf-3.1
+check_static command/gperf
+
+
+
+cd "$pthbs_destdir/versions/$pthbs_package"
+find -type d -o -print | awk -F/ '
+BEGIN {
+ x["./command/gperf"]=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 == "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/libseccomp b/variants/root-x86_64/libseccomp
@@ -5,6 +5,7 @@
#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
#+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3
#+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621
+#+gperf.801679c031c8afd7759013c57572e26e51941c337a1ad45eb2dd794102c44324
#@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -52,7 +52,7 @@ printf '%s\n' >config/etc/skel/loginexec \
chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
- 'pthbs_path_containers=/versions/env.f0cbe198d85d7b702b242ad7502014cd449b3d53e9b664919027e4e7614ff29d' \
+ 'pthbs_path_containers=/versions/env.93a11ae90d642e8779aa792cdf7e0b697d2b02e6791f61cbf9dfdfa39a2d9f72' \
'pthbs_path_mdevd=/versions/env.699c310193b7957c8ec17e16d6846443f99c198e3e2ce6425066f4523de2cf1e' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init
@@ -5,9 +5,9 @@
#+s6-portable-utils.f6171ad521d6be72875f1d5c1b28f966662ba93cfe5790e1ef010f9e76211bc3
#+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c
#+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9
-#+system-config-rc.33cd211dac61c5b78d94eab6a977616efe62ac06050f1e4a1146fa38199107ab
+#+system-config-rc.b8a38d88293c4678365ee2a7acff7d83e770f7941a926f9ba85d0749b3f49ab2
-s6rcdb=/versions/system-config-rc.33cd211dac61c5b78d94eab6a977616efe62ac06050f1e4a1146fa38199107ab/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.b8a38d88293c4678365ee2a7acff7d83e770f7941a926f9ba85d0749b3f49ab2/config/s6-rc-db
prefix=/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
#+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
-#+system-config.78bba4d8e5f29243cd119515adcb31bd193cf84f6fe7249dc566482803d17522
+#+system-config.e59778883a2cc515c73f0df9b3615c0d0cadc762be22e6a79da59db06f32b864
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.78bba4d8e5f29243cd119515adcb31bd193cf84f6fe7249dc566482803d17522/config/s6-rc-source
+src=/versions/system-config.e59778883a2cc515c73f0df9b3615c0d0cadc762be22e6a79da59db06f32b864/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
