commit 6f4c2a037efa08b42c6c73a887bb57145533195c parent cf9d5abb8051a1aad0457b3427fe63168c277426 Author: Jan Pobrislo <ccx@te2000.cz> Date: Fri, 9 May 2025 12:17:04 +0000 fix install dir Diffstat:
35 files changed, 109 insertions(+), 90 deletions(-)
diff --git a/templates/pkg/ca-certificates-wip-donotuse b/templates/pkg/ca-certificates-wip-donotuse @@ -5,6 +5,9 @@ #+{{pkg_install_name("certdata2pem")}} #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. +{% include "functions/vars" %} +def_prefix + cd ca-certificates-20241121 touch blacklist.txt # TODO! certdata2pem diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools @@ -4,7 +4,7 @@ #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+patch.05834624d74752d1cbe386cd61dbd0dd98d69aad7777828dcf07390ab8772d4b -#+libressl.51ff6b49cc8becb3a09d78dd432cecb27a10b9846b1a622a95bb141a64af5a28 +#+libressl.e5f277c728ef39b65d713ca7169c1a6d46038f8f224d01e99d983c5ac53c09aa #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c #+pkgconf-pkg-config.86f9c193f6ccc64cc2ac696a7e3a258f01b8d0c539312ae37c08ea2354332e90 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools diff --git a/variants/ccx-x86_64/ca-certificates-wip-donotuse b/variants/ccx-x86_64/ca-certificates-wip-donotuse @@ -4,6 +4,14 @@ #+certdata2pem.073fbb1ea42851f1da6209c5599f174a05b2a3c48e131cff131e168f201e4042 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. +def_prefix() { + prefix=/home/ccx/versions/$pthbs_package +} +def_dest() { + dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package +} +def_prefix + cd ca-certificates-20241121 touch blacklist.txt # TODO! certdata2pem diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -4,8 +4,8 @@ #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4 -#+apk-tools.3a5fc83a6496e5def23b834449fe7225de6efdded9e70a349c57d38de925ba47 -#+xbps.a8b30c37e5436164d434346fc20c59314233a91dd0393c2ca37d6dfd3ec31cd0 +#+apk-tools.75adcbda93e6b17e0c48920234065b794e955a4a1345c78103e2db0d38b07b68 +#+xbps.f983c5256b752fa57bea63f621bb62d9edbde23d0c7837ceafbb953d1134ec6b #+container-bin-image.1b501ea4ae8d425b8ceab4df81ce7290a36bbc85d86caf02f614a451ec17ed32 #@git:e8dfe8dcb4396ac0f12f0d0017f9836fa113e3a6:containers @@ -43,8 +43,8 @@ printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "$pkgdir/deps/command" -ln -sf '/home/ccx/versions/apk-tools.3a5fc83a6496e5def23b834449fe7225de6efdded9e70a349c57d38de925ba47/command/apk.static' "$pkgdir/deps/command/" -ln -sf '/home/ccx/versions/xbps.a8b30c37e5436164d434346fc20c59314233a91dd0393c2ca37d6dfd3ec31cd0/command/xbps-install.static' "$pkgdir/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.75adcbda93e6b17e0c48920234065b794e955a4a1345c78103e2db0d38b07b68/command/apk.static' "$pkgdir/deps/command/" +ln -sf '/home/ccx/versions/xbps.f983c5256b752fa57bea63f621bb62d9edbde23d0c7837ceafbb953d1134ec6b/command/xbps-install.static' "$pkgdir/deps/command/" for f in '/home/ccx/versions/alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4'/keys/alpine/*/*; do test -f "$f" @@ -54,7 +54,7 @@ for f in '/home/ccx/versions/alpine-keys.dedc78b0b50e461d33a449adf40691698925b5e done mkdir -p "$pkgdir/deps/keys/void" -for f in '/home/ccx/versions/xbps.a8b30c37e5436164d434346fc20c59314233a91dd0393c2ca37d6dfd3ec31cd0'/keys/void/*; do +for f in '/home/ccx/versions/xbps.f983c5256b752fa57bea63f621bb62d9edbde23d0c7837ceafbb953d1134ec6b'/keys/void/*; do ln -sf "$f" "$pkgdir/deps/keys/void/" done diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -7,10 +7,10 @@ #+s6-linux-utils.1990b55837ff2c28a81500d80292c6d530c8516347eb896007eb5aed2af6c425 #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.a235c9f14c6fde9a2c18b8461364af1a701b65ec4db77974555a5452039371ca -#+xbps.a8b30c37e5436164d434346fc20c59314233a91dd0393c2ca37d6dfd3ec31cd0 +#+containers.b53cded13f49e28ca72135c1912b376cb297444ff4215adadd510253716de87d +#+xbps.f983c5256b752fa57bea63f621bb62d9edbde23d0c7837ceafbb953d1134ec6b #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c -#+apk-tools.3a5fc83a6496e5def23b834449fe7225de6efdded9e70a349c57d38de925ba47 +#+apk-tools.75adcbda93e6b17e0c48920234065b794e955a4a1345c78103e2db0d38b07b68 #+alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4 #+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl @@ -4,7 +4,7 @@ #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75 -#+libressl.51ff6b49cc8becb3a09d78dd432cecb27a10b9846b1a622a95bb141a64af5a28 +#+libressl.e5f277c728ef39b65d713ca7169c1a6d46038f8f224d01e99d983c5ac53c09aa #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. build_env_static() { diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -6,7 +6,7 @@ #+patch.05834624d74752d1cbe386cd61dbd0dd98d69aad7777828dcf07390ab8772d4b #+flex.322ebabc6eba6cdfd84b1b90f25790b8d917035872c2e6bb2f4c8e2f05eabcfd #+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f -#+rsync.0caacc7a6660d37b4d521949dd22b86818d9d16c6a9fd24771e77051b7791f0f +#+rsync.b54daea466629ca92b491b6d211cf130581d669b90edc27fd43fcd43edfd3e66 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e #+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9 @@ -15,20 +15,20 @@ #+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2 #+mdevd.2c8e38fba9104da05177a2c4cc498139c506b1b3dae60c51cf54b831c1762daa #+s6-dns.91f4cab6424ef44de73cac82f7bda7d1e91a2ece09fcbe48912f431785c6db7e -#+libressl.51ff6b49cc8becb3a09d78dd432cecb27a10b9846b1a622a95bb141a64af5a28 -#+s6-networking.60f7083505b817b42e509b9d2309c33c112895f81d229bf8da7064599750ea8a +#+libressl.e5f277c728ef39b65d713ca7169c1a6d46038f8f224d01e99d983c5ac53c09aa +#+s6-networking.30555969837ee37e7ffcf665dcb7b814189635b755a6e3aca6590c24dc544975 #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.a235c9f14c6fde9a2c18b8461364af1a701b65ec4db77974555a5452039371ca +#+containers.b53cded13f49e28ca72135c1912b376cb297444ff4215adadd510253716de87d #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 -#+curl.d4fb54b3881260e33ea5674ee0d9af391b19c7ef238f96a1b995d4d268cb69c4 -#+git.32853bb422ccb8a344660736f3905dd9d717cacbe53c835b5c476370814cc9d7 -#+xbps.a8b30c37e5436164d434346fc20c59314233a91dd0393c2ca37d6dfd3ec31cd0 -#+apk-tools.3a5fc83a6496e5def23b834449fe7225de6efdded9e70a349c57d38de925ba47 +#+curl.fb8a08facdf2afdaa11fd471f6b883d1c2cbb28ea4211d56fe5f83c18783cc82 +#+git.13ba81cb19d33a8c86c2444f62eaadd99a47600282ad86c077bd81ab8e3f1059 +#+xbps.f983c5256b752fa57bea63f621bb62d9edbde23d0c7837ceafbb953d1134ec6b +#+apk-tools.75adcbda93e6b17e0c48920234065b794e955a4a1345c78103e2db0d38b07b68 #+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447 #+getconf.62760a9db3bdba375752c0a4f8722b5e0ee3c4eded1ab1073a73533c116f6de5 #+iconv.e574881283799fa144f1d9df753a05d9f7effa47ae0a06a92b532decde48f145 @@ -37,8 +37,8 @@ #+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114 #+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8 #+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103 -#+system-config.1696342e2aced21d7486fb77f6048a8be6df64218de79dfaed567390c1298d25 -#+system-config-rc.f49ceeb7938409c8308e931537fc66b4ecc5cf5bb99ebfd1ab56a464c408409b +#+system-config.2d09a0f6f9d6622747b9fea3f714f6ad39bf90fb818cd0b3bd17eb345f3cdc19 +#+system-config-rc.8a79451eba8333bc656794ce0cd5080436576718fe5ffe15dc9f609f2ff64deb #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d -#+system-config-init.0a5645de4f5a2a61cc1d2993af64814bd6c695a0ab11982dc30cf9bd3d7adac8 +#+system-config-init.191364c1f832a3eaf99bfb47d4014781841fdcb35db173ae6953ede21fbf87b7 #+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309 \ No newline at end of file diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git @@ -4,8 +4,8 @@ #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75 -#+libressl.51ff6b49cc8becb3a09d78dd432cecb27a10b9846b1a622a95bb141a64af5a28 -#+curl.d4fb54b3881260e33ea5674ee0d9af391b19c7ef238f96a1b995d4d268cb69c4 +#+libressl.e5f277c728ef39b65d713ca7169c1a6d46038f8f224d01e99d983c5ac53c09aa +#+curl.fb8a08facdf2afdaa11fd471f6b883d1c2cbb28ea4211d56fe5f83c18783cc82 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. check_static() { diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment @@ -1,2 +1,2 @@ #!/usr/bin/env pthbs-build -#+linux.009d59cf25840627e0a180e5cffb157984349cb7d8cf9f16be42cf8122c37af4- \ No newline at end of file +#+linux.e1790801b7f5dfe14c9695e1811895718e37ceab6b81890d0439bb3fde73d191+ \ No newline at end of file diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl @@ -4,7 +4,7 @@ #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75 -#+ca-certificates-wip-donotuse.f74d02057d5dafeff6f49d8d65261c027c886fbe32106db20767cdf63cc2568b +#+ca-certificates-wip-donotuse.d8ce778ec298629a5978dc92c70a1024939f2bb5e860c01e2ed7e8d61c1f532c #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c @@ -67,7 +67,7 @@ check_static command/ocspcheck cd .. $CC ./c_rehash.c -o c_rehash --static -static -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto -cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.f74d02057d5dafeff6f49d8d65261c027c886fbe32106db20767cdf63cc2568b/config/ssl/certs' "$prefix/config/ssl/" +cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.d8ce778ec298629a5978dc92c70a1024939f2bb5e860c01e2ed7e8d61c1f532c/config/ssl/certs' "$prefix/config/ssl/" ./c_rehash "$prefix/config/ssl/" diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux @@ -6,7 +6,7 @@ #+patch.05834624d74752d1cbe386cd61dbd0dd98d69aad7777828dcf07390ab8772d4b #+flex.322ebabc6eba6cdfd84b1b90f25790b8d917035872c2e6bb2f4c8e2f05eabcfd #+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f -#+rsync.0caacc7a6660d37b4d521949dd22b86818d9d16c6a9fd24771e77051b7791f0f +#+rsync.b54daea466629ca92b491b6d211cf130581d669b90edc27fd43fcd43edfd3e66 #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c #+libelf.fd68f03f03caea1e71ca235bd8e1c0d4dc9fe6b5556ff45c3892c4940218c018 #+pkgconf-pkg-config.86f9c193f6ccc64cc2ac696a7e3a258f01b8d0c539312ae37c08ea2354332e90 diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync @@ -5,7 +5,7 @@ #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75 #+popt.a38a6063ecb9f52c0c2017119d9d6c9eefe1ae820f9f11f693b2a4c07ae4ff31 -#+libressl.51ff6b49cc8becb3a09d78dd432cecb27a10b9846b1a622a95bb141a64af5a28 +#+libressl.e5f277c728ef39b65d713ca7169c1a6d46038f8f224d01e99d983c5ac53c09aa #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking @@ -6,7 +6,7 @@ #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e #+s6-dns.91f4cab6424ef44de73cac82f7bda7d1e91a2ece09fcbe48912f431785c6db7e -#+libressl.51ff6b49cc8becb3a09d78dd432cecb27a10b9846b1a622a95bb141a64af5a28 +#+libressl.e5f277c728ef39b65d713ca7169c1a6d46038f8f224d01e99d983c5ac53c09aa #@git:2c7b780bdb204caac3faf5613051d71a58de4017:s6-networking : ${JOBS:=1} diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -4,7 +4,7 @@ #+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 -#+rsync.0caacc7a6660d37b4d521949dd22b86818d9d16c6a9fd24771e77051b7791f0f +#+rsync.b54daea466629ca92b491b6d211cf130581d669b90edc27fd43fcd43edfd3e66 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+kbd.4b136e1e449b21180ac16ee7980c30135e6c24a4deb5a4ba600a3e8c431e0b9e #+mdevd.2c8e38fba9104da05177a2c4cc498139c506b1b3dae60c51cf54b831c1762daa @@ -52,7 +52,7 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/home/ccx/versions/env.90d89ed22443539e82e532ac0509aaecb0fc6765d1d736cacab8602848b8cb90' \ + 'pthbs_path_containers=/home/ccx/versions/env.8e2af225df31e9d2b313b1ab948f6be1507cbe22083b4b092ed8aa855fff06d2' \ 'pthbs_path_mdevd=/home/ccx/versions/env.5049027ea8b6b4d373e16aadd3cdc63a940582ff297656e395f2131eef181671' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -5,9 +5,9 @@ #+s6-portable-utils.1b8fd31be72bfe84afb28c3dfff03b1fc45121d11fc85f79c90f085fe61bc132 #+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f -#+system-config-rc.f49ceeb7938409c8308e931537fc66b4ecc5cf5bb99ebfd1ab56a464c408409b +#+system-config-rc.8a79451eba8333bc656794ce0cd5080436576718fe5ffe15dc9f609f2ff64deb -s6rcdb=/home/ccx/versions/system-config-rc.f49ceeb7938409c8308e931537fc66b4ecc5cf5bb99ebfd1ab56a464c408409b/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.8a79451eba8333bc656794ce0cd5080436576718fe5ffe15dc9f609f2ff64deb/config/s6-rc-db prefix=/home/ccx/versions/$pthbs_package pkgdir="$pthbs_destdir/$prefix" diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc @@ -3,7 +3,7 @@ #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 -#+system-config.1696342e2aced21d7486fb77f6048a8be6df64218de79dfaed567390c1298d25 +#+system-config.2d09a0f6f9d6622747b9fea3f714f6ad39bf90fb818cd0b3bd17eb345f3cdc19 def_prefix() { prefix=/home/ccx/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/home/ccx/versions/system-config.1696342e2aced21d7486fb77f6048a8be6df64218de79dfaed567390c1298d25/config/s6-rc-source +src=/home/ccx/versions/system-config.2d09a0f6f9d6622747b9fea3f714f6ad39bf90fb818cd0b3bd17eb345f3cdc19/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 @@ -6,7 +6,7 @@ #+patch.05834624d74752d1cbe386cd61dbd0dd98d69aad7777828dcf07390ab8772d4b #+flex.322ebabc6eba6cdfd84b1b90f25790b8d917035872c2e6bb2f4c8e2f05eabcfd #+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f -#+rsync.0caacc7a6660d37b4d521949dd22b86818d9d16c6a9fd24771e77051b7791f0f +#+rsync.b54daea466629ca92b491b6d211cf130581d669b90edc27fd43fcd43edfd3e66 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e #+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9 @@ -15,20 +15,20 @@ #+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2 #+mdevd.2c8e38fba9104da05177a2c4cc498139c506b1b3dae60c51cf54b831c1762daa #+s6-dns.91f4cab6424ef44de73cac82f7bda7d1e91a2ece09fcbe48912f431785c6db7e -#+libressl.51ff6b49cc8becb3a09d78dd432cecb27a10b9846b1a622a95bb141a64af5a28 -#+s6-networking.60f7083505b817b42e509b9d2309c33c112895f81d229bf8da7064599750ea8a +#+libressl.e5f277c728ef39b65d713ca7169c1a6d46038f8f224d01e99d983c5ac53c09aa +#+s6-networking.30555969837ee37e7ffcf665dcb7b814189635b755a6e3aca6590c24dc544975 #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.a235c9f14c6fde9a2c18b8461364af1a701b65ec4db77974555a5452039371ca +#+containers.b53cded13f49e28ca72135c1912b376cb297444ff4215adadd510253716de87d #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 -#+curl.d4fb54b3881260e33ea5674ee0d9af391b19c7ef238f96a1b995d4d268cb69c4 -#+git.32853bb422ccb8a344660736f3905dd9d717cacbe53c835b5c476370814cc9d7 -#+xbps.a8b30c37e5436164d434346fc20c59314233a91dd0393c2ca37d6dfd3ec31cd0 -#+apk-tools.3a5fc83a6496e5def23b834449fe7225de6efdded9e70a349c57d38de925ba47 +#+curl.fb8a08facdf2afdaa11fd471f6b883d1c2cbb28ea4211d56fe5f83c18783cc82 +#+git.13ba81cb19d33a8c86c2444f62eaadd99a47600282ad86c077bd81ab8e3f1059 +#+xbps.f983c5256b752fa57bea63f621bb62d9edbde23d0c7837ceafbb953d1134ec6b +#+apk-tools.75adcbda93e6b17e0c48920234065b794e955a4a1345c78103e2db0d38b07b68 #+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447 #+getconf.62760a9db3bdba375752c0a4f8722b5e0ee3c4eded1ab1073a73533c116f6de5 #+iconv.e574881283799fa144f1d9df753a05d9f7effa47ae0a06a92b532decde48f145 diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps @@ -5,7 +5,7 @@ #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75 #+libarchive.3dfc995086b5c4926acf7fa472ceb8bba6ab906d05f85a8069a8092957317d0c -#+libressl.51ff6b49cc8becb3a09d78dd432cecb27a10b9846b1a622a95bb141a64af5a28 +#+libressl.e5f277c728ef39b65d713ca7169c1a6d46038f8f224d01e99d983c5ac53c09aa #+pkgconf-pkg-config.86f9c193f6ccc64cc2ac696a7e3a258f01b8d0c539312ae37c08ea2354332e90 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools @@ -4,7 +4,7 @@ #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+patch.9d8b2c370a0ccf6e5ad48c27070ff1da2d30d41327fd5711a76cf570b34ae523 -#+libressl.f9a161b85669c93b2912dcec9cb12da53fa9bbf76f12c4d9e934d22b5d588ee5 +#+libressl.cb2f008a8f9f28bfaaa43d5a3d1121602c1388efad726823a0dc7af7b39fea51 #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 #+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools diff --git a/variants/root-x86_64/ca-certificates-wip-donotuse b/variants/root-x86_64/ca-certificates-wip-donotuse @@ -4,6 +4,14 @@ #+certdata2pem.6fb0945911370fa1db1e3a0fac6f5c610fc6e61a46c433302aa7dd79ea979184 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. +def_prefix() { + prefix=/versions/$pthbs_package +} +def_dest() { + dest=${pthbs_destdir%/}//versions/$pthbs_package +} +def_prefix + cd ca-certificates-20241121 touch blacklist.txt # TODO! certdata2pem diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -4,8 +4,8 @@ #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1 -#+apk-tools.123d241d019620155157ad9cb85f52edc9807ae42290054ac0d3261bbfd41dda -#+xbps.2528d7cb9bea236fe9688ee2dca0b446592189e7f8fbf6c04cfdfa7197f432fc +#+apk-tools.e04845de281b2ac620d607f3258d7d5276b127ec3b1eb92ff0ded0a1b653a9d8 +#+xbps.9c656653710dab34d097cd78fcef4004cf480034d96a5288fa1db2ab7821b9e3 #+container-bin-image.8593434f8fbeac8ca87a4252750091c43dd86fdfe55394c851d99e31665f136b #@git:e8dfe8dcb4396ac0f12f0d0017f9836fa113e3a6:containers @@ -43,8 +43,8 @@ printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "$pkgdir/deps/command" -ln -sf '/versions/apk-tools.123d241d019620155157ad9cb85f52edc9807ae42290054ac0d3261bbfd41dda/command/apk.static' "$pkgdir/deps/command/" -ln -sf '/versions/xbps.2528d7cb9bea236fe9688ee2dca0b446592189e7f8fbf6c04cfdfa7197f432fc/command/xbps-install.static' "$pkgdir/deps/command/" +ln -sf '/versions/apk-tools.e04845de281b2ac620d607f3258d7d5276b127ec3b1eb92ff0ded0a1b653a9d8/command/apk.static' "$pkgdir/deps/command/" +ln -sf '/versions/xbps.9c656653710dab34d097cd78fcef4004cf480034d96a5288fa1db2ab7821b9e3/command/xbps-install.static' "$pkgdir/deps/command/" for f in '/versions/alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1'/keys/alpine/*/*; do test -f "$f" @@ -54,7 +54,7 @@ for f in '/versions/alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6 done mkdir -p "$pkgdir/deps/keys/void" -for f in '/versions/xbps.2528d7cb9bea236fe9688ee2dca0b446592189e7f8fbf6c04cfdfa7197f432fc'/keys/void/*; do +for f in '/versions/xbps.9c656653710dab34d097cd78fcef4004cf480034d96a5288fa1db2ab7821b9e3'/keys/void/*; do ln -sf "$f" "$pkgdir/deps/keys/void/" done diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -7,10 +7,10 @@ #+s6-linux-utils.f7e0654375f11beedafd731ad1dd66c0de8d03452bb8e38bb647cc51cc3adb2e #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.1d74f932656301e32195366265b67502b8703416bc927524fb89fc47e2bea253 -#+xbps.2528d7cb9bea236fe9688ee2dca0b446592189e7f8fbf6c04cfdfa7197f432fc +#+containers.62e795e7f286ea36eef3b63b017241650c89897a07dfc801d0984d84d91fcc98 +#+xbps.9c656653710dab34d097cd78fcef4004cf480034d96a5288fa1db2ab7821b9e3 #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 -#+apk-tools.123d241d019620155157ad9cb85f52edc9807ae42290054ac0d3261bbfd41dda +#+apk-tools.e04845de281b2ac620d607f3258d7d5276b127ec3b1eb92ff0ded0a1b653a9d8 #+alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1 #+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl @@ -4,7 +4,7 @@ #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3 -#+libressl.f9a161b85669c93b2912dcec9cb12da53fa9bbf76f12c4d9e934d22b5d588ee5 +#+libressl.cb2f008a8f9f28bfaaa43d5a3d1121602c1388efad726823a0dc7af7b39fea51 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. build_env_static() { diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -6,7 +6,7 @@ #+patch.9d8b2c370a0ccf6e5ad48c27070ff1da2d30d41327fd5711a76cf570b34ae523 #+flex.42bdab01fb2083e92a4417d5fb289c468b9a1a5b8092904b965455b74559262f #+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0 -#+rsync.28b5893f313a227b1b4fb22bf123f7d2e6a1c29a16b3804c5e23b065e5ec2a4d +#+rsync.ae7320250fca99d49e5f3e7cf512db96aecb34c5662995fa166b960bf3678329 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e #+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f @@ -15,20 +15,20 @@ #+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c #+mdevd.ce53dc40e066f620a163354acb732a70f019902cf9dbdb45571d368eaf4f67b8 #+s6-dns.e65a0e1310967e0d4b18fd597993a364969fd35d50d35ba9eb2fd3fc68ffdf4b -#+libressl.f9a161b85669c93b2912dcec9cb12da53fa9bbf76f12c4d9e934d22b5d588ee5 -#+s6-networking.5ed19c343eab06e8849019020ed4d3d9f555ccd0dd761e8471b9a7477f4ce097 +#+libressl.cb2f008a8f9f28bfaaa43d5a3d1121602c1388efad726823a0dc7af7b39fea51 +#+s6-networking.77c0206f435d7703d890191c1acb4c5986292e479d9804b0d3827990816aa6c8 #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.1d74f932656301e32195366265b67502b8703416bc927524fb89fc47e2bea253 +#+containers.62e795e7f286ea36eef3b63b017241650c89897a07dfc801d0984d84d91fcc98 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 -#+curl.720eece3fd714f03daaa632b845f4d4241902e485105b1cf4697c2a2906d488c -#+git.579e5dd1414631cba0d4e7c54b4fc53f0884b882cac2e1c4eb272cb21148c7c9 -#+xbps.2528d7cb9bea236fe9688ee2dca0b446592189e7f8fbf6c04cfdfa7197f432fc -#+apk-tools.123d241d019620155157ad9cb85f52edc9807ae42290054ac0d3261bbfd41dda +#+curl.ef67ba52c2a0341b2e0e1c66e2548b58a0ae8a6c13cf067ca773219ef25333eb +#+git.72a4aece1ca0e227a07e7760c658c14643e131b23246c3deab06daff4a3a7916 +#+xbps.9c656653710dab34d097cd78fcef4004cf480034d96a5288fa1db2ab7821b9e3 +#+apk-tools.e04845de281b2ac620d607f3258d7d5276b127ec3b1eb92ff0ded0a1b653a9d8 #+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97 #+getconf.2d8409e202963fe34a70113b3fed7da0299f212d739c84f529126f9451886e7e #+iconv.b537e50837859e5b0fa7cc56ee46ff152c638910b9c817cba957f09631c9aad1 @@ -37,8 +37,8 @@ #+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac #+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca #+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296 -#+system-config.a64f2c0de9ee6195efc28cd98ca33f030f75e85f0d16e1c6e51ba038d8ac8736 -#+system-config-rc.6e8fa097d90b57b9ff6a319d548d189622fc3f9bc23860bab7434b0ea1bb373e +#+system-config.edda67b5d3e4a1fa867f6ec66284945375ca2a4cba9d4d3e1946d3b0d0d61dc6 +#+system-config-rc.b05ba5fb216c7219e4072e733614cb575a3d372d0887dbb1c26e4095cdc14bda #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378 -#+system-config-init.da1525a1de2239cecf2bec158d2a840d72715feda3b3c77ac8b66f36953ee9bb +#+system-config-init.af4ea5e1a6564661e8bd2ef3983fe23efd5532fb6dcefadd6b8fe507ac35df26 #+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f \ No newline at end of file diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git @@ -4,8 +4,8 @@ #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3 -#+libressl.f9a161b85669c93b2912dcec9cb12da53fa9bbf76f12c4d9e934d22b5d588ee5 -#+curl.720eece3fd714f03daaa632b845f4d4241902e485105b1cf4697c2a2906d488c +#+libressl.cb2f008a8f9f28bfaaa43d5a3d1121602c1388efad726823a0dc7af7b39fea51 +#+curl.ef67ba52c2a0341b2e0e1c66e2548b58a0ae8a6c13cf067ca773219ef25333eb #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. check_static() { diff --git a/variants/root-x86_64/kernel.environment b/variants/root-x86_64/kernel.environment @@ -1,2 +1,2 @@ #!/usr/bin/env pthbs-build -#+linux.315c953a6b4f23ebfee82809b5f59f7ac46706647b9d680e35daddc91fb5c072- \ No newline at end of file +#+linux.c20c8f90014a18c9f06cbcc9043844cbe2ecb30f2edf670d5599263cbdc961f2+ \ No newline at end of file diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl @@ -4,7 +4,7 @@ #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3 -#+ca-certificates-wip-donotuse.89a5548703ab315528a938f8ffbe21a2674a949301f6f5103a1f040c69e62a8f +#+ca-certificates-wip-donotuse.65e47008e9fd472e778b78920c5c5aef2bfbe5d33b020ce6a8ae8d6f0e78a2d3 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c @@ -67,7 +67,7 @@ check_static command/ocspcheck cd .. $CC ./c_rehash.c -o c_rehash --static -static -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto -cp -vs '/versions/ca-certificates-wip-donotuse.89a5548703ab315528a938f8ffbe21a2674a949301f6f5103a1f040c69e62a8f/config/ssl/certs' "$prefix/config/ssl/" +cp -vs '/versions/ca-certificates-wip-donotuse.65e47008e9fd472e778b78920c5c5aef2bfbe5d33b020ce6a8ae8d6f0e78a2d3/config/ssl/certs' "$prefix/config/ssl/" ./c_rehash "$prefix/config/ssl/" diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux @@ -6,7 +6,7 @@ #+patch.9d8b2c370a0ccf6e5ad48c27070ff1da2d30d41327fd5711a76cf570b34ae523 #+flex.42bdab01fb2083e92a4417d5fb289c468b9a1a5b8092904b965455b74559262f #+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0 -#+rsync.28b5893f313a227b1b4fb22bf123f7d2e6a1c29a16b3804c5e23b065e5ec2a4d +#+rsync.ae7320250fca99d49e5f3e7cf512db96aecb34c5662995fa166b960bf3678329 #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 #+libelf.b129c20086c9a39a997886caaa57b3f7c5be24fd0ceb34289b62e794ff722ed0 #+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621 diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync @@ -5,7 +5,7 @@ #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3 #+popt.3e3f8b71a43e7c837dff32830175ac07372bc54fbba39564ec0b609dd3c8d8d0 -#+libressl.f9a161b85669c93b2912dcec9cb12da53fa9bbf76f12c4d9e934d22b5d588ee5 +#+libressl.cb2f008a8f9f28bfaaa43d5a3d1121602c1388efad726823a0dc7af7b39fea51 #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking @@ -6,7 +6,7 @@ #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e #+s6-dns.e65a0e1310967e0d4b18fd597993a364969fd35d50d35ba9eb2fd3fc68ffdf4b -#+libressl.f9a161b85669c93b2912dcec9cb12da53fa9bbf76f12c4d9e934d22b5d588ee5 +#+libressl.cb2f008a8f9f28bfaaa43d5a3d1121602c1388efad726823a0dc7af7b39fea51 #@git:2c7b780bdb204caac3faf5613051d71a58de4017:s6-networking : ${JOBS:=1} diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -4,7 +4,7 @@ #+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 -#+rsync.28b5893f313a227b1b4fb22bf123f7d2e6a1c29a16b3804c5e23b065e5ec2a4d +#+rsync.ae7320250fca99d49e5f3e7cf512db96aecb34c5662995fa166b960bf3678329 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+kbd.2a0ad895612242729ff63f689075b1bff9295cba0f3eac9c23d79aedf88f6f54 #+mdevd.ce53dc40e066f620a163354acb732a70f019902cf9dbdb45571d368eaf4f67b8 @@ -52,7 +52,7 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.0481c71bd4c2820a98b875943e20a33f5826ee167012e6cfbf28a250205dc606' \ + 'pthbs_path_containers=/versions/env.f5f0d3ae344cba5abc46d843a7967e1b74a940f8a9dcb322e7c88ccf326e7e4a' \ 'pthbs_path_mdevd=/versions/env.699c310193b7957c8ec17e16d6846443f99c198e3e2ce6425066f4523de2cf1e' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -5,9 +5,9 @@ #+s6-portable-utils.f6171ad521d6be72875f1d5c1b28f966662ba93cfe5790e1ef010f9e76211bc3 #+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 -#+system-config-rc.6e8fa097d90b57b9ff6a319d548d189622fc3f9bc23860bab7434b0ea1bb373e +#+system-config-rc.b05ba5fb216c7219e4072e733614cb575a3d372d0887dbb1c26e4095cdc14bda -s6rcdb=/versions/system-config-rc.6e8fa097d90b57b9ff6a319d548d189622fc3f9bc23860bab7434b0ea1bb373e/config/s6-rc-db +s6rcdb=/versions/system-config-rc.b05ba5fb216c7219e4072e733614cb575a3d372d0887dbb1c26e4095cdc14bda/config/s6-rc-db prefix=/versions/$pthbs_package pkgdir="$pthbs_destdir/$prefix" diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc @@ -3,7 +3,7 @@ #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 -#+system-config.a64f2c0de9ee6195efc28cd98ca33f030f75e85f0d16e1c6e51ba038d8ac8736 +#+system-config.edda67b5d3e4a1fa867f6ec66284945375ca2a4cba9d4d3e1946d3b0d0d61dc6 def_prefix() { prefix=/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/versions/system-config.a64f2c0de9ee6195efc28cd98ca33f030f75e85f0d16e1c6e51ba038d8ac8736/config/s6-rc-source +src=/versions/system-config.edda67b5d3e4a1fa867f6ec66284945375ca2a4cba9d4d3e1946d3b0d0d61dc6/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 @@ -6,7 +6,7 @@ #+patch.9d8b2c370a0ccf6e5ad48c27070ff1da2d30d41327fd5711a76cf570b34ae523 #+flex.42bdab01fb2083e92a4417d5fb289c468b9a1a5b8092904b965455b74559262f #+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0 -#+rsync.28b5893f313a227b1b4fb22bf123f7d2e6a1c29a16b3804c5e23b065e5ec2a4d +#+rsync.ae7320250fca99d49e5f3e7cf512db96aecb34c5662995fa166b960bf3678329 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e #+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f @@ -15,20 +15,20 @@ #+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c #+mdevd.ce53dc40e066f620a163354acb732a70f019902cf9dbdb45571d368eaf4f67b8 #+s6-dns.e65a0e1310967e0d4b18fd597993a364969fd35d50d35ba9eb2fd3fc68ffdf4b -#+libressl.f9a161b85669c93b2912dcec9cb12da53fa9bbf76f12c4d9e934d22b5d588ee5 -#+s6-networking.5ed19c343eab06e8849019020ed4d3d9f555ccd0dd761e8471b9a7477f4ce097 +#+libressl.cb2f008a8f9f28bfaaa43d5a3d1121602c1388efad726823a0dc7af7b39fea51 +#+s6-networking.77c0206f435d7703d890191c1acb4c5986292e479d9804b0d3827990816aa6c8 #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.1d74f932656301e32195366265b67502b8703416bc927524fb89fc47e2bea253 +#+containers.62e795e7f286ea36eef3b63b017241650c89897a07dfc801d0984d84d91fcc98 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 -#+curl.720eece3fd714f03daaa632b845f4d4241902e485105b1cf4697c2a2906d488c -#+git.579e5dd1414631cba0d4e7c54b4fc53f0884b882cac2e1c4eb272cb21148c7c9 -#+xbps.2528d7cb9bea236fe9688ee2dca0b446592189e7f8fbf6c04cfdfa7197f432fc -#+apk-tools.123d241d019620155157ad9cb85f52edc9807ae42290054ac0d3261bbfd41dda +#+curl.ef67ba52c2a0341b2e0e1c66e2548b58a0ae8a6c13cf067ca773219ef25333eb +#+git.72a4aece1ca0e227a07e7760c658c14643e131b23246c3deab06daff4a3a7916 +#+xbps.9c656653710dab34d097cd78fcef4004cf480034d96a5288fa1db2ab7821b9e3 +#+apk-tools.e04845de281b2ac620d607f3258d7d5276b127ec3b1eb92ff0ded0a1b653a9d8 #+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97 #+getconf.2d8409e202963fe34a70113b3fed7da0299f212d739c84f529126f9451886e7e #+iconv.b537e50837859e5b0fa7cc56ee46ff152c638910b9c817cba957f09631c9aad1 diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps @@ -5,7 +5,7 @@ #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3 #+libarchive.27442e0362163a464fbcc3f60b8a8ccfba7afeb95fed8e412af2983b40d27f27 -#+libressl.f9a161b85669c93b2912dcec9cb12da53fa9bbf76f12c4d9e934d22b5d588ee5 +#+libressl.cb2f008a8f9f28bfaaa43d5a3d1121602c1388efad726823a0dc7af7b39fea51 #+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.