commit 6e6da46052cd3895df3430d19ce3b103b051f43b parent 89989f257ce30ece75990022a2850094f7fcb7c3 Author: Jan Pobrislo <ccx@te2000.cz> Date: Fri, 9 May 2025 12:28:58 +0000 symlink certs and hash in destdir Diffstat:
33 files changed, 92 insertions(+), 92 deletions(-)
diff --git a/templates/pkg/libressl b/templates/pkg/libressl @@ -14,8 +14,8 @@ check_static command/ocspcheck cd .. gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto -cp -vs '{{pkg_install_dir("ca-certificates-wip-donotuse")}}/config/ssl/certs' "$prefix/config/ssl/" -./c_rehash "$prefix/config/ssl/" +cp -vs '{{pkg_install_dir("ca-certificates-wip-donotuse")}}/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/" +./c_rehash "$pthbs_destdir/$prefix/config/ssl/" {% endblock %} {% block genlinks_begin %} 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.d3c0b1f84e5314d26b5de9e7d59e9175cbd94db174e805ac8ee1e105f8dea93d +#+libressl.5da943acd49c270d4c05c8a56e6def1cd0f62ee6ed165995566cb9e661d36e11 #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c #+pkgconf-pkg-config.86f9c193f6ccc64cc2ac696a7e3a258f01b8d0c539312ae37c08ea2354332e90 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools 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.d12cd6ee20acacf763e04d5652b675b14a10145e0cd762aa21a705c445fc15c9 -#+xbps.d3e7a47a576de216a30ac4c6fbfdab91ac0af0bdc869f21cadfbfeb494d66c9e +#+apk-tools.c472bc30facd3005770dfe4148b5ba87884985f1ee54b68af6f902fe7423a098 +#+xbps.10d7d8dd96bd88781d3809c2d9b139c4daae8481fdd01fe2e9f2a8ba6e3993fb #+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.d12cd6ee20acacf763e04d5652b675b14a10145e0cd762aa21a705c445fc15c9/command/apk.static' "$pkgdir/deps/command/" -ln -sf '/home/ccx/versions/xbps.d3e7a47a576de216a30ac4c6fbfdab91ac0af0bdc869f21cadfbfeb494d66c9e/command/xbps-install.static' "$pkgdir/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.c472bc30facd3005770dfe4148b5ba87884985f1ee54b68af6f902fe7423a098/command/apk.static' "$pkgdir/deps/command/" +ln -sf '/home/ccx/versions/xbps.10d7d8dd96bd88781d3809c2d9b139c4daae8481fdd01fe2e9f2a8ba6e3993fb/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.d3e7a47a576de216a30ac4c6fbfdab91ac0af0bdc869f21cadfbfeb494d66c9e'/keys/void/*; do +for f in '/home/ccx/versions/xbps.10d7d8dd96bd88781d3809c2d9b139c4daae8481fdd01fe2e9f2a8ba6e3993fb'/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.763640c247ff1a15f4cfdacfe33eacda9abfee3800049dcb3193a43ae609c6c0 -#+xbps.d3e7a47a576de216a30ac4c6fbfdab91ac0af0bdc869f21cadfbfeb494d66c9e +#+containers.cfdf34924680de8087e08794e4763a619f855ecff9a59763bf0a8d03cb64c210 +#+xbps.10d7d8dd96bd88781d3809c2d9b139c4daae8481fdd01fe2e9f2a8ba6e3993fb #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c -#+apk-tools.d12cd6ee20acacf763e04d5652b675b14a10145e0cd762aa21a705c445fc15c9 +#+apk-tools.c472bc30facd3005770dfe4148b5ba87884985f1ee54b68af6f902fe7423a098 #+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.d3c0b1f84e5314d26b5de9e7d59e9175cbd94db174e805ac8ee1e105f8dea93d +#+libressl.5da943acd49c270d4c05c8a56e6def1cd0f62ee6ed165995566cb9e661d36e11 #@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.d7ea705e356a0b516a086da6af5fa508fdaf44caecdcf81f09686e42d8c8eaf0 +#+rsync.0c049d72bd373e98a5d72bb74c1ca1be1a584d159b969fbb7cbae91352764c32 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e #+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9 @@ -15,20 +15,20 @@ #+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2 #+mdevd.2c8e38fba9104da05177a2c4cc498139c506b1b3dae60c51cf54b831c1762daa #+s6-dns.91f4cab6424ef44de73cac82f7bda7d1e91a2ece09fcbe48912f431785c6db7e -#+libressl.d3c0b1f84e5314d26b5de9e7d59e9175cbd94db174e805ac8ee1e105f8dea93d -#+s6-networking.838c5a779abc24ca16dc280c138f1b9b1035f5021d7a4fbe65f6116f110c87a9 +#+libressl.5da943acd49c270d4c05c8a56e6def1cd0f62ee6ed165995566cb9e661d36e11 +#+s6-networking.46d98aa84e9ad4b4bc57ef59d56af01990cc12da14a927aee5b39575c455eeee #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.763640c247ff1a15f4cfdacfe33eacda9abfee3800049dcb3193a43ae609c6c0 +#+containers.cfdf34924680de8087e08794e4763a619f855ecff9a59763bf0a8d03cb64c210 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 -#+curl.b50f74184546e12b3016a3598cffb0da33b722450674a824e8c1adc9d6ea880f -#+git.89b3b8d4a793a329ef911d9deb5d6bdf099bd1fea0522232defdd0643751aa7f -#+xbps.d3e7a47a576de216a30ac4c6fbfdab91ac0af0bdc869f21cadfbfeb494d66c9e -#+apk-tools.d12cd6ee20acacf763e04d5652b675b14a10145e0cd762aa21a705c445fc15c9 +#+curl.aff2a70c1791eafca6cd419fc58e253713bc5ab44745a7163ad12a785730b68e +#+git.1b4a2686b1f2da33bf91047a622b75b3b66a542f96d56b81703818de20f8a9ac +#+xbps.10d7d8dd96bd88781d3809c2d9b139c4daae8481fdd01fe2e9f2a8ba6e3993fb +#+apk-tools.c472bc30facd3005770dfe4148b5ba87884985f1ee54b68af6f902fe7423a098 #+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447 #+getconf.62760a9db3bdba375752c0a4f8722b5e0ee3c4eded1ab1073a73533c116f6de5 #+iconv.e574881283799fa144f1d9df753a05d9f7effa47ae0a06a92b532decde48f145 @@ -37,8 +37,8 @@ #+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114 #+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8 #+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103 -#+system-config.b52b31cdfb4cd0cce311cb4eca37aa3ee2346835e7a81f993825b719532ae4a4 -#+system-config-rc.bdd8c0e86f4ba7fc93dacdaa4f6658adf70dbcd3cf5d1cbfd1a34f2ca2dabc0d +#+system-config.b18bd5780509cbb7ac16a019f14a727d782cb19c8e42765a9462d64069f22ef5 +#+system-config-rc.7976020c67725f852e932283c7a919653f8651c3a596a0dfb37e99986cfe8790 #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d -#+system-config-init.82cddb07a6525e7c2d62ace6d9a720f2de0b0c2034a880b91e11eb07412aac82 +#+system-config-init.5b9f42b3e4396389f2cbe289b9f69cbd3846db095fad543135392c177bec67d6 #+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.d3c0b1f84e5314d26b5de9e7d59e9175cbd94db174e805ac8ee1e105f8dea93d -#+curl.b50f74184546e12b3016a3598cffb0da33b722450674a824e8c1adc9d6ea880f +#+libressl.5da943acd49c270d4c05c8a56e6def1cd0f62ee6ed165995566cb9e661d36e11 +#+curl.aff2a70c1791eafca6cd419fc58e253713bc5ab44745a7163ad12a785730b68e #@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.75b365ca0fec1780ae7b049910671f78c1786a5cd572a47a04a449ffa77e1349- \ No newline at end of file +#+linux.d622877d8d8b8ae5f1231714cda9a239cc71745e0cd23f1d983a573cb544df3b+ \ No newline at end of file diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl @@ -67,8 +67,8 @@ check_static command/ocspcheck cd .. gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto -cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.01dd5995b07153848c1af3f70418ee00e4311be1dab49cf7d6327dbdfd08718d/config/ssl/certs' "$prefix/config/ssl/" -./c_rehash "$prefix/config/ssl/" +cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.01dd5995b07153848c1af3f70418ee00e4311be1dab49cf7d6327dbdfd08718d/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/" +./c_rehash "$pthbs_destdir/$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.d7ea705e356a0b516a086da6af5fa508fdaf44caecdcf81f09686e42d8c8eaf0 +#+rsync.0c049d72bd373e98a5d72bb74c1ca1be1a584d159b969fbb7cbae91352764c32 #+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.d3c0b1f84e5314d26b5de9e7d59e9175cbd94db174e805ac8ee1e105f8dea93d +#+libressl.5da943acd49c270d4c05c8a56e6def1cd0f62ee6ed165995566cb9e661d36e11 #+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.d3c0b1f84e5314d26b5de9e7d59e9175cbd94db174e805ac8ee1e105f8dea93d +#+libressl.5da943acd49c270d4c05c8a56e6def1cd0f62ee6ed165995566cb9e661d36e11 #@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.d7ea705e356a0b516a086da6af5fa508fdaf44caecdcf81f09686e42d8c8eaf0 +#+rsync.0c049d72bd373e98a5d72bb74c1ca1be1a584d159b969fbb7cbae91352764c32 #+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.c8a374e31837fc68dbc4b2fd0a12ae9b48f0801dc29151868b7e5dd88c5abb16' \ + 'pthbs_path_containers=/home/ccx/versions/env.3a1e998bc3185dce1ae6ace57fc0892862a9e0fcb9d600927d8429968f53f985' \ '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.bdd8c0e86f4ba7fc93dacdaa4f6658adf70dbcd3cf5d1cbfd1a34f2ca2dabc0d +#+system-config-rc.7976020c67725f852e932283c7a919653f8651c3a596a0dfb37e99986cfe8790 -s6rcdb=/home/ccx/versions/system-config-rc.bdd8c0e86f4ba7fc93dacdaa4f6658adf70dbcd3cf5d1cbfd1a34f2ca2dabc0d/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.7976020c67725f852e932283c7a919653f8651c3a596a0dfb37e99986cfe8790/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.b52b31cdfb4cd0cce311cb4eca37aa3ee2346835e7a81f993825b719532ae4a4 +#+system-config.b18bd5780509cbb7ac16a019f14a727d782cb19c8e42765a9462d64069f22ef5 def_prefix() { prefix=/home/ccx/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/home/ccx/versions/system-config.b52b31cdfb4cd0cce311cb4eca37aa3ee2346835e7a81f993825b719532ae4a4/config/s6-rc-source +src=/home/ccx/versions/system-config.b18bd5780509cbb7ac16a019f14a727d782cb19c8e42765a9462d64069f22ef5/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.d7ea705e356a0b516a086da6af5fa508fdaf44caecdcf81f09686e42d8c8eaf0 +#+rsync.0c049d72bd373e98a5d72bb74c1ca1be1a584d159b969fbb7cbae91352764c32 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e #+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9 @@ -15,20 +15,20 @@ #+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2 #+mdevd.2c8e38fba9104da05177a2c4cc498139c506b1b3dae60c51cf54b831c1762daa #+s6-dns.91f4cab6424ef44de73cac82f7bda7d1e91a2ece09fcbe48912f431785c6db7e -#+libressl.d3c0b1f84e5314d26b5de9e7d59e9175cbd94db174e805ac8ee1e105f8dea93d -#+s6-networking.838c5a779abc24ca16dc280c138f1b9b1035f5021d7a4fbe65f6116f110c87a9 +#+libressl.5da943acd49c270d4c05c8a56e6def1cd0f62ee6ed165995566cb9e661d36e11 +#+s6-networking.46d98aa84e9ad4b4bc57ef59d56af01990cc12da14a927aee5b39575c455eeee #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.763640c247ff1a15f4cfdacfe33eacda9abfee3800049dcb3193a43ae609c6c0 +#+containers.cfdf34924680de8087e08794e4763a619f855ecff9a59763bf0a8d03cb64c210 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 -#+curl.b50f74184546e12b3016a3598cffb0da33b722450674a824e8c1adc9d6ea880f -#+git.89b3b8d4a793a329ef911d9deb5d6bdf099bd1fea0522232defdd0643751aa7f -#+xbps.d3e7a47a576de216a30ac4c6fbfdab91ac0af0bdc869f21cadfbfeb494d66c9e -#+apk-tools.d12cd6ee20acacf763e04d5652b675b14a10145e0cd762aa21a705c445fc15c9 +#+curl.aff2a70c1791eafca6cd419fc58e253713bc5ab44745a7163ad12a785730b68e +#+git.1b4a2686b1f2da33bf91047a622b75b3b66a542f96d56b81703818de20f8a9ac +#+xbps.10d7d8dd96bd88781d3809c2d9b139c4daae8481fdd01fe2e9f2a8ba6e3993fb +#+apk-tools.c472bc30facd3005770dfe4148b5ba87884985f1ee54b68af6f902fe7423a098 #+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.d3c0b1f84e5314d26b5de9e7d59e9175cbd94db174e805ac8ee1e105f8dea93d +#+libressl.5da943acd49c270d4c05c8a56e6def1cd0f62ee6ed165995566cb9e661d36e11 #+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.069cc83e883f842ffece4dc8217b23b9289fd445c1620475d7af21d256cb22d6 +#+libressl.923cd5d99935a86e730fe8fea0233e7bb9102feb316ca2aaf3670a5bd608f538 #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 #+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools 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.27cf422ba44785ea4708ca56b48aaea2abfb8712f64bcf7653d391838e7baa08 -#+xbps.f91ae9f3a5dbe467eb994694aac65ca2a5c0c77bf91361441c7fd90fbc6373b0 +#+apk-tools.93e0b4c1dbb76b1bc3b39c9807d617a7000e1bd1af7e7b4dc29f3a121b9af3a6 +#+xbps.9ffbc2321f0c141e1c322ec902248635aed69041be0d984e77beb72479ce740b #+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.27cf422ba44785ea4708ca56b48aaea2abfb8712f64bcf7653d391838e7baa08/command/apk.static' "$pkgdir/deps/command/" -ln -sf '/versions/xbps.f91ae9f3a5dbe467eb994694aac65ca2a5c0c77bf91361441c7fd90fbc6373b0/command/xbps-install.static' "$pkgdir/deps/command/" +ln -sf '/versions/apk-tools.93e0b4c1dbb76b1bc3b39c9807d617a7000e1bd1af7e7b4dc29f3a121b9af3a6/command/apk.static' "$pkgdir/deps/command/" +ln -sf '/versions/xbps.9ffbc2321f0c141e1c322ec902248635aed69041be0d984e77beb72479ce740b/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.f91ae9f3a5dbe467eb994694aac65ca2a5c0c77bf91361441c7fd90fbc6373b0'/keys/void/*; do +for f in '/versions/xbps.9ffbc2321f0c141e1c322ec902248635aed69041be0d984e77beb72479ce740b'/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.eb80759b679827ebd17bbc3a06816da61f0e1d3192a0f2be3311793f6291976a -#+xbps.f91ae9f3a5dbe467eb994694aac65ca2a5c0c77bf91361441c7fd90fbc6373b0 +#+containers.cbbe689105a8d12b2729739bb30de69d0c30e3e314f99568b2e93418c8771661 +#+xbps.9ffbc2321f0c141e1c322ec902248635aed69041be0d984e77beb72479ce740b #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 -#+apk-tools.27cf422ba44785ea4708ca56b48aaea2abfb8712f64bcf7653d391838e7baa08 +#+apk-tools.93e0b4c1dbb76b1bc3b39c9807d617a7000e1bd1af7e7b4dc29f3a121b9af3a6 #+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.069cc83e883f842ffece4dc8217b23b9289fd445c1620475d7af21d256cb22d6 +#+libressl.923cd5d99935a86e730fe8fea0233e7bb9102feb316ca2aaf3670a5bd608f538 #@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.233eb1800604220aefc5c2f5efb1a9c7d9259582cd75f37adc8e8cd4b673537e +#+rsync.c834774b0c2a4f211b979b9af1fee03ca0ad74038de10041f07d66ae36c99553 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e #+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f @@ -15,20 +15,20 @@ #+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c #+mdevd.ce53dc40e066f620a163354acb732a70f019902cf9dbdb45571d368eaf4f67b8 #+s6-dns.e65a0e1310967e0d4b18fd597993a364969fd35d50d35ba9eb2fd3fc68ffdf4b -#+libressl.069cc83e883f842ffece4dc8217b23b9289fd445c1620475d7af21d256cb22d6 -#+s6-networking.62fdcb81b0b42dd630f4ac1e794a54630b5faf04c2ebbdf9b264c89631569603 +#+libressl.923cd5d99935a86e730fe8fea0233e7bb9102feb316ca2aaf3670a5bd608f538 +#+s6-networking.29fc6573ae4911906486108e7c8db4023840aca445660c644a2d577de4353c16 #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.eb80759b679827ebd17bbc3a06816da61f0e1d3192a0f2be3311793f6291976a +#+containers.cbbe689105a8d12b2729739bb30de69d0c30e3e314f99568b2e93418c8771661 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 -#+curl.588330eb57ed61f4de13584b83d30e0a0e3b166aca5f3769de91a812a641eb79 -#+git.686fffbf7db996877103bd0e13539faac67f6081f7bf4e6f1cd2b939676b9069 -#+xbps.f91ae9f3a5dbe467eb994694aac65ca2a5c0c77bf91361441c7fd90fbc6373b0 -#+apk-tools.27cf422ba44785ea4708ca56b48aaea2abfb8712f64bcf7653d391838e7baa08 +#+curl.3752d97e2c5c4158b28d0c6fa384e75d58476f4d784682d26386c324a6dbf85b +#+git.df4ddecd136009d10f415d26fbdb7982824706ff745eb8e1b6146c31a9a864ec +#+xbps.9ffbc2321f0c141e1c322ec902248635aed69041be0d984e77beb72479ce740b +#+apk-tools.93e0b4c1dbb76b1bc3b39c9807d617a7000e1bd1af7e7b4dc29f3a121b9af3a6 #+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97 #+getconf.2d8409e202963fe34a70113b3fed7da0299f212d739c84f529126f9451886e7e #+iconv.b537e50837859e5b0fa7cc56ee46ff152c638910b9c817cba957f09631c9aad1 @@ -37,8 +37,8 @@ #+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac #+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca #+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296 -#+system-config.ff72518a8cf32212b7b9a8e55c34aa2ccffd460af3560d3da55a921de62bdd31 -#+system-config-rc.c850f7820c33a0758e0d8442000931dd0be5e4d4a73007437c74ccded384e210 +#+system-config.e187abf7d0e06bb25c81e00180246feba034453088b82014aea3451ad74681ed +#+system-config-rc.71f923a6c846b808737b295f0cfa7bb0d4eba2533cbc5b58f8645d0b8407afa3 #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378 -#+system-config-init.0ee0fdd563ce6f7993419fb5e67b0a51ca021d31ddb188c4ca261d0c6804340c +#+system-config-init.ba73a87fe5dc7f8e33bee26e6a3013eece37815bf0c90cedc88809118e688141 #+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.069cc83e883f842ffece4dc8217b23b9289fd445c1620475d7af21d256cb22d6 -#+curl.588330eb57ed61f4de13584b83d30e0a0e3b166aca5f3769de91a812a641eb79 +#+libressl.923cd5d99935a86e730fe8fea0233e7bb9102feb316ca2aaf3670a5bd608f538 +#+curl.3752d97e2c5c4158b28d0c6fa384e75d58476f4d784682d26386c324a6dbf85b #@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.0eb5c672525c801c17020483ef59eea4d51d6e81f5428bfd7f7ee47bec43c68a- \ No newline at end of file +#+linux.2100c5454eeb72818fb2a9ef477baba42a652fcfad5716a76187ca7213ba5913+ \ No newline at end of file diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl @@ -67,8 +67,8 @@ check_static command/ocspcheck cd .. gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto -cp -vs '/versions/ca-certificates-wip-donotuse.066a6f65b6b40323f605c350b77c6366bcbc6a6c462b7f749e438164ab63aca5/config/ssl/certs' "$prefix/config/ssl/" -./c_rehash "$prefix/config/ssl/" +cp -vs '/versions/ca-certificates-wip-donotuse.066a6f65b6b40323f605c350b77c6366bcbc6a6c462b7f749e438164ab63aca5/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/" +./c_rehash "$pthbs_destdir/$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.233eb1800604220aefc5c2f5efb1a9c7d9259582cd75f37adc8e8cd4b673537e +#+rsync.c834774b0c2a4f211b979b9af1fee03ca0ad74038de10041f07d66ae36c99553 #+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.069cc83e883f842ffece4dc8217b23b9289fd445c1620475d7af21d256cb22d6 +#+libressl.923cd5d99935a86e730fe8fea0233e7bb9102feb316ca2aaf3670a5bd608f538 #+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.069cc83e883f842ffece4dc8217b23b9289fd445c1620475d7af21d256cb22d6 +#+libressl.923cd5d99935a86e730fe8fea0233e7bb9102feb316ca2aaf3670a5bd608f538 #@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.233eb1800604220aefc5c2f5efb1a9c7d9259582cd75f37adc8e8cd4b673537e +#+rsync.c834774b0c2a4f211b979b9af1fee03ca0ad74038de10041f07d66ae36c99553 #+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.a2adac8cdf25cd73f7a0b4ed8f8dadf7ac4fc353d82dd2de2da89d411fe35fdf' \ + 'pthbs_path_containers=/versions/env.438fe1501550c61215f2fd5b7d03ca8cd59c286112111b916a39fa4cf178b202' \ '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.c850f7820c33a0758e0d8442000931dd0be5e4d4a73007437c74ccded384e210 +#+system-config-rc.71f923a6c846b808737b295f0cfa7bb0d4eba2533cbc5b58f8645d0b8407afa3 -s6rcdb=/versions/system-config-rc.c850f7820c33a0758e0d8442000931dd0be5e4d4a73007437c74ccded384e210/config/s6-rc-db +s6rcdb=/versions/system-config-rc.71f923a6c846b808737b295f0cfa7bb0d4eba2533cbc5b58f8645d0b8407afa3/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.ff72518a8cf32212b7b9a8e55c34aa2ccffd460af3560d3da55a921de62bdd31 +#+system-config.e187abf7d0e06bb25c81e00180246feba034453088b82014aea3451ad74681ed def_prefix() { prefix=/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/versions/system-config.ff72518a8cf32212b7b9a8e55c34aa2ccffd460af3560d3da55a921de62bdd31/config/s6-rc-source +src=/versions/system-config.e187abf7d0e06bb25c81e00180246feba034453088b82014aea3451ad74681ed/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.233eb1800604220aefc5c2f5efb1a9c7d9259582cd75f37adc8e8cd4b673537e +#+rsync.c834774b0c2a4f211b979b9af1fee03ca0ad74038de10041f07d66ae36c99553 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e #+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f @@ -15,20 +15,20 @@ #+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c #+mdevd.ce53dc40e066f620a163354acb732a70f019902cf9dbdb45571d368eaf4f67b8 #+s6-dns.e65a0e1310967e0d4b18fd597993a364969fd35d50d35ba9eb2fd3fc68ffdf4b -#+libressl.069cc83e883f842ffece4dc8217b23b9289fd445c1620475d7af21d256cb22d6 -#+s6-networking.62fdcb81b0b42dd630f4ac1e794a54630b5faf04c2ebbdf9b264c89631569603 +#+libressl.923cd5d99935a86e730fe8fea0233e7bb9102feb316ca2aaf3670a5bd608f538 +#+s6-networking.29fc6573ae4911906486108e7c8db4023840aca445660c644a2d577de4353c16 #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.eb80759b679827ebd17bbc3a06816da61f0e1d3192a0f2be3311793f6291976a +#+containers.cbbe689105a8d12b2729739bb30de69d0c30e3e314f99568b2e93418c8771661 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 -#+curl.588330eb57ed61f4de13584b83d30e0a0e3b166aca5f3769de91a812a641eb79 -#+git.686fffbf7db996877103bd0e13539faac67f6081f7bf4e6f1cd2b939676b9069 -#+xbps.f91ae9f3a5dbe467eb994694aac65ca2a5c0c77bf91361441c7fd90fbc6373b0 -#+apk-tools.27cf422ba44785ea4708ca56b48aaea2abfb8712f64bcf7653d391838e7baa08 +#+curl.3752d97e2c5c4158b28d0c6fa384e75d58476f4d784682d26386c324a6dbf85b +#+git.df4ddecd136009d10f415d26fbdb7982824706ff745eb8e1b6146c31a9a864ec +#+xbps.9ffbc2321f0c141e1c322ec902248635aed69041be0d984e77beb72479ce740b +#+apk-tools.93e0b4c1dbb76b1bc3b39c9807d617a7000e1bd1af7e7b4dc29f3a121b9af3a6 #+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.069cc83e883f842ffece4dc8217b23b9289fd445c1620475d7af21d256cb22d6 +#+libressl.923cd5d99935a86e730fe8fea0233e7bb9102feb316ca2aaf3670a5bd608f538 #+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.