commit 5cf143fcb037539f64a8ab89d97b22137a59ea14 parent 86e478ef171b834eb828f6a0e3e9a9ca71b815bd Author: Jan Pobrislo <ccx@te2000.cz> Date: Fri, 10 Oct 2025 16:39:12 +0000 misc package definition fixes Diffstat:
22 files changed, 54 insertions(+), 42 deletions(-)
diff --git a/templates/pkg/easyseccomp b/templates/pkg/easyseccomp @@ -11,6 +11,7 @@ #@sha256:{{files["easyseccomp_fix_includes.patch"]}}:easyseccomp_fix_includes.patch {% endblock %} {% block prepare -%} +{% include "functions/build_env_static" -%} {{ super() -}} patch -p1 <../easyseccomp_fix_includes.patch touch Makefile.in configure diff --git a/templates/pkg/system-config-scripts b/templates/pkg/system-config-scripts @@ -1,3 +1,4 @@ +{%- set pkg_source="git" -%} {% extends "scriptsetup" %} {% block genlinks_begin %} x["./command/s"]=1 diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -6,7 +6,7 @@ #+s6.f852407c0b0743b39e769f67ffcaaabeb17233500699e2219937aed7b9774cc6 #+ccx-utils.5d4a03d8fac908bceccbb03c49ab3e893b2cf08384226b326a9f6a062b8693fd #+applyuidgid-caps.6dc8f41171814dbb75b716a5d748812c48d6eef5ed7520db9172cf6dd6016936 -#+easyseccomp.5c8cbd09f114926a5b62c89f014622c63c676a7b12613e12b85168652cdb4c30 +#+easyseccomp.65e87db56977d92995485e50a784eee3d3daa3a8d9aedd369f56978c704e4903 #+mlog.a882a51752c5081bd671d7d564ea8b5c4502b93c0951cb77a20aa0238c66bc82 #+abduco.3851c3010776c0c49834d83aab4692d9eb1875a18af70bc86819338c2ee61b2c #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -7,7 +7,7 @@ #+alpine-keys.7c89c54f343b451790623504c04092bfe77b9c3462ded5a4a8739f0250a22cb9 #+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a #+xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c -#+container-bin-image.71b1417f73b797ce84fc7b66a302b4ada2155942fff277ffba5e127869ef90e5 +#+container-bin-image.2f965fe45d35b189724cdcb41f2dd0acaa1e70b956412520ceac61588dfa1272 #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -64,9 +64,9 @@ for f in '/home/ccx/versions/xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.71b1417f73b797ce84fc7b66a302b4ada2155942fff277ffba5e127869ef90e5/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.71b1417f73b797ce84fc7b66a302b4ada2155942fff277ffba5e127869ef90e5/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.71b1417f73b797ce84fc7b66a302b4ada2155942fff277ffba5e127869ef90e5/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.2f965fe45d35b189724cdcb41f2dd0acaa1e70b956412520ceac61588dfa1272/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.2f965fe45d35b189724cdcb41f2dd0acaa1e70b956412520ceac61588dfa1272/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.2f965fe45d35b189724cdcb41f2dd0acaa1e70b956412520ceac61588dfa1272/container-bin-image' "${dest}/deps/" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -7,7 +7,7 @@ #+s6-linux-utils.84f2d6d918b74fffc508df6cee48ed0f25124bd6c09f12558626d27992174226 #+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 #+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db -#+containers.93588ec59f31653c519900f8e7c35f4eb5c522328cfb253dba33d8c587831200 +#+containers.6ff2e4c45afa5afc4493cfabdacd8a47a738451d89680bce5d81d576c3f26eda #+xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c #+zstd.31469429bdd997f0a7a7eeb7dc4aa44b1e88d15227b1711943b136dc14cf753f #+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a @@ -15,4 +15,4 @@ #+getent.08248f0ec8ff20bd1279b61e637208961f5959b2b8bb33caee7720289dad2b5c #+fileset.30305918fa6fa5f7dcb447a76827959d5c8af9cd021b065fd360a5a176430035 #+ccx-utils.5d4a03d8fac908bceccbb03c49ab3e893b2cf08384226b326a9f6a062b8693fd -#+easyseccomp.5c8cbd09f114926a5b62c89f014622c63c676a7b12613e12b85168652cdb4c30- \ No newline at end of file +#+easyseccomp.65e87db56977d92995485e50a784eee3d3daa3a8d9aedd369f56978c704e4903+ \ No newline at end of file diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -21,7 +21,7 @@ #+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435 #+aat.b33fe3833f8ea46ebdb6900ad58529774beb169b76218ce270e3c975bcbfcd43 #+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db -#+containers.93588ec59f31653c519900f8e7c35f4eb5c522328cfb253dba33d8c587831200 +#+containers.6ff2e4c45afa5afc4493cfabdacd8a47a738451d89680bce5d81d576c3f26eda #+fileset.30305918fa6fa5f7dcb447a76827959d5c8af9cd021b065fd360a5a176430035 #+logincaps.0b57fd55080bdfb254593b6e6cc7e34f4fa19cd1622e9bf3368b75587f9cb1ca #+snaprep.30e9d122c8a1d12f58d81856dd5a79b72d4785bf30bff0e94b3a0f61e6c22238 @@ -38,8 +38,8 @@ #+user-env.27a0b5452d41afaacb1d76c456caa84d85aff599c39ff32b8db694d2550d5b6d #+strace.40668df6151b4574b553a5923103e07c6ddb344daca606f04edd0ac48e060d55 #+mlog.a882a51752c5081bd671d7d564ea8b5c4502b93c0951cb77a20aa0238c66bc82 -#+system-config.4a727dfa2bbfeb625bda074814824a8474754b815a0b8508a901129d5bbd37a9 -#+system-config-rc.209ded43b086cc955be65c1881797a39fcb4486d5e30655de29937d3b87a56e3 -#+system-config-scripts.3c3ea3f86753f1b0e0927ec2875e5b90f388ba2c1f6ed9b69509ac25a7555da6 -#+system-config-init.c68cb6a65bdb4fb2887a0c367c24fee77bdd793480d1f1ba5f60b7b698ec5a0f +#+system-config.9edf0cd80c8e6a4ac33e572b1057e1ca91ddea453f5a69ebd51c3b79f29dda8d +#+system-config-rc.3f1585d1f5598a7a68dae686aeb860aecb76761f376c37ccc276ae937d5cecb2 +#+system-config-scripts.d12136571c1f2d7a43fcf7cc96f91d5e342018ed98731a123c69ef67e4623f3f +#+system-config-init.5376024cfa6f64a36295e42b25949a62b28683fc092a425b5a6b139bbccfd374 #+system-config-zsh.ca45b9086a867eb594d68b32cb4826f747b819c640cb472a6fd1b649b1a1d760 \ No newline at end of file diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp @@ -17,7 +17,11 @@ # - build script start - - +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 \ diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -13,7 +13,7 @@ #+s6-rc.4709b0b39ae84f7a1efa984a66237c0f6133cec32466acdf0a139e2ef142f5ee #+s6.f852407c0b0743b39e769f67ffcaaabeb17233500699e2219937aed7b9774cc6 #+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 -#+system-config-scripts.3c3ea3f86753f1b0e0927ec2875e5b90f388ba2c1f6ed9b69509ac25a7555da6 +#+system-config-scripts.d12136571c1f2d7a43fcf7cc96f91d5e342018ed98731a123c69ef67e4623f3f #+logincaps.0b57fd55080bdfb254593b6e6cc7e34f4fa19cd1622e9bf3368b75587f9cb1ca #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config @@ -50,7 +50,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.8e803c83951044fa1be40ed75bc78bf130f93c0904203068cb9dbddaf315c1dc' \ + 'pthbs_path_containers=/home/ccx/versions/env.60cd9cb138b265dc3d0ec333de7ade77864e4e8d91f19784ac79a04d666e7ac3' \ 'pthbs_path_mdevd=/home/ccx/versions/env.51ab0c0e64ff93066325f8e4bcab80b46b317ef9b15abe28670e767ec96baca2' \ 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 @@ -6,7 +6,7 @@ #+s6-portable-utils.1118fd2f6ea4b1390c615802d601bd6803cf4545b03a89bed68e36bc2a13087e #+s6-linux-init.a6dbfc71babdb9506c53cad385c613f13a602885c2db0a5db609a86ecc687bac #+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a -#+system-config-rc.209ded43b086cc955be65c1881797a39fcb4486d5e30655de29937d3b87a56e3 +#+system-config-rc.3f1585d1f5598a7a68dae686aeb860aecb76761f376c37ccc276ae937d5cecb2 # - build script start - @@ -29,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/home/ccx/versions/system-config-rc.209ded43b086cc955be65c1881797a39fcb4486d5e30655de29937d3b87a56e3/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.3f1585d1f5598a7a68dae686aeb860aecb76761f376c37ccc276ae937d5cecb2/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 @@ -4,7 +4,7 @@ #+busybox-diffutils.963ce6582575680763337552764b6a3c1be781d9fada1d52aa2d04fadeb229d0 #+s6-rc.4709b0b39ae84f7a1efa984a66237c0f6133cec32466acdf0a139e2ef142f5ee #+fileset.30305918fa6fa5f7dcb447a76827959d5c8af9cd021b065fd360a5a176430035 -#+system-config.4a727dfa2bbfeb625bda074814824a8474754b815a0b8508a901129d5bbd37a9 +#+system-config.9edf0cd80c8e6a4ac33e572b1057e1ca91ddea453f5a69ebd51c3b79f29dda8d # - build script start - @@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/home/ccx/versions/system-config.4a727dfa2bbfeb625bda074814824a8474754b815a0b8508a901129d5bbd37a9/config/s6-rc-source +src=/home/ccx/versions/system-config.9edf0cd80c8e6a4ac33e572b1057e1ca91ddea453f5a69ebd51c3b79f29dda8d/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/system-config-scripts b/variants/ccx-x86_64/system-config-scripts @@ -3,6 +3,7 @@ #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 #+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 #+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435 +#@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts # - build script start - diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -21,7 +21,7 @@ #+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435 #+aat.b33fe3833f8ea46ebdb6900ad58529774beb169b76218ce270e3c975bcbfcd43 #+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db -#+containers.93588ec59f31653c519900f8e7c35f4eb5c522328cfb253dba33d8c587831200 +#+containers.6ff2e4c45afa5afc4493cfabdacd8a47a738451d89680bce5d81d576c3f26eda #+fileset.30305918fa6fa5f7dcb447a76827959d5c8af9cd021b065fd360a5a176430035 #+logincaps.0b57fd55080bdfb254593b6e6cc7e34f4fa19cd1622e9bf3368b75587f9cb1ca #+snaprep.30e9d122c8a1d12f58d81856dd5a79b72d4785bf30bff0e94b3a0f61e6c22238 diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -6,7 +6,7 @@ #+s6.e2ee6b1e77f60e714bd5e81d709b65a07b24dbbd9af559918a598ef82523a8c5 #+ccx-utils.020204071392f91013fe10d159d85b96ce1cfcf6b0666afd324594dfefdf3b0a #+applyuidgid-caps.8d7ac4d1fafc6213e4902c3cd0f946f5b1361a06897ded604b2dc4eff80d1bab -#+easyseccomp.269467cf87ab99af0934bb17ca3a9bc6c667dba73374df74a7f7e45b24bba298 +#+easyseccomp.bb0906d21f579981b7d5cf6b965d69d4dfabf2dbae8b494f3268848c46619e8c #+mlog.7a615a6cd358a942b7d328b13562fc11cb3c82d2933f3de7fa727db87d48e6c2 #+abduco.6e29cf39005891226806df67801bd759adc0beaff1ea8bebaeb6151287eabd0f #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -7,7 +7,7 @@ #+alpine-keys.7aa8a887a6f32ef454bca16fe2547b53b765170c2f8f0bab72ddd42c518bc941 #+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9 #+xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3 -#+container-bin-image.ff7fbdbad542a574c6ca14cf64d6675e6ff8c4abf69bdb5539d205416729bbaf +#+container-bin-image.8c1a5f6298527959d0eafe4435da7582a171f5268e32c8e85c80cb39c69c6194 #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -64,9 +64,9 @@ for f in '/versions/xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c32 ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.ff7fbdbad542a574c6ca14cf64d6675e6ff8c4abf69bdb5539d205416729bbaf/container-bin-image' -test -f '/versions/container-bin-image.ff7fbdbad542a574c6ca14cf64d6675e6ff8c4abf69bdb5539d205416729bbaf/container-bin-image/if' -ln -sf '/versions/container-bin-image.ff7fbdbad542a574c6ca14cf64d6675e6ff8c4abf69bdb5539d205416729bbaf/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.8c1a5f6298527959d0eafe4435da7582a171f5268e32c8e85c80cb39c69c6194/container-bin-image' +test -f '/versions/container-bin-image.8c1a5f6298527959d0eafe4435da7582a171f5268e32c8e85c80cb39c69c6194/container-bin-image/if' +ln -sf '/versions/container-bin-image.8c1a5f6298527959d0eafe4435da7582a171f5268e32c8e85c80cb39c69c6194/container-bin-image' "${dest}/deps/" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -7,7 +7,7 @@ #+s6-linux-utils.825109564ccf0b423888de36d9946db0453a95ffbce5970d994da9007f8a34cd #+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 #+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd -#+containers.5e4cf467fe5d91205726257173a227320e0492aefd7eac79624f7cac04b720ff +#+containers.196520ceed32dc6baf245ebcfce2c4a00fc7d24be7273359122b7955fdf1a339 #+xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3 #+zstd.0c21eeca000c0fc1b714595d83cc5210adfa581edcf45820b95cb5921c46fcc4 #+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9 @@ -15,4 +15,4 @@ #+getent.69120bd1e42219ed632181e8c4743c83e86e377d4b1d1197e6f8aa4c227b38ef #+fileset.a0ba1abeae878cc17e1f0ceccc0c79ee7b75b0476e283b042be371b828285b1f #+ccx-utils.020204071392f91013fe10d159d85b96ce1cfcf6b0666afd324594dfefdf3b0a -#+easyseccomp.269467cf87ab99af0934bb17ca3a9bc6c667dba73374df74a7f7e45b24bba298- \ No newline at end of file +#+easyseccomp.bb0906d21f579981b7d5cf6b965d69d4dfabf2dbae8b494f3268848c46619e8c+ \ No newline at end of file diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -21,7 +21,7 @@ #+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0 #+aat.26c64faca6c93aec6a952f93e4084d75104efe6f7c7fe589fdf2b4a2c8e73bd8 #+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd -#+containers.5e4cf467fe5d91205726257173a227320e0492aefd7eac79624f7cac04b720ff +#+containers.196520ceed32dc6baf245ebcfce2c4a00fc7d24be7273359122b7955fdf1a339 #+fileset.a0ba1abeae878cc17e1f0ceccc0c79ee7b75b0476e283b042be371b828285b1f #+logincaps.a67bba67b1e5e55ab2358bdefb29c0493d16dd72cb05571b87fbc1a215878bca #+snaprep.faf160dbb290f4b2a5f9b6605820a8f59b9534344c3b3b430c1cdf1a336a8a8f @@ -38,8 +38,8 @@ #+user-env.cdccc52b50fbacaeea62161170c6e3b770fa8dcd6a6e46af363cbbe451f6b5a4 #+strace.f9dbe83d3eaac5f19c4d7b3971928e97af25794472024ea02b4fd20ef5d977c2 #+mlog.7a615a6cd358a942b7d328b13562fc11cb3c82d2933f3de7fa727db87d48e6c2 -#+system-config.3b139dbdcdda96cac7da22fa91bfead806a45bd86638d371a3c4f1815f9d0122 -#+system-config-rc.4a8efd34573d36f8c55056d9039d713b0ef8b0155f0b7650cfed082ae6c4a44d -#+system-config-scripts.cbbd7e8b35c682d147057f2cd95a07b8735fe7422d41ed17dd2851d215e38137 -#+system-config-init.d12782071e02f0c73683642d8774ad7aa72d6b430c07feca947e10fd9f832023 +#+system-config.438ee7c7894e36d3a870512560b8cb449494757dec3871cc7488565bc17bc725 +#+system-config-rc.fd155a5c26116b5624e0011b87236201009a92ed894f4bb52bcdb951c44cfeae +#+system-config-scripts.743d8719166a57fed0c83d867e26997a6dafec7ae495b31ac69e13be475405fc +#+system-config-init.88bcb8e164ea26fd8e1038be8b99b87cbeae5d377dbdfc49ad0b1818588e86ad #+system-config-zsh.2395a0ac100619f08b05c21044f60208ef3fcb135a9302047c299e6d7ee2a6b1 \ No newline at end of file diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp @@ -17,7 +17,11 @@ # - build script start - - +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 \ diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -13,7 +13,7 @@ #+s6-rc.6785af4c10f0e833235def47f34d88b8ac76fa2116f63d3bff478fb78de38b04 #+s6.e2ee6b1e77f60e714bd5e81d709b65a07b24dbbd9af559918a598ef82523a8c5 #+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 -#+system-config-scripts.cbbd7e8b35c682d147057f2cd95a07b8735fe7422d41ed17dd2851d215e38137 +#+system-config-scripts.743d8719166a57fed0c83d867e26997a6dafec7ae495b31ac69e13be475405fc #+logincaps.a67bba67b1e5e55ab2358bdefb29c0493d16dd72cb05571b87fbc1a215878bca #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config @@ -50,7 +50,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.4b39c10583add2f36215abb7b3959d0c59fb9dffaeeedc5825130c9c9cfdea6d' \ + 'pthbs_path_containers=/versions/env.c73cf0c4115c8824c53e4962d9028567677a0a14a5d2c76f7448c63b31aa0069' \ 'pthbs_path_mdevd=/versions/env.5efd9db39293775a765dd3ca79798f1d6d991d82daea54a5bef5fffce4509f66' \ 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 @@ -6,7 +6,7 @@ #+s6-portable-utils.f4a82103130cfcc49f440896a006e18566297bd1eaec89689a29869958a3982b #+s6-linux-init.07931b00ba7cfaca6877d09e985caf229cbd20c34f35b30754a35b9d19762b56 #+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab -#+system-config-rc.4a8efd34573d36f8c55056d9039d713b0ef8b0155f0b7650cfed082ae6c4a44d +#+system-config-rc.fd155a5c26116b5624e0011b87236201009a92ed894f4bb52bcdb951c44cfeae # - build script start - @@ -29,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/versions/system-config-rc.4a8efd34573d36f8c55056d9039d713b0ef8b0155f0b7650cfed082ae6c4a44d/config/s6-rc-db +s6rcdb=/versions/system-config-rc.fd155a5c26116b5624e0011b87236201009a92ed894f4bb52bcdb951c44cfeae/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 @@ -4,7 +4,7 @@ #+busybox-diffutils.38ca9e723dfa24bd5cc2281952ff03c7dd312918a28dc0619b9816a293b5c8f5 #+s6-rc.6785af4c10f0e833235def47f34d88b8ac76fa2116f63d3bff478fb78de38b04 #+fileset.a0ba1abeae878cc17e1f0ceccc0c79ee7b75b0476e283b042be371b828285b1f -#+system-config.3b139dbdcdda96cac7da22fa91bfead806a45bd86638d371a3c4f1815f9d0122 +#+system-config.438ee7c7894e36d3a870512560b8cb449494757dec3871cc7488565bc17bc725 # - build script start - @@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/versions/system-config.3b139dbdcdda96cac7da22fa91bfead806a45bd86638d371a3c4f1815f9d0122/config/s6-rc-source +src=/versions/system-config.438ee7c7894e36d3a870512560b8cb449494757dec3871cc7488565bc17bc725/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/system-config-scripts b/variants/root-x86_64/system-config-scripts @@ -3,6 +3,7 @@ #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d #+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 #+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0 +#@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts # - build script start - diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -21,7 +21,7 @@ #+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0 #+aat.26c64faca6c93aec6a952f93e4084d75104efe6f7c7fe589fdf2b4a2c8e73bd8 #+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd -#+containers.5e4cf467fe5d91205726257173a227320e0492aefd7eac79624f7cac04b720ff +#+containers.196520ceed32dc6baf245ebcfce2c4a00fc7d24be7273359122b7955fdf1a339 #+fileset.a0ba1abeae878cc17e1f0ceccc0c79ee7b75b0476e283b042be371b828285b1f #+logincaps.a67bba67b1e5e55ab2358bdefb29c0493d16dd72cb05571b87fbc1a215878bca #+snaprep.faf160dbb290f4b2a5f9b6605820a8f59b9534344c3b3b430c1cdf1a336a8a8f