mrrl

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

commit 1006561e6728c2874cb38d184ba29b3bf95df3a2
parent 6adbc5b0843e53541262861bd8bb3972770c639e
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Thu, 18 Dec 2025 20:44:33 +0000

Merge remote-tracking branch 'live/HEAD' into trunk

Diffstat:
M.gitmodules | 2+-
Mtemplates/pkg/container-bin-image | 2+-
Mvariants/ccx-x86_64/container-bin-image | 2+-
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 | 2+-
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+-
18 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/.gitmodules b/.gitmodules @@ -55,7 +55,7 @@ url = ./sources/confz [submodule "sources/containers"] path = sources/containers - url = ./sources/containers + url = git://pthbs.git.ccx/sources/containers.git [submodule "sources/fileset"] path = sources/fileset url = ./sources/fileset diff --git a/templates/pkg/container-bin-image b/templates/pkg/container-bin-image @@ -20,7 +20,7 @@ img="$pthbs_destdir{{versions}}/$pthbs_package/container-bin-image" mkdir -p "$img" easyseccomp -i default-policy.easyseccomp -o "$img/seccomp-default.bpf" easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -o "$img/seccomp-ptrace.bpf" -easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -d ALLOW_SECCOMP -d ALLOW_LANDLOCK -o "$img/seccomp-build.bpf" +easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -d ALLOW_SETUID_SETGID -d ALLOW_SECCOMP -d ALLOW_LANDLOCK -o "$img/seccomp-build.bpf" easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -d ALLOW_SETUID_SETGID -o "$img/seccomp-xpra.bpf" easyseccomp -i default-policy.easyseccomp -d ALLOW_SETUID_SETGID -o "$img/seccomp-setuidgid.bpf" cd "$img" diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -60,7 +60,7 @@ img="$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image" mkdir -p "$img" easyseccomp -i default-policy.easyseccomp -o "$img/seccomp-default.bpf" easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -o "$img/seccomp-ptrace.bpf" -easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -d ALLOW_SECCOMP -d ALLOW_LANDLOCK -o "$img/seccomp-build.bpf" +easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -d ALLOW_SETUID_SETGID -d ALLOW_SECCOMP -d ALLOW_LANDLOCK -o "$img/seccomp-build.bpf" easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -d ALLOW_SETUID_SETGID -o "$img/seccomp-xpra.bpf" easyseccomp -i default-policy.easyseccomp -d ALLOW_SETUID_SETGID -o "$img/seccomp-setuidgid.bpf" cd "$img" 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.80652c3347d4545b8283be52053630bf0f2a18cd976f43613e8f0d2692ffc780 +#+container-bin-image.7e71ba13f917d001ac59e506f5b91cd301c5adb4e2732fa047dde9f175034402 #@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.80652c3347d4545b8283be52053630bf0f2a18cd976f43613e8f0d2692ffc780/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.80652c3347d4545b8283be52053630bf0f2a18cd976f43613e8f0d2692ffc780/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.80652c3347d4545b8283be52053630bf0f2a18cd976f43613e8f0d2692ffc780/container-bin-image' "${dest}/deps/" +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/" 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.2bf28cb069a7e0867bc05e163a3a3175a5afc0ee84b98fec719e8b9ca11ea5a2 +#+containers.ef5bd10934be4c9b5aec3452a023824b67a9440b5126765e2a5b59aa36d9e47a #+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.2bf28cb069a7e0867bc05e163a3a3175a5afc0ee84b98fec719e8b9ca11ea5a2 +#+containers.ef5bd10934be4c9b5aec3452a023824b67a9440b5126765e2a5b59aa36d9e47a #+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0 #+logincaps.536680c06902322ead7c7241797739c630cb11fb4c62d45c991e9b5fa03666ce #+snaprep.77c41271f852de542d321eb387e5807f47a1c96f4289daaad7866be9721d4a76 @@ -88,9 +88,9 @@ #+squashfs-tools.e58b08a6012ee3dc4429378aaaf55f620da924cf444b3556520fc4e6efb10946 #+mandoc.f9203b401ae6346801b1e100da2e79879b24b86f7f31c457fb4add63cf1ed170 #+tinyssh.9940616c43114ecd7767fc10062ce00eb76a738453248a490f64cd79854343d7 -#+system-config.16fd9f365e1bd19e990a7fc0d6833454a21f2dfb438c212f664aa9b7782c5b2c -#+system-config-rc.dc2f1cec95914d1701c3de257ddf6e4717232bd7cc14b53ff1e8ec02f710d4c2 +#+system-config.98e59f672700e3430e077dfeee17336a444baf9b1f08c2b3a2e24b494c5d33dc +#+system-config-rc.8713d084caa422d2d5401349e34fdcf84da51a01dc4d3aa7276191cb02120c9c #+system-config-scripts.35c642cad58c3945c2c3caa525fce3946ba87d0710adaf13efec1db79da75729 -#+system-config-init.58a112e911ec2e4e3774d3f0128090834a11440632419b72a6a8c3bf63ec10d0 +#+system-config-init.b832a4f0adc2900a324ba7a0a02c1d113e8247e6c77a3b79bf4ce6f16ab1b8ff #+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.f05f54d4495265058fef661758cdf245b71ea739962c657e65c5fc45adbc099a' \ + 'pthbs_path_containers=/home/ccx/versions/env.8c10a68ffbd890db95b77ccd03856dfd43076912de699f68a78e34c95681fe65' \ '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.dc2f1cec95914d1701c3de257ddf6e4717232bd7cc14b53ff1e8ec02f710d4c2 +#+system-config-rc.8713d084caa422d2d5401349e34fdcf84da51a01dc4d3aa7276191cb02120c9c # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.dc2f1cec95914d1701c3de257ddf6e4717232bd7cc14b53ff1e8ec02f710d4c2/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.8713d084caa422d2d5401349e34fdcf84da51a01dc4d3aa7276191cb02120c9c/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.16fd9f365e1bd19e990a7fc0d6833454a21f2dfb438c212f664aa9b7782c5b2c +#+system-config.98e59f672700e3430e077dfeee17336a444baf9b1f08c2b3a2e24b494c5d33dc # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.16fd9f365e1bd19e990a7fc0d6833454a21f2dfb438c212f664aa9b7782c5b2c/config/s6-rc-source +src=/home/ccx/versions/system-config.98e59f672700e3430e077dfeee17336a444baf9b1f08c2b3a2e24b494c5d33dc/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.2bf28cb069a7e0867bc05e163a3a3175a5afc0ee84b98fec719e8b9ca11ea5a2 +#+containers.ef5bd10934be4c9b5aec3452a023824b67a9440b5126765e2a5b59aa36d9e47a #+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0 #+logincaps.536680c06902322ead7c7241797739c630cb11fb4c62d45c991e9b5fa03666ce #+snaprep.77c41271f852de542d321eb387e5807f47a1c96f4289daaad7866be9721d4a76 diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -60,7 +60,7 @@ img="$pthbs_destdir/versions/$pthbs_package/container-bin-image" mkdir -p "$img" easyseccomp -i default-policy.easyseccomp -o "$img/seccomp-default.bpf" easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -o "$img/seccomp-ptrace.bpf" -easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -d ALLOW_SECCOMP -d ALLOW_LANDLOCK -o "$img/seccomp-build.bpf" +easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -d ALLOW_SETUID_SETGID -d ALLOW_SECCOMP -d ALLOW_LANDLOCK -o "$img/seccomp-build.bpf" easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -d ALLOW_SETUID_SETGID -o "$img/seccomp-xpra.bpf" easyseccomp -i default-policy.easyseccomp -d ALLOW_SETUID_SETGID -o "$img/seccomp-setuidgid.bpf" cd "$img" 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.452672a6c0ec6cec95a8d20427aebde70a5a48a4609b1bbe13e803a81270ff10 +#+container-bin-image.24011b31da68c9560c6b202f8f8dd8506603b9c71d55cf558aa45f39babbd82e #@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.452672a6c0ec6cec95a8d20427aebde70a5a48a4609b1bbe13e803a81270ff10/container-bin-image' -test -f '/versions/container-bin-image.452672a6c0ec6cec95a8d20427aebde70a5a48a4609b1bbe13e803a81270ff10/container-bin-image/if' -ln -sf '/versions/container-bin-image.452672a6c0ec6cec95a8d20427aebde70a5a48a4609b1bbe13e803a81270ff10/container-bin-image' "${dest}/deps/" +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/" 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.32e407241677450bd719888af0be85c4d1cd3ef67a03e23034bc42ef52d8d944 +#+containers.572e544080c8ac9548d79bcb6356f3009c3a4085ac0ba596b626c2c01ff1732a #+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.32e407241677450bd719888af0be85c4d1cd3ef67a03e23034bc42ef52d8d944 +#+containers.572e544080c8ac9548d79bcb6356f3009c3a4085ac0ba596b626c2c01ff1732a #+fileset.2156fb8cabd628b062bc9fcc2f673d772a25574dfe5c2c2b779ada64fe9d9d08 #+logincaps.8eecccc5adf986da642a0e803f9dd0c71311059104c342f8f5d6d99223d793ec #+snaprep.9367398cdf89d51bfb5e6c8cb7ec368b8fa8f18b05c4926b7249f28703977504 @@ -88,9 +88,9 @@ #+squashfs-tools.1b91e9f3f87cc15a2eb60ab5b95325158a49b03c20c1262801491563d93311c6 #+mandoc.24165da5b9553ff75b2b70a43d8e584d7f71ab38aa329769e7425e57790e5712 #+tinyssh.b86b96a90e668bd3500db7bac7652e8654ec0dafd0b6c9486a02682cd31f515a -#+system-config.e18a6f4ba2c562713c962ebdc2247c7370d63c8ff2e199fb1298dfaab3c210c5 -#+system-config-rc.485c081af1765ba2bf327ddaa42edc5e3fd51498d2c10f2e4a4ca9f682b3f8c0 +#+system-config.0515928f3f24e98bf99076048aa3b5857b0ffdf0e0733eb74e715f813068219f +#+system-config-rc.8d9ac77fd000509f8386a0f9dcc1c2f68a3b5d44bbd0ed55ae1cd2bdff9f41e5 #+system-config-scripts.bfe6189587fc33d037051c22a904d60dab3f025f4d33de17745f1ea1ecc919bc -#+system-config-init.1e352382e85a0f59c6dac4330e3f36f28015d6621b32be762521330d5935e55e +#+system-config-init.37d6f54845eb8c91f585956a28b017d6d7ba43098c1e4646a35d87242ac24d63 #+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.bd8dfc69d1937a3ac11c421b107641e110bd0fb56c33ed7d62fd7b553069b5ec' \ + 'pthbs_path_containers=/versions/env.963d4fea74b8026ea7d9d15d1484038dc82bbdc685e4bfb8479d72180e5d07f8' \ '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.485c081af1765ba2bf327ddaa42edc5e3fd51498d2c10f2e4a4ca9f682b3f8c0 +#+system-config-rc.8d9ac77fd000509f8386a0f9dcc1c2f68a3b5d44bbd0ed55ae1cd2bdff9f41e5 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.485c081af1765ba2bf327ddaa42edc5e3fd51498d2c10f2e4a4ca9f682b3f8c0/config/s6-rc-db +s6rcdb=/versions/system-config-rc.8d9ac77fd000509f8386a0f9dcc1c2f68a3b5d44bbd0ed55ae1cd2bdff9f41e5/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.e18a6f4ba2c562713c962ebdc2247c7370d63c8ff2e199fb1298dfaab3c210c5 +#+system-config.0515928f3f24e98bf99076048aa3b5857b0ffdf0e0733eb74e715f813068219f # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.e18a6f4ba2c562713c962ebdc2247c7370d63c8ff2e199fb1298dfaab3c210c5/config/s6-rc-source +src=/versions/system-config.0515928f3f24e98bf99076048aa3b5857b0ffdf0e0733eb74e715f813068219f/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.32e407241677450bd719888af0be85c4d1cd3ef67a03e23034bc42ef52d8d944 +#+containers.572e544080c8ac9548d79bcb6356f3009c3a4085ac0ba596b626c2c01ff1732a #+fileset.2156fb8cabd628b062bc9fcc2f673d772a25574dfe5c2c2b779ada64fe9d9d08 #+logincaps.8eecccc5adf986da642a0e803f9dd0c71311059104c342f8f5d6d99223d793ec #+snaprep.9367398cdf89d51bfb5e6c8cb7ec368b8fa8f18b05c4926b7249f28703977504