commit 8f2475b98e1d27f377b1a5d1052a178af6b6090e parent e0026941dfa9f8dcb367eb21aebe4b1207923089 Author: Jan Pobrislo <ccx@te2000.cz> Date: Wed, 26 Nov 2025 14:16:51 +0000 skalibs sysdeps directory is not exposed in env; undo 88415be2244f27f97b4f5d97f2e221bb75226933 Diffstat:
43 files changed, 173 insertions(+), 173 deletions(-)
diff --git a/templates/skaware b/templates/skaware @@ -12,7 +12,7 @@ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='{{pkg_install_dir("skalibs")}}/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils @@ -30,7 +30,7 @@ #+musl-cross-make.74cd95cd7bd1db21d28d9a8579d924d588b9cbfd0f9744c0fb890188d71646aa #+gnu-make.31d90a55d6506852f9784f6f6febf0d843f8051f63bc18795fd5275baa369f50 #+skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6 -#+s6.79622d6af54c647d88dfcc4911740c099871a4432fdfab421fdbbcb9b58bed1b +#+s6.1e6d730d3cc012b4744655feaf81f81549ad98c4ec21b5e64ad0c52fd7263e93 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -47,9 +47,9 @@ #+busybox-diffutils.30a803a8b8dd1d4f18bc5e5952cc4b15aea625caf2af34dd424af233786ba0d0 #+busybox-findutils.052256c5bf9c3e7fef2e69d22f3d402d004f22113ce10b4d2c54ff417bf42622 #+busybox-login.e92d17445b96532333506a543ff2c538bee3f44a6126d943037b60b7adcb77a5 -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 -#+s6.79622d6af54c647d88dfcc4911740c099871a4432fdfab421fdbbcb9b58bed1b -#+ccx-utils.23975d561f17df7be007c23338db11dadce232946d760a250c4a74e37479e789 +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c +#+s6.1e6d730d3cc012b4744655feaf81f81549ad98c4ec21b5e64ad0c52fd7263e93 +#+ccx-utils.963f51bd7843f16752826454202574a965cd6a67fd50be84c404294d3ba936fb #+applyuidgid-caps.f3e438e06650983379807b56871be0f6be24cfed5e1d2bbd02bf0acc434eb320 #+easyseccomp.4983578ab32c937df3b3ba05e596c1c12705270efb1ef7af35586794c13c27f9 #+mlog.04f202d1e6555c3466d2e17c23626efc4e12f6100a17b0970d5d957bce88f44a diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -29,11 +29,11 @@ #+busybox-awk.f44da758ab8e737f05fb82ca4342acdf29ec44a9c2a9670cded75b04e8208058 #+zsh.08bac2dd5a59108ff97c33e090b80edb1f96413026c95358eb03d4ef039a75a9 #+pthbs-banginstall.abc777c872ae02114ad6beafef1e6fded22e76fcbcb88e79df1edb9b8e97f03d -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c #+alpine-keys.45710280cfed92e477b9d1845237fa7952cfaf0586b67d430f8c2b46161fdf60 #+apk-tools.737744d7f1e537e0669488ffc6c29f7d50ac201aeebd20461c48e35406d4f43d #+xbps.555ac935d5ed432d29b5e2d5c902b217fe1abdc895d06289330614a0374e3e6e -#+container-bin-image.43f1a3076f5e83493ce5a06d8b2ad606114ad2c17a02bad977edf053c1effddd +#+container-bin-image.b923e9234131004407f89be85341146e6f0f7e458ef74385fb1321bc681e9f13 #@git:9820dbea1cf5060d7d04632f0fed7e91ea608309:containers @@ -91,9 +91,9 @@ for f in '/home/ccx/versions/xbps.555ac935d5ed432d29b5e2d5c902b217fe1abdc895d062 ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.43f1a3076f5e83493ce5a06d8b2ad606114ad2c17a02bad977edf053c1effddd/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.43f1a3076f5e83493ce5a06d8b2ad606114ad2c17a02bad977edf053c1effddd/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.43f1a3076f5e83493ce5a06d8b2ad606114ad2c17a02bad977edf053c1effddd/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.b923e9234131004407f89be85341146e6f0f7e458ef74385fb1321bc681e9f13/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.b923e9234131004407f89be85341146e6f0f7e458ef74385fb1321bc681e9f13/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.b923e9234131004407f89be85341146e6f0f7e458ef74385fb1321bc681e9f13/container-bin-image' "${dest}/deps/" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -45,20 +45,20 @@ #+busybox-logging.a82bb2f2d07e0f30d1271482b142c052367a504a97b3803e7ad25148d53592c1 #+busybox-cron.92a0481bcf3adea90752835bd7ee77641d7366ff84c1539f5562e01e9d14f01e #+busybox-diffutils.30a803a8b8dd1d4f18bc5e5952cc4b15aea625caf2af34dd424af233786ba0d0 -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 -#+s6.79622d6af54c647d88dfcc4911740c099871a4432fdfab421fdbbcb9b58bed1b -#+s6-portable-utils.fa90b6f86108ac7a4ddce358490855648382b94551a754d68db43ac1e4ecaa04 -#+s6-linux-utils.3c38fc88a3912ff8a949db05295842d2b2cf58b53476ef058c4777a39866b2a8 +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c +#+s6.1e6d730d3cc012b4744655feaf81f81549ad98c4ec21b5e64ad0c52fd7263e93 +#+s6-portable-utils.bbc98b1351bf9ff3e6e000d25d649566b75afe5ba8c4208a23e43e833e5c24b4 +#+s6-linux-utils.869588f60d61bf87681db3f5735cee9d8fb4ba1e98c4ff453a47e3b56959feba #+zsh.08bac2dd5a59108ff97c33e090b80edb1f96413026c95358eb03d4ef039a75a9 #+confz.a7dc73b43813ba8557885b9aa042f0a66cc579e321c6067b6e352be3ded8dc78 -#+containers.02ba6fb410dbf667d0f0585388e47e729e883ca8fdc3c0e0c6e38cf0df855e23 +#+containers.54a0350459f289c7e1b47a92e39d273fa4b2ba56d7e1da853b1691092fbd7455 #+xbps.555ac935d5ed432d29b5e2d5c902b217fe1abdc895d06289330614a0374e3e6e #+zstd.47e57cb2d8c327bf55c48e3e1a8dabdd79b82431c34ac1d86997c12802f93b8d #+apk-tools.737744d7f1e537e0669488ffc6c29f7d50ac201aeebd20461c48e35406d4f43d #+alpine-keys.45710280cfed92e477b9d1845237fa7952cfaf0586b67d430f8c2b46161fdf60 #+getent.8869122efba908424882287edc4ff6e87542c8b1d925b31bf63c128045fcf6dc #+fileset.0e14bac5fb53f8712c33088f26d59687fb3f05f5abdafd093e94f542d5a5e76b -#+ccx-utils.23975d561f17df7be007c23338db11dadce232946d760a250c4a74e37479e789 +#+ccx-utils.963f51bd7843f16752826454202574a965cd6a67fd50be84c404294d3ba936fb #+easyseccomp.4983578ab32c937df3b3ba05e596c1c12705270efb1ef7af35586794c13c27f9 #+findutils.fd366384c1f4cac901fab56c88fa7cb2fb8d971fe1ee1ebaa4c41466f37a2c67 #+nawk.d6c1a6fd67ebccb4cb1b8062bed80778ee976f5a62370e60fcbc443257a78cd9 \ No newline at end of file diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -52,23 +52,23 @@ #+flex.1108ea92b5d0a289d5884ebb2df2398eed87d0f2898feedc18af4d85dcb5255d #+bison.8878bfa3e199ad13de1c2932195a8654f3793729b04c6dc0f70bb57cb3697b40 #+rsync.3d0a477167789eb4a71f9b027e9f02614fc0f4f4e4d1f13690ecb4811deb6907 -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 -#+s6.79622d6af54c647d88dfcc4911740c099871a4432fdfab421fdbbcb9b58bed1b -#+s6-rc.4d74c77acd02ea124bc1c47fe8fefee11c8a915c5cd1cd34f10b4c1e22c0777e -#+s6-portable-utils.fa90b6f86108ac7a4ddce358490855648382b94551a754d68db43ac1e4ecaa04 -#+s6-linux-utils.3c38fc88a3912ff8a949db05295842d2b2cf58b53476ef058c4777a39866b2a8 -#+s6-linux-init.876ecf8fa063a4679c1c5f343731568bf65107894662e5c25afe563ab5c1c6f9 -#+mdevd.f4ddc8a0d78c27677ffb4f3f70027c7b07ec74448daac0c80d1a707fd71c6b47 -#+s6-dns.07d522bd7df13f71fd5c4ba46ecdcbd683776f922dc38eca53f99b843ebe2e82 +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c +#+s6.1e6d730d3cc012b4744655feaf81f81549ad98c4ec21b5e64ad0c52fd7263e93 +#+s6-rc.7c79a1651919cdaf236615d6193cbd1cf008dbb5505bf88b4a64aff30ae31be9 +#+s6-portable-utils.bbc98b1351bf9ff3e6e000d25d649566b75afe5ba8c4208a23e43e833e5c24b4 +#+s6-linux-utils.869588f60d61bf87681db3f5735cee9d8fb4ba1e98c4ff453a47e3b56959feba +#+s6-linux-init.fb2d3b352e4f8880c803a4423919d62134a6db570d331f12fc4ebbae83bd52db +#+mdevd.3f41c5c872427ba79be3059512452afa7bcc98746db65234f056e6f2fc49a75c +#+s6-dns.8b3e259b13e8fa32dcdda3dc757dd9ea6d59ddf541584def97f540da098be3fd #+libressl.cab75da0c52b225a622f05439b3f2f274a96710529acc8dd4d4fd7ee185cc54f -#+s6-networking.cccbb677cf7d9d837887635978092f3986a894dbc7084f15f7a0aba3557ccc42 +#+s6-networking.1161e1c6eed34da60eb3d550b1a2bb702eeade52533eb7b4caeb120f04c59c0c #+zsh.08bac2dd5a59108ff97c33e090b80edb1f96413026c95358eb03d4ef039a75a9 #+pthbs-banginstall.abc777c872ae02114ad6beafef1e6fded22e76fcbcb88e79df1edb9b8e97f03d #+aat.2ecceb51a1c8c60748defb9eb74577d7975dc749c08402a14e2fee4bfb4aa2bc #+confz.a7dc73b43813ba8557885b9aa042f0a66cc579e321c6067b6e352be3ded8dc78 -#+containers.02ba6fb410dbf667d0f0585388e47e729e883ca8fdc3c0e0c6e38cf0df855e23 +#+containers.54a0350459f289c7e1b47a92e39d273fa4b2ba56d7e1da853b1691092fbd7455 #+fileset.0e14bac5fb53f8712c33088f26d59687fb3f05f5abdafd093e94f542d5a5e76b -#+logincaps.039ebc02fb33effb49147c0198b3568dfbd8f5f9037b79db9f088508ecdf96e6 +#+logincaps.0a9fda577ede7d98c00a41776db4c0879d60434de5667b175cb3ab4c3f129857 #+snaprep.4c03f4145e7621d9b1a89ccc3ddffcc3ae3d2cd78f8faa2e20ed74364d7dec51 #+curl.419001f07801e91d9f3e16bb9c40bfd60de1bb14b603a249bac58fb4218c7f7e #+git.5a965af7cb4c6ce49ea67e1191bfd24e4fd7749070a5216857411035f1077ef9 @@ -79,8 +79,8 @@ #+iconv.5c3d76060d763884a6707138ce4cac2153f2942b0e71cbbad95e892937c1d2d4 #+libcap.51d65e3ea6882a3f7ac94123a2b77afb17a4f1c04a710b9b448d03465c33e076 #+applyuidgid-caps.f3e438e06650983379807b56871be0f6be24cfed5e1d2bbd02bf0acc434eb320 -#+ccx-utils.23975d561f17df7be007c23338db11dadce232946d760a250c4a74e37479e789 -#+user-env.c8ef41ef2b5eb6de655db69f46c518735c3f2a43d9c5de58badc73445e9d6c6b +#+ccx-utils.963f51bd7843f16752826454202574a965cd6a67fd50be84c404294d3ba936fb +#+user-env.6e227cebe499cebb22c0448e52f0b0a270e923e582724506aec96fee3666d378 #+strace.99dfb71f742f5e2e52bd7438571930eb69476cc693b4d18cb056956aabbb890e #+mlog.04f202d1e6555c3466d2e17c23626efc4e12f6100a17b0970d5d957bce88f44a #+findutils.fd366384c1f4cac901fab56c88fa7cb2fb8d971fe1ee1ebaa4c41466f37a2c67 @@ -88,9 +88,9 @@ #+squashfs-tools.e7bea5b78e0e2b577342fa09ed7d9691f38e8aea480a107a27f59ffe1b5ec12f #+mandoc.873388061ad4acc4a497ac4e216fa15837d2be004538344b7e99a4c0f288d773 #+tinyssh.b691a3785f950c64522766f5f43f05f24d72e6cad9320d8706cd9722ef763051 -#+system-config.778700e49de39fe37cd772dc7c9f51fa23be8b98c29bae117b3376b0b88ad7d6 -#+system-config-rc.5d7b1f01ed699cc09943212acfed2eaee05b44b2f864ff76119add1e2e01f935 +#+system-config.55b3f0dd27251bd3cce4e781b837e0a956279f7cac12f5586c9f6eb2923e80e0 +#+system-config-rc.689c1bddba862a22d5befd5dfd7fc94c0ef111d090575fc78cbcd3673885142a #+system-config-scripts.a983668711783d5c36b32ca9859fe7c99b0cf3588bbeeb315b8ba5ca6b692831 -#+system-config-init.6b29bd35ad2ce5934294c05499a0e1f125d120f0036db27325dc984d382d5c1f +#+system-config-init.6b57a918e56533b0a8d552daf52a29c603d9557a741720918370cc07a702de98 #+system-config-zsh.9a3b5f12d36aa21000726f1da1e351fd62945101f5bb54392a52203d82c5aef9 #+busybox.2ef5301e1fcabd1b3cd0b88f9dda6a41d4e7b432be5e555dffa5aae865334e41 \ No newline at end of file diff --git a/variants/ccx-x86_64/execline b/variants/ccx-x86_64/execline @@ -46,7 +46,7 @@ cd 'execline' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/home/ccx/versions/skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -29,9 +29,9 @@ #+busybox-awk.f44da758ab8e737f05fb82ca4342acdf29ec44a9c2a9670cded75b04e8208058 #+zsh.08bac2dd5a59108ff97c33e090b80edb1f96413026c95358eb03d4ef039a75a9 #+pthbs-banginstall.abc777c872ae02114ad6beafef1e6fded22e76fcbcb88e79df1edb9b8e97f03d -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c #+musl-cross-make.74cd95cd7bd1db21d28d9a8579d924d588b9cbfd0f9744c0fb890188d71646aa -#+ccx-utils.23975d561f17df7be007c23338db11dadce232946d760a250c4a74e37479e789 +#+ccx-utils.963f51bd7843f16752826454202574a965cd6a67fd50be84c404294d3ba936fb #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd @@ -30,7 +30,7 @@ #+musl-cross-make.74cd95cd7bd1db21d28d9a8579d924d588b9cbfd0f9744c0fb890188d71646aa #+gnu-make.31d90a55d6506852f9784f6f6febf0d843f8051f63bc18795fd5275baa369f50 #+skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6 -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd @@ -47,7 +47,7 @@ cd 'mdevd' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/home/ccx/versions/skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -44,8 +44,8 @@ #+busybox-util-linux-priv.bcb37952ef97d61602b87ec1820f52fef4a5e6548c0f8b5b2f6ec768ddac2d02 #+busybox-logging.a82bb2f2d07e0f30d1271482b142c052367a504a97b3803e7ad25148d53592c1 #+busybox-cron.92a0481bcf3adea90752835bd7ee77641d7366ff84c1539f5562e01e9d14f01e -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 -#+s6.79622d6af54c647d88dfcc4911740c099871a4432fdfab421fdbbcb9b58bed1b +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c +#+s6.1e6d730d3cc012b4744655feaf81f81549ad98c4ec21b5e64ad0c52fd7263e93 #+mdev-scripts.2c276522671dd3078971730675b629cb8e97250f449387431ada09ecb177eb20 -#+mdevd.f4ddc8a0d78c27677ffb4f3f70027c7b07ec74448daac0c80d1a707fd71c6b47 +#+mdevd.3f41c5c872427ba79be3059512452afa7bcc98746db65234f056e6f2fc49a75c #+busybox.2ef5301e1fcabd1b3cd0b88f9dda6a41d4e7b432be5e555dffa5aae865334e41 \ No newline at end of file diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6 @@ -30,7 +30,7 @@ #+musl-cross-make.74cd95cd7bd1db21d28d9a8579d924d588b9cbfd0f9744c0fb890188d71646aa #+gnu-make.31d90a55d6506852f9784f6f6febf0d843f8051f63bc18795fd5275baa369f50 #+skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6 -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6 @@ -47,7 +47,7 @@ cd 's6' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/home/ccx/versions/skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/s6-dns b/variants/ccx-x86_64/s6-dns @@ -46,7 +46,7 @@ cd 's6-dns' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/home/ccx/versions/skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/s6-linux-init b/variants/ccx-x86_64/s6-linux-init @@ -30,8 +30,8 @@ #+musl-cross-make.74cd95cd7bd1db21d28d9a8579d924d588b9cbfd0f9744c0fb890188d71646aa #+gnu-make.31d90a55d6506852f9784f6f6febf0d843f8051f63bc18795fd5275baa369f50 #+skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6 -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 -#+s6.79622d6af54c647d88dfcc4911740c099871a4432fdfab421fdbbcb9b58bed1b +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c +#+s6.1e6d730d3cc012b4744655feaf81f81549ad98c4ec21b5e64ad0c52fd7263e93 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init @@ -48,7 +48,7 @@ cd 's6-linux-init' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/home/ccx/versions/skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/s6-linux-utils b/variants/ccx-x86_64/s6-linux-utils @@ -46,7 +46,7 @@ cd 's6-linux-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/home/ccx/versions/skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking @@ -30,9 +30,9 @@ #+musl-cross-make.74cd95cd7bd1db21d28d9a8579d924d588b9cbfd0f9744c0fb890188d71646aa #+gnu-make.31d90a55d6506852f9784f6f6febf0d843f8051f63bc18795fd5275baa369f50 #+skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6 -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 -#+s6.79622d6af54c647d88dfcc4911740c099871a4432fdfab421fdbbcb9b58bed1b -#+s6-dns.07d522bd7df13f71fd5c4ba46ecdcbd683776f922dc38eca53f99b843ebe2e82 +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c +#+s6.1e6d730d3cc012b4744655feaf81f81549ad98c4ec21b5e64ad0c52fd7263e93 +#+s6-dns.8b3e259b13e8fa32dcdda3dc757dd9ea6d59ddf541584def97f540da098be3fd #+libressl.cab75da0c52b225a622f05439b3f2f274a96710529acc8dd4d4fd7ee185cc54f #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking @@ -50,7 +50,7 @@ cd 's6-networking' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/home/ccx/versions/skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/s6-portable-utils b/variants/ccx-x86_64/s6-portable-utils @@ -46,7 +46,7 @@ cd 's6-portable-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/home/ccx/versions/skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/s6-rc b/variants/ccx-x86_64/s6-rc @@ -30,8 +30,8 @@ #+musl-cross-make.74cd95cd7bd1db21d28d9a8579d924d588b9cbfd0f9744c0fb890188d71646aa #+gnu-make.31d90a55d6506852f9784f6f6febf0d843f8051f63bc18795fd5275baa369f50 #+skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6 -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 -#+s6.79622d6af54c647d88dfcc4911740c099871a4432fdfab421fdbbcb9b58bed1b +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c +#+s6.1e6d730d3cc012b4744655feaf81f81549ad98c4ec21b5e64ad0c52fd7263e93 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc @@ -48,7 +48,7 @@ cd 's6-rc' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/home/ccx/versions/skalibs.8a961c5580e593b1e672768c5a2f91828cc67afa0507e295009ad9dac04678b6/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -51,16 +51,16 @@ #+aat.2ecceb51a1c8c60748defb9eb74577d7975dc749c08402a14e2fee4bfb4aa2bc #+fileset.0e14bac5fb53f8712c33088f26d59687fb3f05f5abdafd093e94f542d5a5e76b #+rsync.3d0a477167789eb4a71f9b027e9f02614fc0f4f4e4d1f13690ecb4811deb6907 -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c #+kbd.4217ffc9d75a6041f026b8badac79b8b4e95576877771ed9ab22d5d3cd84b93c -#+mdevd.f4ddc8a0d78c27677ffb4f3f70027c7b07ec74448daac0c80d1a707fd71c6b47 -#+s6-linux-utils.3c38fc88a3912ff8a949db05295842d2b2cf58b53476ef058c4777a39866b2a8 -#+s6-rc.4d74c77acd02ea124bc1c47fe8fefee11c8a915c5cd1cd34f10b4c1e22c0777e -#+s6.79622d6af54c647d88dfcc4911740c099871a4432fdfab421fdbbcb9b58bed1b +#+mdevd.3f41c5c872427ba79be3059512452afa7bcc98746db65234f056e6f2fc49a75c +#+s6-linux-utils.869588f60d61bf87681db3f5735cee9d8fb4ba1e98c4ff453a47e3b56959feba +#+s6-rc.7c79a1651919cdaf236615d6193cbd1cf008dbb5505bf88b4a64aff30ae31be9 +#+s6.1e6d730d3cc012b4744655feaf81f81549ad98c4ec21b5e64ad0c52fd7263e93 #+zsh.08bac2dd5a59108ff97c33e090b80edb1f96413026c95358eb03d4ef039a75a9 #+libcgroup.47fc0a178b2a901cf3cfd3d7bd66ff0ab6972b20ee5909c4defd74b1c4e765f4 #+system-config-scripts.a983668711783d5c36b32ca9859fe7c99b0cf3588bbeeb315b8ba5ca6b692831 -#+logincaps.039ebc02fb33effb49147c0198b3568dfbd8f5f9037b79db9f088508ecdf96e6 +#+logincaps.0a9fda577ede7d98c00a41776db4c0879d60434de5667b175cb3ab4c3f129857 #+busybox.2ef5301e1fcabd1b3cd0b88f9dda6a41d4e7b432be5e555dffa5aae865334e41 #@git:20f1fc8e70e98fa5e8e6e378ff53ce79628a45ca:system-config @@ -98,8 +98,8 @@ 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.7482c7606aed96e9d76bb69e93aa6b6f0d9277c67ba34c152f05eaab6fa1f088' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.3627ad4768f1ecfab406244fe63a2ec0459af7c82ffcf7b191a4c3d85e3cce48' \ + 'pthbs_path_containers=/home/ccx/versions/env.dc6fac6ce559583813d6c18fc83be8257c54b36e9c2854d4bc124bf209cd65bd' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.bcf9c94c383406507b9722bce7d7e5c0590677571de2321ce4439b4a62cb78ca' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -46,12 +46,12 @@ #+busybox-util-linux-priv.bcb37952ef97d61602b87ec1820f52fef4a5e6548c0f8b5b2f6ec768ddac2d02 #+busybox-logging.a82bb2f2d07e0f30d1271482b142c052367a504a97b3803e7ad25148d53592c1 #+busybox-cron.92a0481bcf3adea90752835bd7ee77641d7366ff84c1539f5562e01e9d14f01e -#+s6.79622d6af54c647d88dfcc4911740c099871a4432fdfab421fdbbcb9b58bed1b -#+s6-rc.4d74c77acd02ea124bc1c47fe8fefee11c8a915c5cd1cd34f10b4c1e22c0777e -#+s6-portable-utils.fa90b6f86108ac7a4ddce358490855648382b94551a754d68db43ac1e4ecaa04 -#+s6-linux-init.876ecf8fa063a4679c1c5f343731568bf65107894662e5c25afe563ab5c1c6f9 -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 -#+system-config-rc.5d7b1f01ed699cc09943212acfed2eaee05b44b2f864ff76119add1e2e01f935 +#+s6.1e6d730d3cc012b4744655feaf81f81549ad98c4ec21b5e64ad0c52fd7263e93 +#+s6-rc.7c79a1651919cdaf236615d6193cbd1cf008dbb5505bf88b4a64aff30ae31be9 +#+s6-portable-utils.bbc98b1351bf9ff3e6e000d25d649566b75afe5ba8c4208a23e43e833e5c24b4 +#+s6-linux-init.fb2d3b352e4f8880c803a4423919d62134a6db570d331f12fc4ebbae83bd52db +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c +#+system-config-rc.689c1bddba862a22d5befd5dfd7fc94c0ef111d090575fc78cbcd3673885142a # - build script start - @@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.5d7b1f01ed699cc09943212acfed2eaee05b44b2f864ff76119add1e2e01f935/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.689c1bddba862a22d5befd5dfd7fc94c0ef111d090575fc78cbcd3673885142a/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 @@ -28,9 +28,9 @@ #+busybox-findutils.052256c5bf9c3e7fef2e69d22f3d402d004f22113ce10b4d2c54ff417bf42622 #+busybox-awk.f44da758ab8e737f05fb82ca4342acdf29ec44a9c2a9670cded75b04e8208058 #+busybox-diffutils.30a803a8b8dd1d4f18bc5e5952cc4b15aea625caf2af34dd424af233786ba0d0 -#+s6-rc.4d74c77acd02ea124bc1c47fe8fefee11c8a915c5cd1cd34f10b4c1e22c0777e +#+s6-rc.7c79a1651919cdaf236615d6193cbd1cf008dbb5505bf88b4a64aff30ae31be9 #+fileset.0e14bac5fb53f8712c33088f26d59687fb3f05f5abdafd093e94f542d5a5e76b -#+system-config.778700e49de39fe37cd772dc7c9f51fa23be8b98c29bae117b3376b0b88ad7d6 +#+system-config.55b3f0dd27251bd3cce4e781b837e0a956279f7cac12f5586c9f6eb2923e80e0 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.778700e49de39fe37cd772dc7c9f51fa23be8b98c29bae117b3376b0b88ad7d6/config/s6-rc-source +src=/home/ccx/versions/system-config.55b3f0dd27251bd3cce4e781b837e0a956279f7cac12f5586c9f6eb2923e80e0/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/user-env b/variants/ccx-x86_64/user-env @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.4ea1c8c8746d7e80d36dea8924c576bc9666905b461dd543ceb5595394406c97 #+busybox-findutils.052256c5bf9c3e7fef2e69d22f3d402d004f22113ce10b4d2c54ff417bf42622 #+busybox-awk.f44da758ab8e737f05fb82ca4342acdf29ec44a9c2a9670cded75b04e8208058 -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c #+pthbs-banginstall.abc777c872ae02114ad6beafef1e6fded22e76fcbcb88e79df1edb9b8e97f03d #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -52,23 +52,23 @@ #+flex.1108ea92b5d0a289d5884ebb2df2398eed87d0f2898feedc18af4d85dcb5255d #+bison.8878bfa3e199ad13de1c2932195a8654f3793729b04c6dc0f70bb57cb3697b40 #+rsync.3d0a477167789eb4a71f9b027e9f02614fc0f4f4e4d1f13690ecb4811deb6907 -#+execline.f596e2fb04ff91c32b978f4e3a922c981ffe45b9e1a1fd587667ee2b23a38757 -#+s6.79622d6af54c647d88dfcc4911740c099871a4432fdfab421fdbbcb9b58bed1b -#+s6-rc.4d74c77acd02ea124bc1c47fe8fefee11c8a915c5cd1cd34f10b4c1e22c0777e -#+s6-portable-utils.fa90b6f86108ac7a4ddce358490855648382b94551a754d68db43ac1e4ecaa04 -#+s6-linux-utils.3c38fc88a3912ff8a949db05295842d2b2cf58b53476ef058c4777a39866b2a8 -#+s6-linux-init.876ecf8fa063a4679c1c5f343731568bf65107894662e5c25afe563ab5c1c6f9 -#+mdevd.f4ddc8a0d78c27677ffb4f3f70027c7b07ec74448daac0c80d1a707fd71c6b47 -#+s6-dns.07d522bd7df13f71fd5c4ba46ecdcbd683776f922dc38eca53f99b843ebe2e82 +#+execline.418f894c8b17d2db205c46fa35dd36d305ab4e0a79e58fa8ec3595fe4e5cdf7c +#+s6.1e6d730d3cc012b4744655feaf81f81549ad98c4ec21b5e64ad0c52fd7263e93 +#+s6-rc.7c79a1651919cdaf236615d6193cbd1cf008dbb5505bf88b4a64aff30ae31be9 +#+s6-portable-utils.bbc98b1351bf9ff3e6e000d25d649566b75afe5ba8c4208a23e43e833e5c24b4 +#+s6-linux-utils.869588f60d61bf87681db3f5735cee9d8fb4ba1e98c4ff453a47e3b56959feba +#+s6-linux-init.fb2d3b352e4f8880c803a4423919d62134a6db570d331f12fc4ebbae83bd52db +#+mdevd.3f41c5c872427ba79be3059512452afa7bcc98746db65234f056e6f2fc49a75c +#+s6-dns.8b3e259b13e8fa32dcdda3dc757dd9ea6d59ddf541584def97f540da098be3fd #+libressl.cab75da0c52b225a622f05439b3f2f274a96710529acc8dd4d4fd7ee185cc54f -#+s6-networking.cccbb677cf7d9d837887635978092f3986a894dbc7084f15f7a0aba3557ccc42 +#+s6-networking.1161e1c6eed34da60eb3d550b1a2bb702eeade52533eb7b4caeb120f04c59c0c #+zsh.08bac2dd5a59108ff97c33e090b80edb1f96413026c95358eb03d4ef039a75a9 #+pthbs-banginstall.abc777c872ae02114ad6beafef1e6fded22e76fcbcb88e79df1edb9b8e97f03d #+aat.2ecceb51a1c8c60748defb9eb74577d7975dc749c08402a14e2fee4bfb4aa2bc #+confz.a7dc73b43813ba8557885b9aa042f0a66cc579e321c6067b6e352be3ded8dc78 -#+containers.02ba6fb410dbf667d0f0585388e47e729e883ca8fdc3c0e0c6e38cf0df855e23 +#+containers.54a0350459f289c7e1b47a92e39d273fa4b2ba56d7e1da853b1691092fbd7455 #+fileset.0e14bac5fb53f8712c33088f26d59687fb3f05f5abdafd093e94f542d5a5e76b -#+logincaps.039ebc02fb33effb49147c0198b3568dfbd8f5f9037b79db9f088508ecdf96e6 +#+logincaps.0a9fda577ede7d98c00a41776db4c0879d60434de5667b175cb3ab4c3f129857 #+snaprep.4c03f4145e7621d9b1a89ccc3ddffcc3ae3d2cd78f8faa2e20ed74364d7dec51 #+curl.419001f07801e91d9f3e16bb9c40bfd60de1bb14b603a249bac58fb4218c7f7e #+git.5a965af7cb4c6ce49ea67e1191bfd24e4fd7749070a5216857411035f1077ef9 @@ -79,8 +79,8 @@ #+iconv.5c3d76060d763884a6707138ce4cac2153f2942b0e71cbbad95e892937c1d2d4 #+libcap.51d65e3ea6882a3f7ac94123a2b77afb17a4f1c04a710b9b448d03465c33e076 #+applyuidgid-caps.f3e438e06650983379807b56871be0f6be24cfed5e1d2bbd02bf0acc434eb320 -#+ccx-utils.23975d561f17df7be007c23338db11dadce232946d760a250c4a74e37479e789 -#+user-env.c8ef41ef2b5eb6de655db69f46c518735c3f2a43d9c5de58badc73445e9d6c6b +#+ccx-utils.963f51bd7843f16752826454202574a965cd6a67fd50be84c404294d3ba936fb +#+user-env.6e227cebe499cebb22c0448e52f0b0a270e923e582724506aec96fee3666d378 #+strace.99dfb71f742f5e2e52bd7438571930eb69476cc693b4d18cb056956aabbb890e #+mlog.04f202d1e6555c3466d2e17c23626efc4e12f6100a17b0970d5d957bce88f44a #+findutils.fd366384c1f4cac901fab56c88fa7cb2fb8d971fe1ee1ebaa4c41466f37a2c67 diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils @@ -30,7 +30,7 @@ #+musl-cross-make.4e31ccacab5cc8de22091926201823288206e2471d5991c3fa8db8b8f5c1b22b #+gnu-make.f9c645bf2cec787c1273cfa3ca4f2ad9a50bf2749bc7b290c97880642c6775af #+skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d -#+s6.2e2793774764c8588ce384e3ce7578a897572b326ba4a8261db4b459cea48cce +#+s6.d0cc99e53c651fcec988d8df40ed82ff7e5fdfb87fa5b64d037128072baea2ab #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -47,9 +47,9 @@ #+busybox-diffutils.9b52fd5ef8d705039558ba31d05f7933c588d7fe6f2a223a2ffece523ae679a3 #+busybox-findutils.337e3980f5b5d2a07c3850d24ce41c9cbf70e54a3b8d3b4ed7b258756df0014e #+busybox-login.e2a13668d17cf3557742d395bbc5914765a48ebc38227fa549a4450f7e65de85 -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 -#+s6.2e2793774764c8588ce384e3ce7578a897572b326ba4a8261db4b459cea48cce -#+ccx-utils.08a222e46833b7c900cccec618f4b76d2960889f0b760a03612004aa22b6b744 +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 +#+s6.d0cc99e53c651fcec988d8df40ed82ff7e5fdfb87fa5b64d037128072baea2ab +#+ccx-utils.f900d15862b90ce8a66c353ee2947c56fed697eb33ac85176b2475adf16b4135 #+applyuidgid-caps.fe4bd4e5813ccbfb0c15591e5b1d839a4fbb5f425f9f5a90dffc7cce501e9235 #+easyseccomp.512d5c7c207a5cc66e804dcf3262aab03450e850d73b76c2fcd5c88adeb151a4 #+mlog.b05e619c821588b46330d6bd9e3a7e670bb9a69dea8a171ba528c33e327a7951 diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -29,11 +29,11 @@ #+busybox-awk.9b2a1cd1da22c09390e41d4448e90c4bde9610143c3d9443ca7665d5d8c42153 #+zsh.b0949d51b3d7ccb490ccfe5dcc09633254eb6744e865719d6a380931e2dce8aa #+pthbs-banginstall.6c9932feb22d0557c7decfe0f8d8be14668206675683ffd2d6432ad9c954623d -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 #+alpine-keys.93e5b7c4b46ee11511227717cf26b7c71acaa1f2315a54b4c002e9d8a4facd52 #+apk-tools.19dc73d9dfce9d2358f6785a94e108728490bd91a355e71ac4689213181ac935 #+xbps.102c4fc18aa5ea05807f7c11fecf047e447e9f8dbab1a1ed570b4501c44e218a -#+container-bin-image.e345aceba3d99eea1fa4614b86cb839656ee369ba8ddc6bb460b3c2c66630342 +#+container-bin-image.2987d1a7da497697c2099aee062e3b256af88a81f31453250e21ba85d356459b #@git:9820dbea1cf5060d7d04632f0fed7e91ea608309:containers @@ -91,9 +91,9 @@ for f in '/versions/xbps.102c4fc18aa5ea05807f7c11fecf047e447e9f8dbab1a1ed570b450 ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.e345aceba3d99eea1fa4614b86cb839656ee369ba8ddc6bb460b3c2c66630342/container-bin-image' -test -f '/versions/container-bin-image.e345aceba3d99eea1fa4614b86cb839656ee369ba8ddc6bb460b3c2c66630342/container-bin-image/if' -ln -sf '/versions/container-bin-image.e345aceba3d99eea1fa4614b86cb839656ee369ba8ddc6bb460b3c2c66630342/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.2987d1a7da497697c2099aee062e3b256af88a81f31453250e21ba85d356459b/container-bin-image' +test -f '/versions/container-bin-image.2987d1a7da497697c2099aee062e3b256af88a81f31453250e21ba85d356459b/container-bin-image/if' +ln -sf '/versions/container-bin-image.2987d1a7da497697c2099aee062e3b256af88a81f31453250e21ba85d356459b/container-bin-image' "${dest}/deps/" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -45,20 +45,20 @@ #+busybox-logging.a34aa1c5f1e4f4aee3b579751eab46cc24ff8a63a95523a4800731d6b7b95656 #+busybox-cron.0e7308870754a61664a69417c8eed88ec8bd15db0ba1947a351518e3b8a18aca #+busybox-diffutils.9b52fd5ef8d705039558ba31d05f7933c588d7fe6f2a223a2ffece523ae679a3 -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 -#+s6.2e2793774764c8588ce384e3ce7578a897572b326ba4a8261db4b459cea48cce -#+s6-portable-utils.5ebbd138d0235eeb3b6501c09ff2299e50a3528600b4f4de5ff177d16060668c -#+s6-linux-utils.4dca31b96fd35736aa19f8c411e6845942a011b3f1be11391e6e5f598fbff417 +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 +#+s6.d0cc99e53c651fcec988d8df40ed82ff7e5fdfb87fa5b64d037128072baea2ab +#+s6-portable-utils.3e17c77b2d8bae1d6c578155994d1535018dfe165e87ef2ea4ab8d8cb7a35914 +#+s6-linux-utils.072e6cdb043af88e295a13d294e0a1d056becaa5fd794c7e17792cd5567cc880 #+zsh.b0949d51b3d7ccb490ccfe5dcc09633254eb6744e865719d6a380931e2dce8aa #+confz.41a97909224ed871d2dd708150043e92d865e6351e2a85eb2cacacf61e1373c7 -#+containers.f9d9a1cf5d48216da8b856fdc56876912757a7078259260ebb13b53f41be7e4f +#+containers.58c04865d60dd4838652f0a8a99a8c5bbbe2dd348700700918ad177dd9fd5670 #+xbps.102c4fc18aa5ea05807f7c11fecf047e447e9f8dbab1a1ed570b4501c44e218a #+zstd.e3dc9c1470dfaac98515ac2cfc7459823a2d2b943158e5228ffcb6149fd29a39 #+apk-tools.19dc73d9dfce9d2358f6785a94e108728490bd91a355e71ac4689213181ac935 #+alpine-keys.93e5b7c4b46ee11511227717cf26b7c71acaa1f2315a54b4c002e9d8a4facd52 #+getent.39fdc1c7f365c34454eaa0cad13fc21745ad0869aea900ea9654e3225685498a #+fileset.3e5161307c504f434368b2c1318de73b3ba88b52a461f82c65f7219bc46cf239 -#+ccx-utils.08a222e46833b7c900cccec618f4b76d2960889f0b760a03612004aa22b6b744 +#+ccx-utils.f900d15862b90ce8a66c353ee2947c56fed697eb33ac85176b2475adf16b4135 #+easyseccomp.512d5c7c207a5cc66e804dcf3262aab03450e850d73b76c2fcd5c88adeb151a4 #+findutils.a2c6dd910e879fb4aa6349a1b64991a805639fc688cf91114ec571a7752c871e #+nawk.89894c53f13b6d37465565571d13dd5f7ee380df8ecabaf81420ccc89b60253f \ No newline at end of file diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -52,23 +52,23 @@ #+flex.99b935d9e8a1d65118e90c5310fed9d92f4497ba8e83f1098a834afd2640bf36 #+bison.1f39336996ab8687f8112c0df61fb226fd31b9e07f68d1d71a156635c6942fc1 #+rsync.28d5a700581498f8532f2c94df41d35452fb2d2aa1af9e43f0fb2ebf973d9a1f -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 -#+s6.2e2793774764c8588ce384e3ce7578a897572b326ba4a8261db4b459cea48cce -#+s6-rc.fabff0205f425cf314f8687b5c768a18715b7d22aa3b52752c20160d3a67303b -#+s6-portable-utils.5ebbd138d0235eeb3b6501c09ff2299e50a3528600b4f4de5ff177d16060668c -#+s6-linux-utils.4dca31b96fd35736aa19f8c411e6845942a011b3f1be11391e6e5f598fbff417 -#+s6-linux-init.4343fa35d119ddda96471d42a9b5c9a1b32d5e770bc3505074d284e65bea9450 -#+mdevd.db9b0245c19db3e4b96960c3ff206ffcd231007068c7808a999c743f09ae31fa -#+s6-dns.116497f92d977f6bbd42200e4c49790b192f696cf96ca85b39a27c1869c2e99c +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 +#+s6.d0cc99e53c651fcec988d8df40ed82ff7e5fdfb87fa5b64d037128072baea2ab +#+s6-rc.a4a970986b83df6f8341dea19bad057dba2d4bf3dded0987a920446944380eb4 +#+s6-portable-utils.3e17c77b2d8bae1d6c578155994d1535018dfe165e87ef2ea4ab8d8cb7a35914 +#+s6-linux-utils.072e6cdb043af88e295a13d294e0a1d056becaa5fd794c7e17792cd5567cc880 +#+s6-linux-init.35e4b0c71a39565c3566445e3205eaa3cab3b14589aafc6898ef8bf24867cd9e +#+mdevd.50c315e16bca48c601a32a3a1399a5159c51fe0b0a8ab2e920a78982c6cd8b9e +#+s6-dns.5be20240ae722ba65c8ef7bab7094247673c6fa29d6ff2de61cb1d133ffd1332 #+libressl.a62bc25f4904f9e809d44b76d8cf7a9be66fff871fde3d01b1c143e154c722dc -#+s6-networking.d091e5128cc55c2ef4863b3a1ee4ae3b21f6ab7bf50e10f3fd5593a614906b9a +#+s6-networking.aac1d04946c32a64d266b2e93ee33e44f82900fb64a476881f099647a7eacb92 #+zsh.b0949d51b3d7ccb490ccfe5dcc09633254eb6744e865719d6a380931e2dce8aa #+pthbs-banginstall.6c9932feb22d0557c7decfe0f8d8be14668206675683ffd2d6432ad9c954623d #+aat.a741bae239a2b4995754a69b398f5561de7130154ca671d96f5dfd86a385334f #+confz.41a97909224ed871d2dd708150043e92d865e6351e2a85eb2cacacf61e1373c7 -#+containers.f9d9a1cf5d48216da8b856fdc56876912757a7078259260ebb13b53f41be7e4f +#+containers.58c04865d60dd4838652f0a8a99a8c5bbbe2dd348700700918ad177dd9fd5670 #+fileset.3e5161307c504f434368b2c1318de73b3ba88b52a461f82c65f7219bc46cf239 -#+logincaps.c4e40ff1a9ad654c6fc81f4c6fbc16d3fb3636ca3cd9fa2c22c94eaa8aa4f390 +#+logincaps.ac9e31322deab5057176df93e8451a358130be13e76b5bd6c832f21b7e11e681 #+snaprep.08bcc14ff6f0d9190b48a154411d347b5fccc4a8606452c9f004857a14e5a1c8 #+curl.289f8d39c9086259ca081914ae60178cfe62ba6698cc4ec6bd874e57c3f41487 #+git.6cefd652a5a64eb2e7e741ef111d792eddeb5b4d0e5a9c075062a457f90125e3 @@ -79,8 +79,8 @@ #+iconv.e68fdf0413ae8901b91f9548c3845ebe1b2d9f9b9a348f709e2c7736479f8fcc #+libcap.8d6af41519a8de0148a27022bc52ca83509a9eed53f162f562cd1913ef23e78d #+applyuidgid-caps.fe4bd4e5813ccbfb0c15591e5b1d839a4fbb5f425f9f5a90dffc7cce501e9235 -#+ccx-utils.08a222e46833b7c900cccec618f4b76d2960889f0b760a03612004aa22b6b744 -#+user-env.6c3312a01bfa56fdc8d356a4b1b05e54c8f87cbe22e5de27096ee56b951b9b4a +#+ccx-utils.f900d15862b90ce8a66c353ee2947c56fed697eb33ac85176b2475adf16b4135 +#+user-env.3ca08ebb2cae9802a771c5de29585c67d854e5cf941c26eeb842909ceadab4b6 #+strace.40a77ae4fa85ddd25d43a9ce3d94dd53913fa57f411c1d46961a193d7d1d42c4 #+mlog.b05e619c821588b46330d6bd9e3a7e670bb9a69dea8a171ba528c33e327a7951 #+findutils.a2c6dd910e879fb4aa6349a1b64991a805639fc688cf91114ec571a7752c871e @@ -88,9 +88,9 @@ #+squashfs-tools.938e7e32dd335cb8ff87bc4f032ef2d043469fb907ea33f2602fd187efefbbed #+mandoc.1b22f8e455f4928966706ab2888397852cccbc8e9eb7ab45e2bed87f42ab1a65 #+tinyssh.445ba94c5bf6644a74cd6f0eaeb6c009747ee28c7646e42f21cba54eb9842546 -#+system-config.02db2e310b8a3e0ad736c3785d10f4a5259c35196eef2f693dbca3e794dde3a0 -#+system-config-rc.b1c27e76d5485f594d1bf47335b8f6e4a21b689747db27841598356fa564dafc +#+system-config.40525aac20137917d4c7c2a073c1a1052a94ad9b4ebccc0de8502cb11f08b49e +#+system-config-rc.6ae0c8b83326446743d9041854f0adc3f1cb7940cf964e8b1e45ee49b1d1b00b #+system-config-scripts.7d77b0deaa9d944986b14e83dd01b0eb7d9f61a87286e7c516e8f5fc4bf931be -#+system-config-init.368ea3ba375989ad36d787e4daea300522f2ad0a92f454941016f05b7d779884 +#+system-config-init.6817bb448cf496f56fa6764296992ae96c4dea751a2556341b7f07e7746eb953 #+system-config-zsh.e37469ac124ea9906e672882182d56b08ba04f68788cd9c7b14807614b2896d4 #+busybox-modutils.f424154ecd9e763d06daf39d5b6bbcd5055b977c1cfaced5b87bb7731f4a243a \ No newline at end of file diff --git a/variants/root-x86_64/execline b/variants/root-x86_64/execline @@ -46,7 +46,7 @@ cd 'execline' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/versions/skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -29,9 +29,9 @@ #+busybox-awk.9b2a1cd1da22c09390e41d4448e90c4bde9610143c3d9443ca7665d5d8c42153 #+zsh.b0949d51b3d7ccb490ccfe5dcc09633254eb6744e865719d6a380931e2dce8aa #+pthbs-banginstall.6c9932feb22d0557c7decfe0f8d8be14668206675683ffd2d6432ad9c954623d -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 #+musl-cross-make.4e31ccacab5cc8de22091926201823288206e2471d5991c3fa8db8b8f5c1b22b -#+ccx-utils.08a222e46833b7c900cccec618f4b76d2960889f0b760a03612004aa22b6b744 +#+ccx-utils.f900d15862b90ce8a66c353ee2947c56fed697eb33ac85176b2475adf16b4135 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd @@ -30,7 +30,7 @@ #+musl-cross-make.4e31ccacab5cc8de22091926201823288206e2471d5991c3fa8db8b8f5c1b22b #+gnu-make.f9c645bf2cec787c1273cfa3ca4f2ad9a50bf2749bc7b290c97880642c6775af #+skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd @@ -47,7 +47,7 @@ cd 'mdevd' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/versions/skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment @@ -44,8 +44,8 @@ #+busybox-util-linux-priv.2257d5f3a2a91721d8eec0e37331d4f4f04ed5120c1f74bd6e32cf2b4c29d34b #+busybox-logging.a34aa1c5f1e4f4aee3b579751eab46cc24ff8a63a95523a4800731d6b7b95656 #+busybox-cron.0e7308870754a61664a69417c8eed88ec8bd15db0ba1947a351518e3b8a18aca -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 -#+s6.2e2793774764c8588ce384e3ce7578a897572b326ba4a8261db4b459cea48cce +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 +#+s6.d0cc99e53c651fcec988d8df40ed82ff7e5fdfb87fa5b64d037128072baea2ab #+mdev-scripts.90e6ce5da63ee7ee7c545d4c26802fba78ed5600662cc720c8c7815a97e08cf1 -#+mdevd.db9b0245c19db3e4b96960c3ff206ffcd231007068c7808a999c743f09ae31fa +#+mdevd.50c315e16bca48c601a32a3a1399a5159c51fe0b0a8ab2e920a78982c6cd8b9e #+busybox-modutils.f424154ecd9e763d06daf39d5b6bbcd5055b977c1cfaced5b87bb7731f4a243a \ No newline at end of file diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6 @@ -30,7 +30,7 @@ #+musl-cross-make.4e31ccacab5cc8de22091926201823288206e2471d5991c3fa8db8b8f5c1b22b #+gnu-make.f9c645bf2cec787c1273cfa3ca4f2ad9a50bf2749bc7b290c97880642c6775af #+skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6 @@ -47,7 +47,7 @@ cd 's6' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/versions/skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/s6-dns b/variants/root-x86_64/s6-dns @@ -46,7 +46,7 @@ cd 's6-dns' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/versions/skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/s6-linux-init b/variants/root-x86_64/s6-linux-init @@ -30,8 +30,8 @@ #+musl-cross-make.4e31ccacab5cc8de22091926201823288206e2471d5991c3fa8db8b8f5c1b22b #+gnu-make.f9c645bf2cec787c1273cfa3ca4f2ad9a50bf2749bc7b290c97880642c6775af #+skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 -#+s6.2e2793774764c8588ce384e3ce7578a897572b326ba4a8261db4b459cea48cce +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 +#+s6.d0cc99e53c651fcec988d8df40ed82ff7e5fdfb87fa5b64d037128072baea2ab #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init @@ -48,7 +48,7 @@ cd 's6-linux-init' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/versions/skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/s6-linux-utils b/variants/root-x86_64/s6-linux-utils @@ -46,7 +46,7 @@ cd 's6-linux-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/versions/skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking @@ -30,9 +30,9 @@ #+musl-cross-make.4e31ccacab5cc8de22091926201823288206e2471d5991c3fa8db8b8f5c1b22b #+gnu-make.f9c645bf2cec787c1273cfa3ca4f2ad9a50bf2749bc7b290c97880642c6775af #+skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 -#+s6.2e2793774764c8588ce384e3ce7578a897572b326ba4a8261db4b459cea48cce -#+s6-dns.116497f92d977f6bbd42200e4c49790b192f696cf96ca85b39a27c1869c2e99c +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 +#+s6.d0cc99e53c651fcec988d8df40ed82ff7e5fdfb87fa5b64d037128072baea2ab +#+s6-dns.5be20240ae722ba65c8ef7bab7094247673c6fa29d6ff2de61cb1d133ffd1332 #+libressl.a62bc25f4904f9e809d44b76d8cf7a9be66fff871fde3d01b1c143e154c722dc #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking @@ -50,7 +50,7 @@ cd 's6-networking' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/versions/skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/s6-portable-utils b/variants/root-x86_64/s6-portable-utils @@ -46,7 +46,7 @@ cd 's6-portable-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/versions/skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/s6-rc b/variants/root-x86_64/s6-rc @@ -30,8 +30,8 @@ #+musl-cross-make.4e31ccacab5cc8de22091926201823288206e2471d5991c3fa8db8b8f5c1b22b #+gnu-make.f9c645bf2cec787c1273cfa3ca4f2ad9a50bf2749bc7b290c97880642c6775af #+skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 -#+s6.2e2793774764c8588ce384e3ce7578a897572b326ba4a8261db4b459cea48cce +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 +#+s6.d0cc99e53c651fcec988d8df40ed82ff7e5fdfb87fa5b64d037128072baea2ab #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc @@ -48,7 +48,7 @@ cd 's6-rc' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps="$pthbs_build_environment/sysdeps" \ + --with-sysdeps='/versions/skalibs.bfeb536c9a8e9e8b5fdc778c10caef39e7a091f3690cdeed32e31b57f0e3531d/sysdeps' --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -51,16 +51,16 @@ #+aat.a741bae239a2b4995754a69b398f5561de7130154ca671d96f5dfd86a385334f #+fileset.3e5161307c504f434368b2c1318de73b3ba88b52a461f82c65f7219bc46cf239 #+rsync.28d5a700581498f8532f2c94df41d35452fb2d2aa1af9e43f0fb2ebf973d9a1f -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 #+kbd.123624cdae074d71e6f3177be35cda9189d4943f7652804534d7bfab78b18996 -#+mdevd.db9b0245c19db3e4b96960c3ff206ffcd231007068c7808a999c743f09ae31fa -#+s6-linux-utils.4dca31b96fd35736aa19f8c411e6845942a011b3f1be11391e6e5f598fbff417 -#+s6-rc.fabff0205f425cf314f8687b5c768a18715b7d22aa3b52752c20160d3a67303b -#+s6.2e2793774764c8588ce384e3ce7578a897572b326ba4a8261db4b459cea48cce +#+mdevd.50c315e16bca48c601a32a3a1399a5159c51fe0b0a8ab2e920a78982c6cd8b9e +#+s6-linux-utils.072e6cdb043af88e295a13d294e0a1d056becaa5fd794c7e17792cd5567cc880 +#+s6-rc.a4a970986b83df6f8341dea19bad057dba2d4bf3dded0987a920446944380eb4 +#+s6.d0cc99e53c651fcec988d8df40ed82ff7e5fdfb87fa5b64d037128072baea2ab #+zsh.b0949d51b3d7ccb490ccfe5dcc09633254eb6744e865719d6a380931e2dce8aa #+libcgroup.ece45f8c1ee456789e29ea12ebc1a734546e1d0f415790b975ba4d63563c799f #+system-config-scripts.7d77b0deaa9d944986b14e83dd01b0eb7d9f61a87286e7c516e8f5fc4bf931be -#+logincaps.c4e40ff1a9ad654c6fc81f4c6fbc16d3fb3636ca3cd9fa2c22c94eaa8aa4f390 +#+logincaps.ac9e31322deab5057176df93e8451a358130be13e76b5bd6c832f21b7e11e681 #+busybox-modutils.f424154ecd9e763d06daf39d5b6bbcd5055b977c1cfaced5b87bb7731f4a243a #@git:20f1fc8e70e98fa5e8e6e378ff53ce79628a45ca:system-config @@ -98,8 +98,8 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.064de0e31c1925cf1e6a3dca24ab5c365cf5a22115d402a8bdd0b724d12aef8c' \ - 'pthbs_path_mdevd=/versions/env.73fe829f1c9a825b28b189cc7707c9d50490cbb2ed18186a47721b61be3917df' \ + 'pthbs_path_containers=/versions/env.858af32559cd91150fe174a401ce444dd36687ad46e97d8ed70f564e368b0eb9' \ + 'pthbs_path_mdevd=/versions/env.11c11eda8041b538842af1aa575d713a00661932cccb67bad5d90fbe8085de30' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -46,12 +46,12 @@ #+busybox-util-linux-priv.2257d5f3a2a91721d8eec0e37331d4f4f04ed5120c1f74bd6e32cf2b4c29d34b #+busybox-logging.a34aa1c5f1e4f4aee3b579751eab46cc24ff8a63a95523a4800731d6b7b95656 #+busybox-cron.0e7308870754a61664a69417c8eed88ec8bd15db0ba1947a351518e3b8a18aca -#+s6.2e2793774764c8588ce384e3ce7578a897572b326ba4a8261db4b459cea48cce -#+s6-rc.fabff0205f425cf314f8687b5c768a18715b7d22aa3b52752c20160d3a67303b -#+s6-portable-utils.5ebbd138d0235eeb3b6501c09ff2299e50a3528600b4f4de5ff177d16060668c -#+s6-linux-init.4343fa35d119ddda96471d42a9b5c9a1b32d5e770bc3505074d284e65bea9450 -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 -#+system-config-rc.b1c27e76d5485f594d1bf47335b8f6e4a21b689747db27841598356fa564dafc +#+s6.d0cc99e53c651fcec988d8df40ed82ff7e5fdfb87fa5b64d037128072baea2ab +#+s6-rc.a4a970986b83df6f8341dea19bad057dba2d4bf3dded0987a920446944380eb4 +#+s6-portable-utils.3e17c77b2d8bae1d6c578155994d1535018dfe165e87ef2ea4ab8d8cb7a35914 +#+s6-linux-init.35e4b0c71a39565c3566445e3205eaa3cab3b14589aafc6898ef8bf24867cd9e +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 +#+system-config-rc.6ae0c8b83326446743d9041854f0adc3f1cb7940cf964e8b1e45ee49b1d1b00b # - build script start - @@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.b1c27e76d5485f594d1bf47335b8f6e4a21b689747db27841598356fa564dafc/config/s6-rc-db +s6rcdb=/versions/system-config-rc.6ae0c8b83326446743d9041854f0adc3f1cb7940cf964e8b1e45ee49b1d1b00b/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 @@ -28,9 +28,9 @@ #+busybox-findutils.337e3980f5b5d2a07c3850d24ce41c9cbf70e54a3b8d3b4ed7b258756df0014e #+busybox-awk.9b2a1cd1da22c09390e41d4448e90c4bde9610143c3d9443ca7665d5d8c42153 #+busybox-diffutils.9b52fd5ef8d705039558ba31d05f7933c588d7fe6f2a223a2ffece523ae679a3 -#+s6-rc.fabff0205f425cf314f8687b5c768a18715b7d22aa3b52752c20160d3a67303b +#+s6-rc.a4a970986b83df6f8341dea19bad057dba2d4bf3dded0987a920446944380eb4 #+fileset.3e5161307c504f434368b2c1318de73b3ba88b52a461f82c65f7219bc46cf239 -#+system-config.02db2e310b8a3e0ad736c3785d10f4a5259c35196eef2f693dbca3e794dde3a0 +#+system-config.40525aac20137917d4c7c2a073c1a1052a94ad9b4ebccc0de8502cb11f08b49e # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.02db2e310b8a3e0ad736c3785d10f4a5259c35196eef2f693dbca3e794dde3a0/config/s6-rc-source +src=/versions/system-config.40525aac20137917d4c7c2a073c1a1052a94ad9b4ebccc0de8502cb11f08b49e/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/user-env b/variants/root-x86_64/user-env @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.1f8b2c8640b56685a72666365d8aece78e21f1ebc8a83b4355bb4111536b7caa #+busybox-findutils.337e3980f5b5d2a07c3850d24ce41c9cbf70e54a3b8d3b4ed7b258756df0014e #+busybox-awk.9b2a1cd1da22c09390e41d4448e90c4bde9610143c3d9443ca7665d5d8c42153 -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 #+pthbs-banginstall.6c9932feb22d0557c7decfe0f8d8be14668206675683ffd2d6432ad9c954623d #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -52,23 +52,23 @@ #+flex.99b935d9e8a1d65118e90c5310fed9d92f4497ba8e83f1098a834afd2640bf36 #+bison.1f39336996ab8687f8112c0df61fb226fd31b9e07f68d1d71a156635c6942fc1 #+rsync.28d5a700581498f8532f2c94df41d35452fb2d2aa1af9e43f0fb2ebf973d9a1f -#+execline.2e5e02be4fed5da1a311f5e12087e0472b317c2497cc271a27020e14ed29a7c6 -#+s6.2e2793774764c8588ce384e3ce7578a897572b326ba4a8261db4b459cea48cce -#+s6-rc.fabff0205f425cf314f8687b5c768a18715b7d22aa3b52752c20160d3a67303b -#+s6-portable-utils.5ebbd138d0235eeb3b6501c09ff2299e50a3528600b4f4de5ff177d16060668c -#+s6-linux-utils.4dca31b96fd35736aa19f8c411e6845942a011b3f1be11391e6e5f598fbff417 -#+s6-linux-init.4343fa35d119ddda96471d42a9b5c9a1b32d5e770bc3505074d284e65bea9450 -#+mdevd.db9b0245c19db3e4b96960c3ff206ffcd231007068c7808a999c743f09ae31fa -#+s6-dns.116497f92d977f6bbd42200e4c49790b192f696cf96ca85b39a27c1869c2e99c +#+execline.0c968f490530d21d7c782272982403baa65f36082a9802b873c4cadf7fa7ac89 +#+s6.d0cc99e53c651fcec988d8df40ed82ff7e5fdfb87fa5b64d037128072baea2ab +#+s6-rc.a4a970986b83df6f8341dea19bad057dba2d4bf3dded0987a920446944380eb4 +#+s6-portable-utils.3e17c77b2d8bae1d6c578155994d1535018dfe165e87ef2ea4ab8d8cb7a35914 +#+s6-linux-utils.072e6cdb043af88e295a13d294e0a1d056becaa5fd794c7e17792cd5567cc880 +#+s6-linux-init.35e4b0c71a39565c3566445e3205eaa3cab3b14589aafc6898ef8bf24867cd9e +#+mdevd.50c315e16bca48c601a32a3a1399a5159c51fe0b0a8ab2e920a78982c6cd8b9e +#+s6-dns.5be20240ae722ba65c8ef7bab7094247673c6fa29d6ff2de61cb1d133ffd1332 #+libressl.a62bc25f4904f9e809d44b76d8cf7a9be66fff871fde3d01b1c143e154c722dc -#+s6-networking.d091e5128cc55c2ef4863b3a1ee4ae3b21f6ab7bf50e10f3fd5593a614906b9a +#+s6-networking.aac1d04946c32a64d266b2e93ee33e44f82900fb64a476881f099647a7eacb92 #+zsh.b0949d51b3d7ccb490ccfe5dcc09633254eb6744e865719d6a380931e2dce8aa #+pthbs-banginstall.6c9932feb22d0557c7decfe0f8d8be14668206675683ffd2d6432ad9c954623d #+aat.a741bae239a2b4995754a69b398f5561de7130154ca671d96f5dfd86a385334f #+confz.41a97909224ed871d2dd708150043e92d865e6351e2a85eb2cacacf61e1373c7 -#+containers.f9d9a1cf5d48216da8b856fdc56876912757a7078259260ebb13b53f41be7e4f +#+containers.58c04865d60dd4838652f0a8a99a8c5bbbe2dd348700700918ad177dd9fd5670 #+fileset.3e5161307c504f434368b2c1318de73b3ba88b52a461f82c65f7219bc46cf239 -#+logincaps.c4e40ff1a9ad654c6fc81f4c6fbc16d3fb3636ca3cd9fa2c22c94eaa8aa4f390 +#+logincaps.ac9e31322deab5057176df93e8451a358130be13e76b5bd6c832f21b7e11e681 #+snaprep.08bcc14ff6f0d9190b48a154411d347b5fccc4a8606452c9f004857a14e5a1c8 #+curl.289f8d39c9086259ca081914ae60178cfe62ba6698cc4ec6bd874e57c3f41487 #+git.6cefd652a5a64eb2e7e741ef111d792eddeb5b4d0e5a9c075062a457f90125e3 @@ -79,8 +79,8 @@ #+iconv.e68fdf0413ae8901b91f9548c3845ebe1b2d9f9b9a348f709e2c7736479f8fcc #+libcap.8d6af41519a8de0148a27022bc52ca83509a9eed53f162f562cd1913ef23e78d #+applyuidgid-caps.fe4bd4e5813ccbfb0c15591e5b1d839a4fbb5f425f9f5a90dffc7cce501e9235 -#+ccx-utils.08a222e46833b7c900cccec618f4b76d2960889f0b760a03612004aa22b6b744 -#+user-env.6c3312a01bfa56fdc8d356a4b1b05e54c8f87cbe22e5de27096ee56b951b9b4a +#+ccx-utils.f900d15862b90ce8a66c353ee2947c56fed697eb33ac85176b2475adf16b4135 +#+user-env.3ca08ebb2cae9802a771c5de29585c67d854e5cf941c26eeb842909ceadab4b6 #+strace.40a77ae4fa85ddd25d43a9ce3d94dd53913fa57f411c1d46961a193d7d1d42c4 #+mlog.b05e619c821588b46330d6bd9e3a7e670bb9a69dea8a171ba528c33e327a7951 #+findutils.a2c6dd910e879fb4aa6349a1b64991a805639fc688cf91114ec571a7752c871e