mrrl

Minimal Reliable Reproducible Linux
git clone https://ccx.te2000.cz/git/mrrl
Log | Files | Refs | Submodules | README

commit e26d44b65a36a671482d997a7540438eea388a4f
parent e27cf602b600888c3801df0696a9f47fdada7c1d
Author: ccx <ccx@te2000.cz>
Date:   Sun, 21 Dec 2025 04:36:13 +0000

Merge remote-tracking branch 'ccx/trunk' into trunk

Diffstat:
M.gitmodules | 6------
Mcommitlist.sha1 | 1-
Dsources/git | 1-
Dsources/libcap | 1-
Mtemplates/pkg/container-bin-image | 5+++--
Mutil/generate-packages | 1+
Mvariants/ccx-x86_64/container-bin-image | 5+++--
Mvariants/ccx-x86_64/containers | 8++++----
Mvariants/ccx-x86_64/containers.environment | 2+-
Mvariants/ccx-x86_64/default.environment | 8++++----
Mvariants/ccx-x86_64/system-config | 2+-
Mvariants/ccx-x86_64/system-config-init | 4++--
Mvariants/ccx-x86_64/system-config-rc | 4++--
Mvariants/ccx-x86_64/userspace.environment | 2+-
Mvariants/root-x86_64/container-bin-image | 5+++--
Mvariants/root-x86_64/containers | 8++++----
Mvariants/root-x86_64/containers.environment | 2+-
Mvariants/root-x86_64/default.environment | 8++++----
Mvariants/root-x86_64/system-config | 2+-
Mvariants/root-x86_64/system-config-init | 4++--
Mvariants/root-x86_64/system-config-rc | 4++--
Mvariants/root-x86_64/userspace.environment | 2+-
22 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/.gitmodules b/.gitmodules @@ -38,15 +38,9 @@ [submodule "sources/netbsd-curses"] path = sources/netbsd-curses url = https://github.com/sabotage-linux/netbsd-curses -[submodule "sources/git"] - path = sources/git - url = https://github.com/git/git [submodule "sources/zsh"] path = sources/zsh url = https://git.code.sf.net/p/zsh/code -[submodule "sources/libcap"] - path = sources/libcap - url = https://git.kernel.org/pub/scm/libs/libcap/libcap.git [submodule "sources/aat"] path = sources/aat url = ./sources/aat diff --git a/commitlist.sha1 b/commitlist.sha1 @@ -291,7 +291,6 @@ fbace046603cd400659ba15e17081339db31c7e8 sources/busybox fbb12ddc6a53ad97ff6bcc7ed9b253c09001ad2f sources/busybox fd0e197d9c746faec8c8854fcfd416964440615d sources/busybox ffe18087faa553747d68ce662e0d4e9e7265fc3f sources/busybox -461a9ec198c1e2b9c39a34e21786747dbb8671b4 sources/ccx-utils 48aa9dd528fd650ce6b177af3aee7b8b6762d342 sources/ccx-utils c5eed37c744c786076a1ec13132ade7ef410ed16 sources/ccx-utils c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz diff --git a/sources/git b/sources/git @@ -1 +0,0 @@ -Subproject commit 683c54c999c301c2cd6f715c411407c413b1d84e diff --git a/sources/libcap b/sources/libcap @@ -1 +0,0 @@ -Subproject commit 4425764d96626640df846cf21a83ac200d7af42f diff --git a/templates/pkg/container-bin-image b/templates/pkg/container-bin-image @@ -50,7 +50,7 @@ for cmd in "${PATH%%:*}"/*; do fi done -for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps; do +for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps seccomp-run; do if ! test -x "./$cmd"; then printf "fatal: expected command not found: '%s'\n" "$cmd" exit 1 @@ -58,7 +58,8 @@ for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps; do done ./true ./seccomp-run ./seccomp-default.bpf ./true - +pwd +ls -lhA touch "$pthbs_destdir{{versions}}/$pthbs_package/.install-links" {% endblock %} diff --git a/util/generate-packages b/util/generate-packages @@ -31,4 +31,5 @@ else rm .new.commitlist.sha1 fi +find variants -mindepth 2 -type f -delete make py-genpkgall pthbs_skip_build=1 diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -90,7 +90,7 @@ for cmd in "${PATH%%:*}"/*; do fi done -for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps; do +for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps seccomp-run; do if ! test -x "./$cmd"; then printf "fatal: expected command not found: '%s'\n" "$cmd" exit 1 @@ -98,6 +98,7 @@ for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps; do done ./true ./seccomp-run ./seccomp-default.bpf ./true - +pwd +ls -lhA touch "$pthbs_destdir/home/ccx/versions/$pthbs_package/.install-links" diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -33,7 +33,7 @@ #+alpine-keys.f38e5db6c6e34040a43a472f8a38e9080a626bfb8b3c6ff055c91f20ce866f6a #+apk-tools.391099a02718b7da787c88ffca94989b6cab19f9f96fba339180bd593caeb63c #+xbps.78c26b386597df65c868c0999e9f1eefa56b3614a5759626e8d2fb6d32f93362 -#+container-bin-image.7e71ba13f917d001ac59e506f5b91cd301c5adb4e2732fa047dde9f175034402 +#+container-bin-image.0196afd4d0e09991109739ab150a9ec269a096f424595eba6dad4a210cf8ab81 #@git:68a211c657547b3f5c9d3dfecb2f6d51872bb8d2:containers @@ -91,9 +91,9 @@ for f in '/home/ccx/versions/xbps.78c26b386597df65c868c0999e9f1eefa56b3614a57596 ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.7e71ba13f917d001ac59e506f5b91cd301c5adb4e2732fa047dde9f175034402/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.7e71ba13f917d001ac59e506f5b91cd301c5adb4e2732fa047dde9f175034402/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.7e71ba13f917d001ac59e506f5b91cd301c5adb4e2732fa047dde9f175034402/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.0196afd4d0e09991109739ab150a9ec269a096f424595eba6dad4a210cf8ab81/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.0196afd4d0e09991109739ab150a9ec269a096f424595eba6dad4a210cf8ab81/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.0196afd4d0e09991109739ab150a9ec269a096f424595eba6dad4a210cf8ab81/container-bin-image' "${dest}/deps/" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -50,7 +50,7 @@ #+s6-linux-utils.e02e2527a80df5d5fe98615c278f0d9db7451b7a7002c1c817d47ca469d0d03f #+zsh.bcee316426fa08a87a1cdbd36d4192206516d31160995f7cb40171cedd8cfa2f #+confz.54cffc17e24f59492eb78f8fb861148dd737735dc81663f8c3cf31c37ee802c1 -#+containers.ef5bd10934be4c9b5aec3452a023824b67a9440b5126765e2a5b59aa36d9e47a +#+containers.843b902130f3439859870df74ccb330861f9b896aa31d1eaca965f8840225ba0 #+xbps.78c26b386597df65c868c0999e9f1eefa56b3614a5759626e8d2fb6d32f93362 #+zstd.1569c43f77b4031079e930f7eb6107e77b72dd641fac5228c4d2c784a6f15361 #+apk-tools.391099a02718b7da787c88ffca94989b6cab19f9f96fba339180bd593caeb63c diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -65,7 +65,7 @@ #+pthbs-banginstall.944f9b6485bfdb1329fd9fbc78c7996dec0c63f617ccc49ba97ec77d145eedd7 #+aat.9166428aa8236b03999fcbe9e2f6da9adefa8c4675ddd36f4b7995d6c7bb87f4 #+confz.54cffc17e24f59492eb78f8fb861148dd737735dc81663f8c3cf31c37ee802c1 -#+containers.ef5bd10934be4c9b5aec3452a023824b67a9440b5126765e2a5b59aa36d9e47a +#+containers.843b902130f3439859870df74ccb330861f9b896aa31d1eaca965f8840225ba0 #+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0 #+logincaps.ab99b108dfb58c6ee206bb5ec07414b6f8646206ef3ebeecddaa14d49a4cbeaf #+snaprep.77c41271f852de542d321eb387e5807f47a1c96f4289daaad7866be9721d4a76 @@ -88,9 +88,9 @@ #+squashfs-tools.e58b08a6012ee3dc4429378aaaf55f620da924cf444b3556520fc4e6efb10946 #+mandoc.f9203b401ae6346801b1e100da2e79879b24b86f7f31c457fb4add63cf1ed170 #+tinyssh.9940616c43114ecd7767fc10062ce00eb76a738453248a490f64cd79854343d7 -#+system-config.5e0d265f4cf0b8c34be28f074302bc8a93a788d6af1f394cd25b5860e6549e42 -#+system-config-rc.0148986e9fda1a0526539af320aab6458720a5642709db7ab0b44e75253d4450 +#+system-config.f8899f53da7d3bc5442a5bc4f6f06694c0a69b741783578df46b0b8a76b568c9 +#+system-config-rc.4331458418d30a8b58158e829382d683b2532062cfa12c57a33d737dc7a63f4b #+system-config-scripts.35c642cad58c3945c2c3caa525fce3946ba87d0710adaf13efec1db79da75729 -#+system-config-init.9be3c6a625866e752dc8165e761d4b753cce102c7fc29c5e1553ed3f7425970b +#+system-config-init.2bc31f18ff107082e11e943d3066bcfe31dd3afb93197b3a67c2af31fcbcf8ff #+system-config-zsh.a8d29ac3c60ef9b666edf51a0bfd60aee2be60f3aa898ed8285afd8c2955baab #+busybox.aea69a6a1ec89241b2fd65771f228ede99e7184ee9a34e97af68423d27117348 \ No newline at end of file diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -97,7 +97,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.8c10a68ffbd890db95b77ccd03856dfd43076912de699f68a78e34c95681fe65' \ + 'pthbs_path_containers=/home/ccx/versions/env.f3eb557e440fa96034c17aa5f9ce82000fed57c5fc59db637c4c3a82a02854b8' \ 'pthbs_path_mdevd=/home/ccx/versions/env.573bdf8e058f17c8c28d0114414bf6b38879c6157460409cac78dfd7cf560b27' \ 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 @@ -50,7 +50,7 @@ #+s6-portable-utils.ed9b2a1a2b2eade3f210e876b2e8c08d680c2fb0f4f5a1ec4137dd262a3d9e3d #+s6-linux-init.7af048a1da88cb89e227afc4ce78f722cfde5a4bbe2f8fef1b1c4c37b1a12b8d #+execline.403a4e1645c681e8c2ca9a75704a27658b788db460265916951d1d7a1e59ce8a -#+system-config-rc.0148986e9fda1a0526539af320aab6458720a5642709db7ab0b44e75253d4450 +#+system-config-rc.4331458418d30a8b58158e829382d683b2532062cfa12c57a33d737dc7a63f4b # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.0148986e9fda1a0526539af320aab6458720a5642709db7ab0b44e75253d4450/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.4331458418d30a8b58158e829382d683b2532062cfa12c57a33d737dc7a63f4b/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.eed6ca067c994ab56e63b8b97a60f6e9f3625d3f9aeda53306e23bb42186ce78 #+s6-rc.9aac5b15b54c183366ab03f193a967d0fc66134b1623410032766e062e77bc5d #+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0 -#+system-config.5e0d265f4cf0b8c34be28f074302bc8a93a788d6af1f394cd25b5860e6549e42 +#+system-config.f8899f53da7d3bc5442a5bc4f6f06694c0a69b741783578df46b0b8a76b568c9 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.5e0d265f4cf0b8c34be28f074302bc8a93a788d6af1f394cd25b5860e6549e42/config/s6-rc-source +src=/home/ccx/versions/system-config.f8899f53da7d3bc5442a5bc4f6f06694c0a69b741783578df46b0b8a76b568c9/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/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -65,7 +65,7 @@ #+pthbs-banginstall.944f9b6485bfdb1329fd9fbc78c7996dec0c63f617ccc49ba97ec77d145eedd7 #+aat.9166428aa8236b03999fcbe9e2f6da9adefa8c4675ddd36f4b7995d6c7bb87f4 #+confz.54cffc17e24f59492eb78f8fb861148dd737735dc81663f8c3cf31c37ee802c1 -#+containers.ef5bd10934be4c9b5aec3452a023824b67a9440b5126765e2a5b59aa36d9e47a +#+containers.843b902130f3439859870df74ccb330861f9b896aa31d1eaca965f8840225ba0 #+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0 #+logincaps.ab99b108dfb58c6ee206bb5ec07414b6f8646206ef3ebeecddaa14d49a4cbeaf #+snaprep.77c41271f852de542d321eb387e5807f47a1c96f4289daaad7866be9721d4a76 diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -90,7 +90,7 @@ for cmd in "${PATH%%:*}"/*; do fi done -for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps; do +for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps seccomp-run; do if ! test -x "./$cmd"; then printf "fatal: expected command not found: '%s'\n" "$cmd" exit 1 @@ -98,6 +98,7 @@ for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps; do done ./true ./seccomp-run ./seccomp-default.bpf ./true - +pwd +ls -lhA touch "$pthbs_destdir/versions/$pthbs_package/.install-links" diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -33,7 +33,7 @@ #+alpine-keys.28471830774daf16fabe3b35657f73e2ae25c8bf137fa1f0dfa70f3fd5f31ae1 #+apk-tools.6fd0a18cfc9392a693775fbc2f0c18a8b18735ecdd04ae81a52f9dad0949eb84 #+xbps.3971c316db28b21ccf1e6bfa1b5df8a24b30f623e24333d7144c35e970a4ad14 -#+container-bin-image.24011b31da68c9560c6b202f8f8dd8506603b9c71d55cf558aa45f39babbd82e +#+container-bin-image.dead95a04a737664bc00c194fdb4b5065c2b64e9888f094ac79c29b8698a0751 #@git:68a211c657547b3f5c9d3dfecb2f6d51872bb8d2:containers @@ -91,9 +91,9 @@ for f in '/versions/xbps.3971c316db28b21ccf1e6bfa1b5df8a24b30f623e24333d7144c35e ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.24011b31da68c9560c6b202f8f8dd8506603b9c71d55cf558aa45f39babbd82e/container-bin-image' -test -f '/versions/container-bin-image.24011b31da68c9560c6b202f8f8dd8506603b9c71d55cf558aa45f39babbd82e/container-bin-image/if' -ln -sf '/versions/container-bin-image.24011b31da68c9560c6b202f8f8dd8506603b9c71d55cf558aa45f39babbd82e/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.dead95a04a737664bc00c194fdb4b5065c2b64e9888f094ac79c29b8698a0751/container-bin-image' +test -f '/versions/container-bin-image.dead95a04a737664bc00c194fdb4b5065c2b64e9888f094ac79c29b8698a0751/container-bin-image/if' +ln -sf '/versions/container-bin-image.dead95a04a737664bc00c194fdb4b5065c2b64e9888f094ac79c29b8698a0751/container-bin-image' "${dest}/deps/" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -50,7 +50,7 @@ #+s6-linux-utils.34bdcec91aae280416c16a52959e513382aeb67ffd9f68bcdec6f5967434b445 #+zsh.355a949de332be38ccdfad4e0d3e4a3d60d4b2f3ee257698a87f25ce811c2008 #+confz.5dfd584a711633259aecac13da60d50f455c7716916c74e04ded1457ae04a071 -#+containers.572e544080c8ac9548d79bcb6356f3009c3a4085ac0ba596b626c2c01ff1732a +#+containers.381ca5e59c8705cae3e0bfc6211093e4d0193f7438c17ab530083ee697f68df5 #+xbps.3971c316db28b21ccf1e6bfa1b5df8a24b30f623e24333d7144c35e970a4ad14 #+zstd.b096b77421f338e2452668ae6faa2713158264b0378007a1c772d73ab2aefd52 #+apk-tools.6fd0a18cfc9392a693775fbc2f0c18a8b18735ecdd04ae81a52f9dad0949eb84 diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -65,7 +65,7 @@ #+pthbs-banginstall.c568b82ef8544f41d05a56244bb32a93e2f5edd433293243a7037e36f2aa5155 #+aat.b2df2bfbff48087d5ef34ef39f712038b0d35c0112f04003b12510555fc3a1f2 #+confz.5dfd584a711633259aecac13da60d50f455c7716916c74e04ded1457ae04a071 -#+containers.572e544080c8ac9548d79bcb6356f3009c3a4085ac0ba596b626c2c01ff1732a +#+containers.381ca5e59c8705cae3e0bfc6211093e4d0193f7438c17ab530083ee697f68df5 #+fileset.2156fb8cabd628b062bc9fcc2f673d772a25574dfe5c2c2b779ada64fe9d9d08 #+logincaps.446017af580c0455b8c3419d5354d1feeb7f75c1b5557faa0434f2f59f154311 #+snaprep.9367398cdf89d51bfb5e6c8cb7ec368b8fa8f18b05c4926b7249f28703977504 @@ -88,9 +88,9 @@ #+squashfs-tools.1b91e9f3f87cc15a2eb60ab5b95325158a49b03c20c1262801491563d93311c6 #+mandoc.24165da5b9553ff75b2b70a43d8e584d7f71ab38aa329769e7425e57790e5712 #+tinyssh.b86b96a90e668bd3500db7bac7652e8654ec0dafd0b6c9486a02682cd31f515a -#+system-config.51ce6f09199603b45da7842862fc948016bc719a6e0270ffe7d8500ab86d4e2f -#+system-config-rc.d6ca10286c87aea7b3ae344079f795eca6b7028ac92c98a47f98464794836c47 +#+system-config.cd173ebbf0246a0e08913ee2125a739819be11479a2a98ba5afe49fe9a8c3404 +#+system-config-rc.b4fa2835cb24cd49c16b1ff2766213f2d0a02bccbc1286df15e24951dd44c85f #+system-config-scripts.bfe6189587fc33d037051c22a904d60dab3f025f4d33de17745f1ea1ecc919bc -#+system-config-init.422d98a864ca88899ccdb3e4554f6fe29feb45903a570a20d7e1d433af47e619 +#+system-config-init.46c8e3f6e0cf11aa3b11684ae47866fb08e4d60957c769da0cb2fe7a1e86cdcd #+system-config-zsh.f00ec445d6e46a6d06e6d33b32483662b1574b30616960465e4b3d0325d53668 #+busybox-modutils.4aef0ae5907514beeff60f30370a78d0e294055c92d2409920150a5ebeedca2a \ No newline at end of file diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -97,7 +97,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.963d4fea74b8026ea7d9d15d1484038dc82bbdc685e4bfb8479d72180e5d07f8' \ + 'pthbs_path_containers=/versions/env.c9c9acfeabfb70c93a36fc29c209be9af32e618fdb8c6f5611e18b5aa2e401fc' \ 'pthbs_path_mdevd=/versions/env.b72996087d5776ae6cc04527da2721badc870ebacff57bafde63913d7bcfad2a' \ 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 @@ -50,7 +50,7 @@ #+s6-portable-utils.215fcbacf399929de5124e7f2b5d6ca4549007ccd2319a874170887bedca9a08 #+s6-linux-init.de74cb1d43a63d9c9e4e2a44ee5a7f9a50deab7776bd2b2bd0c3d67cb44f01c3 #+execline.4e773f1ba308227aa5402fd63038f6dcbaf3866ca3fa70555a8bec9b81c8e2d2 -#+system-config-rc.d6ca10286c87aea7b3ae344079f795eca6b7028ac92c98a47f98464794836c47 +#+system-config-rc.b4fa2835cb24cd49c16b1ff2766213f2d0a02bccbc1286df15e24951dd44c85f # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.d6ca10286c87aea7b3ae344079f795eca6b7028ac92c98a47f98464794836c47/config/s6-rc-db +s6rcdb=/versions/system-config-rc.b4fa2835cb24cd49c16b1ff2766213f2d0a02bccbc1286df15e24951dd44c85f/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.895f7a6bf6d00136038d8bafa91a6fb1e7027ce5a32e1e3b64a9119fe69ef19a #+s6-rc.e09e2d9c42a1bbc18b406ff114d945db0d3187fd09b703ddd7c28a4d64357ad3 #+fileset.2156fb8cabd628b062bc9fcc2f673d772a25574dfe5c2c2b779ada64fe9d9d08 -#+system-config.51ce6f09199603b45da7842862fc948016bc719a6e0270ffe7d8500ab86d4e2f +#+system-config.cd173ebbf0246a0e08913ee2125a739819be11479a2a98ba5afe49fe9a8c3404 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.51ce6f09199603b45da7842862fc948016bc719a6e0270ffe7d8500ab86d4e2f/config/s6-rc-source +src=/versions/system-config.cd173ebbf0246a0e08913ee2125a739819be11479a2a98ba5afe49fe9a8c3404/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/userspace.environment b/variants/root-x86_64/userspace.environment @@ -65,7 +65,7 @@ #+pthbs-banginstall.c568b82ef8544f41d05a56244bb32a93e2f5edd433293243a7037e36f2aa5155 #+aat.b2df2bfbff48087d5ef34ef39f712038b0d35c0112f04003b12510555fc3a1f2 #+confz.5dfd584a711633259aecac13da60d50f455c7716916c74e04ded1457ae04a071 -#+containers.572e544080c8ac9548d79bcb6356f3009c3a4085ac0ba596b626c2c01ff1732a +#+containers.381ca5e59c8705cae3e0bfc6211093e4d0193f7438c17ab530083ee697f68df5 #+fileset.2156fb8cabd628b062bc9fcc2f673d772a25574dfe5c2c2b779ada64fe9d9d08 #+logincaps.446017af580c0455b8c3419d5354d1feeb7f75c1b5557faa0434f2f59f154311 #+snaprep.9367398cdf89d51bfb5e6c8cb7ec368b8fa8f18b05c4926b7249f28703977504