commit 702f23618dacb0cf7d697229bf976ea320ffbe1f parent 00504c0ffd64cc2e74f95194e734e5c1a996fa76 Author: Jan Pobrislo <ccx@te2000.cz> Date: Fri, 9 May 2025 16:01:31 +0000 Fix CA dir path in env Diffstat:
33 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/templates/pkg/libressl b/templates/pkg/libressl @@ -23,11 +23,11 @@ cp -a certs/ca-certificates.crt cert.pem cd "$pthbs_destdir/$prefix/" mkdir -p env # for s6-networking -printf >env/CADIR '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +printf >env/CADIR '%s\n' "$prefix/config/ssl/certs" # for curl -printf >env/SSL_CERT_DIR '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +printf >env/SSL_CERT_DIR '%s\n' "$prefix/config/ssl/certs" # for git -printf >env/GIT_SSL_CAPATH '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +printf >env/GIT_SSL_CAPATH '%s\n' "$prefix/config/ssl/certs" {% endblock %} {% block rules %} 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.7ba80ee86ef1ccb214acfd81794b0ea207b6504ad1a01ca7ef52b0558c25eb1f +#+libressl.633500bb0c83790bc40476a011548bd124f73c708cd70ea1988c192fd90a8dad #+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.a8001f8902105651e348d6a4afe024fde236631877712a1fda31f9c07fb732c3 -#+xbps.cb69a0cf49735a6fcf41d0509a0b30a40f30df3957b50ca13d2e7025bc5de214 +#+apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf +#+xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b #+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.a8001f8902105651e348d6a4afe024fde236631877712a1fda31f9c07fb732c3/command/apk.static' "$pkgdir/deps/command/" -ln -sf '/home/ccx/versions/xbps.cb69a0cf49735a6fcf41d0509a0b30a40f30df3957b50ca13d2e7025bc5de214/command/xbps-install.static' "$pkgdir/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf/command/apk.static' "$pkgdir/deps/command/" +ln -sf '/home/ccx/versions/xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b/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.cb69a0cf49735a6fcf41d0509a0b30a40f30df3957b50ca13d2e7025bc5de214'/keys/void/*; do +for f in '/home/ccx/versions/xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b'/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.b5ea56079d7bd5ce1c371b0095ea7f32e17c0f52c092b3ec4a2e445b6bea0c45 -#+xbps.cb69a0cf49735a6fcf41d0509a0b30a40f30df3957b50ca13d2e7025bc5de214 +#+containers.28808e2dad14a978bc7f077e157de70b2bca49e4726c322bc2394e1ee77cda6c +#+xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c -#+apk-tools.a8001f8902105651e348d6a4afe024fde236631877712a1fda31f9c07fb732c3 +#+apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf #+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.7ba80ee86ef1ccb214acfd81794b0ea207b6504ad1a01ca7ef52b0558c25eb1f +#+libressl.633500bb0c83790bc40476a011548bd124f73c708cd70ea1988c192fd90a8dad #@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.10cbdce9ff14b81615c2ce854245fc566a65cb4039fd69d7b0e95d41cdab91c3 +#+rsync.32b87b85bdc766953843afdf5f56abafcce8c9738dfdbe184a7f7be86a86b833 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e #+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9 @@ -15,20 +15,20 @@ #+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2 #+mdevd.2c8e38fba9104da05177a2c4cc498139c506b1b3dae60c51cf54b831c1762daa #+s6-dns.91f4cab6424ef44de73cac82f7bda7d1e91a2ece09fcbe48912f431785c6db7e -#+libressl.7ba80ee86ef1ccb214acfd81794b0ea207b6504ad1a01ca7ef52b0558c25eb1f -#+s6-networking.247e282ad0b158aedffa6c8fe8ea5236b1603962d1966fec3fa402c26fce07ee +#+libressl.633500bb0c83790bc40476a011548bd124f73c708cd70ea1988c192fd90a8dad +#+s6-networking.288325d764a527a7aa49583a4c0fe6b72934440f1b6d2220d18e69f740280dad #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.b5ea56079d7bd5ce1c371b0095ea7f32e17c0f52c092b3ec4a2e445b6bea0c45 +#+containers.28808e2dad14a978bc7f077e157de70b2bca49e4726c322bc2394e1ee77cda6c #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 -#+curl.11cd066899926c0de950ab70831c17897bf1887e025cd8937a32a02b10848a62 -#+git.05c68416399889fde955afbd8688f8a536b79ecad80dcdb3dad913388dd631ab -#+xbps.cb69a0cf49735a6fcf41d0509a0b30a40f30df3957b50ca13d2e7025bc5de214 -#+apk-tools.a8001f8902105651e348d6a4afe024fde236631877712a1fda31f9c07fb732c3 +#+curl.992057c4266e8a94e1f331944e0b16ddf8b96d8d45da0532587b6123aab2316e +#+git.1c31f2cb65693e0a2fc1c717f3b13c909c5d9769182279913fba61219a5ba872 +#+xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b +#+apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf #+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447 #+getconf.62760a9db3bdba375752c0a4f8722b5e0ee3c4eded1ab1073a73533c116f6de5 #+iconv.e574881283799fa144f1d9df753a05d9f7effa47ae0a06a92b532decde48f145 @@ -37,8 +37,8 @@ #+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114 #+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8 #+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103 -#+system-config.b1079ea373546b82aa84ee4c34fa93b2574e19383ff29f576f486c18b5fe6dd3 -#+system-config-rc.89fed3a0e7283ffaff443575511e7fcfd1dd77ca1b64b67131d1ae2d560ab2ed +#+system-config.8abe9df369207f3fbff1e6bba06bb9b1e141853655f4e44e4af3b5ae455c371d +#+system-config-rc.c20c7cc8bdb0cdaf30c19c56a72dd61c151af109d4644687c1ea760b4f861de6 #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d -#+system-config-init.71e9d6d1c83720a37f44216f7916345f5100d19c129c6ed958899636f4fc79cd +#+system-config-init.c35208dcc6455ceed1793189c0afaeb59645d662368eaa2488047041ede11e90 #+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.7ba80ee86ef1ccb214acfd81794b0ea207b6504ad1a01ca7ef52b0558c25eb1f -#+curl.11cd066899926c0de950ab70831c17897bf1887e025cd8937a32a02b10848a62 +#+libressl.633500bb0c83790bc40476a011548bd124f73c708cd70ea1988c192fd90a8dad +#+curl.992057c4266e8a94e1f331944e0b16ddf8b96d8d45da0532587b6123aab2316e #@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.201fa5dad95259d8baa2263e1b6bbe745d9f347c6586297f665c32870c57099b- \ No newline at end of file +#+linux.8252c34a657a9c77eeb80c4980205fcd95f5087a8833b31e98001d25fae45348+ \ No newline at end of file diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl @@ -76,11 +76,11 @@ cp -a certs/ca-certificates.crt cert.pem cd "$pthbs_destdir/$prefix/" mkdir -p env # for s6-networking -printf >env/CADIR '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +printf >env/CADIR '%s\n' "$prefix/config/ssl/certs" # for curl -printf >env/SSL_CERT_DIR '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +printf >env/SSL_CERT_DIR '%s\n' "$prefix/config/ssl/certs" # for git -printf >env/GIT_SSL_CAPATH '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +printf >env/GIT_SSL_CAPATH '%s\n' "$prefix/config/ssl/certs" 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.10cbdce9ff14b81615c2ce854245fc566a65cb4039fd69d7b0e95d41cdab91c3 +#+rsync.32b87b85bdc766953843afdf5f56abafcce8c9738dfdbe184a7f7be86a86b833 #+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.7ba80ee86ef1ccb214acfd81794b0ea207b6504ad1a01ca7ef52b0558c25eb1f +#+libressl.633500bb0c83790bc40476a011548bd124f73c708cd70ea1988c192fd90a8dad #+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.7ba80ee86ef1ccb214acfd81794b0ea207b6504ad1a01ca7ef52b0558c25eb1f +#+libressl.633500bb0c83790bc40476a011548bd124f73c708cd70ea1988c192fd90a8dad #@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.10cbdce9ff14b81615c2ce854245fc566a65cb4039fd69d7b0e95d41cdab91c3 +#+rsync.32b87b85bdc766953843afdf5f56abafcce8c9738dfdbe184a7f7be86a86b833 #+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.94f01295aadcff4b6b3fdeebd254f2bfcca39b9b6e6a111814d791272ca5959c' \ + 'pthbs_path_containers=/home/ccx/versions/env.633ba222650efbcf19c22623bfdb791e28a4be013c162d860c453db30bed2f5a' \ '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.89fed3a0e7283ffaff443575511e7fcfd1dd77ca1b64b67131d1ae2d560ab2ed +#+system-config-rc.c20c7cc8bdb0cdaf30c19c56a72dd61c151af109d4644687c1ea760b4f861de6 -s6rcdb=/home/ccx/versions/system-config-rc.89fed3a0e7283ffaff443575511e7fcfd1dd77ca1b64b67131d1ae2d560ab2ed/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.c20c7cc8bdb0cdaf30c19c56a72dd61c151af109d4644687c1ea760b4f861de6/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.b1079ea373546b82aa84ee4c34fa93b2574e19383ff29f576f486c18b5fe6dd3 +#+system-config.8abe9df369207f3fbff1e6bba06bb9b1e141853655f4e44e4af3b5ae455c371d def_prefix() { prefix=/home/ccx/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/home/ccx/versions/system-config.b1079ea373546b82aa84ee4c34fa93b2574e19383ff29f576f486c18b5fe6dd3/config/s6-rc-source +src=/home/ccx/versions/system-config.8abe9df369207f3fbff1e6bba06bb9b1e141853655f4e44e4af3b5ae455c371d/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.10cbdce9ff14b81615c2ce854245fc566a65cb4039fd69d7b0e95d41cdab91c3 +#+rsync.32b87b85bdc766953843afdf5f56abafcce8c9738dfdbe184a7f7be86a86b833 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e #+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9 @@ -15,20 +15,20 @@ #+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2 #+mdevd.2c8e38fba9104da05177a2c4cc498139c506b1b3dae60c51cf54b831c1762daa #+s6-dns.91f4cab6424ef44de73cac82f7bda7d1e91a2ece09fcbe48912f431785c6db7e -#+libressl.7ba80ee86ef1ccb214acfd81794b0ea207b6504ad1a01ca7ef52b0558c25eb1f -#+s6-networking.247e282ad0b158aedffa6c8fe8ea5236b1603962d1966fec3fa402c26fce07ee +#+libressl.633500bb0c83790bc40476a011548bd124f73c708cd70ea1988c192fd90a8dad +#+s6-networking.288325d764a527a7aa49583a4c0fe6b72934440f1b6d2220d18e69f740280dad #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.b5ea56079d7bd5ce1c371b0095ea7f32e17c0f52c092b3ec4a2e445b6bea0c45 +#+containers.28808e2dad14a978bc7f077e157de70b2bca49e4726c322bc2394e1ee77cda6c #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 -#+curl.11cd066899926c0de950ab70831c17897bf1887e025cd8937a32a02b10848a62 -#+git.05c68416399889fde955afbd8688f8a536b79ecad80dcdb3dad913388dd631ab -#+xbps.cb69a0cf49735a6fcf41d0509a0b30a40f30df3957b50ca13d2e7025bc5de214 -#+apk-tools.a8001f8902105651e348d6a4afe024fde236631877712a1fda31f9c07fb732c3 +#+curl.992057c4266e8a94e1f331944e0b16ddf8b96d8d45da0532587b6123aab2316e +#+git.1c31f2cb65693e0a2fc1c717f3b13c909c5d9769182279913fba61219a5ba872 +#+xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b +#+apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf #+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.7ba80ee86ef1ccb214acfd81794b0ea207b6504ad1a01ca7ef52b0558c25eb1f +#+libressl.633500bb0c83790bc40476a011548bd124f73c708cd70ea1988c192fd90a8dad #+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.a5eba1dac0d0ba65dc34f52b07a22ec5f0bcaac36e31eea7c2e1adc9e94c59ae +#+libressl.a4cd21faaf27a6507f54f2b1254a95643eab1b19b22b162083d4547efdbe50a4 #+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.a4c58e6d53fb30e2373ffcae7463a91abc677b9021bc1bfe7c72478a798fbe8c -#+xbps.3a34b6585e7e877ed85c9a900a5ce11b7d98af9aa1b4ddd48c7293a242fc8099 +#+apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa +#+xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d #+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.a4c58e6d53fb30e2373ffcae7463a91abc677b9021bc1bfe7c72478a798fbe8c/command/apk.static' "$pkgdir/deps/command/" -ln -sf '/versions/xbps.3a34b6585e7e877ed85c9a900a5ce11b7d98af9aa1b4ddd48c7293a242fc8099/command/xbps-install.static' "$pkgdir/deps/command/" +ln -sf '/versions/apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa/command/apk.static' "$pkgdir/deps/command/" +ln -sf '/versions/xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d/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.3a34b6585e7e877ed85c9a900a5ce11b7d98af9aa1b4ddd48c7293a242fc8099'/keys/void/*; do +for f in '/versions/xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d'/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.66c08019e6125248784cf2ef49c3bdd4877dff2cf635dae4a194f5effa8d0ad0 -#+xbps.3a34b6585e7e877ed85c9a900a5ce11b7d98af9aa1b4ddd48c7293a242fc8099 +#+containers.8b7c5df7c6008c90e66a7a23bb1b49399f6a3a269b567ae94852f3d17d85863a +#+xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 -#+apk-tools.a4c58e6d53fb30e2373ffcae7463a91abc677b9021bc1bfe7c72478a798fbe8c +#+apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa #+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.a5eba1dac0d0ba65dc34f52b07a22ec5f0bcaac36e31eea7c2e1adc9e94c59ae +#+libressl.a4cd21faaf27a6507f54f2b1254a95643eab1b19b22b162083d4547efdbe50a4 #@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.48b39041dc6c9266d58856413e5cc7bb5043967b42f523fdc9ddbf77a22da7e7 +#+rsync.ba5e1b943d7caedd402b472208d5450dd417de7bd509aac5bf46f94d73bbc907 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e #+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f @@ -15,20 +15,20 @@ #+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c #+mdevd.ce53dc40e066f620a163354acb732a70f019902cf9dbdb45571d368eaf4f67b8 #+s6-dns.e65a0e1310967e0d4b18fd597993a364969fd35d50d35ba9eb2fd3fc68ffdf4b -#+libressl.a5eba1dac0d0ba65dc34f52b07a22ec5f0bcaac36e31eea7c2e1adc9e94c59ae -#+s6-networking.5fdc386cbbd6b38cfeb4ba918d1c4cc1450d56354ddc4a1984b8eaf553eef020 +#+libressl.a4cd21faaf27a6507f54f2b1254a95643eab1b19b22b162083d4547efdbe50a4 +#+s6-networking.0e3af335ef0081a0b709d8b9792364ac29eb87353bc2a1cc474c397f190bd8bf #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.66c08019e6125248784cf2ef49c3bdd4877dff2cf635dae4a194f5effa8d0ad0 +#+containers.8b7c5df7c6008c90e66a7a23bb1b49399f6a3a269b567ae94852f3d17d85863a #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 -#+curl.214d62c45d5a6270eff6d2e129180dec42e4c592423b9d8a2dc6b0fa5ac5d624 -#+git.7ff81c3a388b051b9817fa0b4c52391be01fa75156d475df115046cc9c6699c9 -#+xbps.3a34b6585e7e877ed85c9a900a5ce11b7d98af9aa1b4ddd48c7293a242fc8099 -#+apk-tools.a4c58e6d53fb30e2373ffcae7463a91abc677b9021bc1bfe7c72478a798fbe8c +#+curl.21ad0cb79fe4506199334186bf7ab7f83815f77114417dd3b8075a87e9d5f3bf +#+git.6fc9e69050600960d40841040e0f44025dca5487b1aa670d1d9a381ac25b192d +#+xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d +#+apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa #+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97 #+getconf.2d8409e202963fe34a70113b3fed7da0299f212d739c84f529126f9451886e7e #+iconv.b537e50837859e5b0fa7cc56ee46ff152c638910b9c817cba957f09631c9aad1 @@ -37,8 +37,8 @@ #+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac #+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca #+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296 -#+system-config.d3efbfa341805502c81c19ad304cb61eb7d797d3d4d42a97c33d7267ea270d61 -#+system-config-rc.35d4a75a11e6ba7501a161a3167cc330100c0c113ce7e8857ba5bc0c193ec18e +#+system-config.8dea000cecbad6572ce17e04b6bbed935fe3fccd5dc96f9640c50f4082f7225c +#+system-config-rc.00d4192630e5b74ce1864684d7476f794972bc3837ef4d06dbf13bdd9670883b #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378 -#+system-config-init.cd7ecec38237e2ae3e3996aed550313006f5e8fc45d40ca2b9f506060d99c835 +#+system-config-init.4c56c9b327584525283826301c0d8ec8b34ef34270678a851577db41510697de #+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.a5eba1dac0d0ba65dc34f52b07a22ec5f0bcaac36e31eea7c2e1adc9e94c59ae -#+curl.214d62c45d5a6270eff6d2e129180dec42e4c592423b9d8a2dc6b0fa5ac5d624 +#+libressl.a4cd21faaf27a6507f54f2b1254a95643eab1b19b22b162083d4547efdbe50a4 +#+curl.21ad0cb79fe4506199334186bf7ab7f83815f77114417dd3b8075a87e9d5f3bf #@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.53e055dd1dad53041cb08c6256f4537ac49c66008c9245668e667c9ffdf68f25- \ No newline at end of file +#+linux.ba0b0e3f4004b4d2c4b2ab33ac2a4d2a12917c410b85421d173c65cac6bee057+ \ No newline at end of file diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl @@ -76,11 +76,11 @@ cp -a certs/ca-certificates.crt cert.pem cd "$pthbs_destdir/$prefix/" mkdir -p env # for s6-networking -printf >env/CADIR '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +printf >env/CADIR '%s\n' "$prefix/config/ssl/certs" # for curl -printf >env/SSL_CERT_DIR '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +printf >env/SSL_CERT_DIR '%s\n' "$prefix/config/ssl/certs" # for git -printf >env/GIT_SSL_CAPATH '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +printf >env/GIT_SSL_CAPATH '%s\n' "$prefix/config/ssl/certs" 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.48b39041dc6c9266d58856413e5cc7bb5043967b42f523fdc9ddbf77a22da7e7 +#+rsync.ba5e1b943d7caedd402b472208d5450dd417de7bd509aac5bf46f94d73bbc907 #+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.a5eba1dac0d0ba65dc34f52b07a22ec5f0bcaac36e31eea7c2e1adc9e94c59ae +#+libressl.a4cd21faaf27a6507f54f2b1254a95643eab1b19b22b162083d4547efdbe50a4 #+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.a5eba1dac0d0ba65dc34f52b07a22ec5f0bcaac36e31eea7c2e1adc9e94c59ae +#+libressl.a4cd21faaf27a6507f54f2b1254a95643eab1b19b22b162083d4547efdbe50a4 #@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.48b39041dc6c9266d58856413e5cc7bb5043967b42f523fdc9ddbf77a22da7e7 +#+rsync.ba5e1b943d7caedd402b472208d5450dd417de7bd509aac5bf46f94d73bbc907 #+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.9caf3aa3e5b9f65ddba9f68327fd21b6e0a422451fe097861c16381ac123a81c' \ + 'pthbs_path_containers=/versions/env.54cd87aca52d8aaac63a9a4f297495349cccf71f9c06a6aa0c46e1816c1105bf' \ '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.35d4a75a11e6ba7501a161a3167cc330100c0c113ce7e8857ba5bc0c193ec18e +#+system-config-rc.00d4192630e5b74ce1864684d7476f794972bc3837ef4d06dbf13bdd9670883b -s6rcdb=/versions/system-config-rc.35d4a75a11e6ba7501a161a3167cc330100c0c113ce7e8857ba5bc0c193ec18e/config/s6-rc-db +s6rcdb=/versions/system-config-rc.00d4192630e5b74ce1864684d7476f794972bc3837ef4d06dbf13bdd9670883b/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.d3efbfa341805502c81c19ad304cb61eb7d797d3d4d42a97c33d7267ea270d61 +#+system-config.8dea000cecbad6572ce17e04b6bbed935fe3fccd5dc96f9640c50f4082f7225c def_prefix() { prefix=/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/versions/system-config.d3efbfa341805502c81c19ad304cb61eb7d797d3d4d42a97c33d7267ea270d61/config/s6-rc-source +src=/versions/system-config.8dea000cecbad6572ce17e04b6bbed935fe3fccd5dc96f9640c50f4082f7225c/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.48b39041dc6c9266d58856413e5cc7bb5043967b42f523fdc9ddbf77a22da7e7 +#+rsync.ba5e1b943d7caedd402b472208d5450dd417de7bd509aac5bf46f94d73bbc907 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e #+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f @@ -15,20 +15,20 @@ #+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c #+mdevd.ce53dc40e066f620a163354acb732a70f019902cf9dbdb45571d368eaf4f67b8 #+s6-dns.e65a0e1310967e0d4b18fd597993a364969fd35d50d35ba9eb2fd3fc68ffdf4b -#+libressl.a5eba1dac0d0ba65dc34f52b07a22ec5f0bcaac36e31eea7c2e1adc9e94c59ae -#+s6-networking.5fdc386cbbd6b38cfeb4ba918d1c4cc1450d56354ddc4a1984b8eaf553eef020 +#+libressl.a4cd21faaf27a6507f54f2b1254a95643eab1b19b22b162083d4547efdbe50a4 +#+s6-networking.0e3af335ef0081a0b709d8b9792364ac29eb87353bc2a1cc474c397f190bd8bf #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.66c08019e6125248784cf2ef49c3bdd4877dff2cf635dae4a194f5effa8d0ad0 +#+containers.8b7c5df7c6008c90e66a7a23bb1b49399f6a3a269b567ae94852f3d17d85863a #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 -#+curl.214d62c45d5a6270eff6d2e129180dec42e4c592423b9d8a2dc6b0fa5ac5d624 -#+git.7ff81c3a388b051b9817fa0b4c52391be01fa75156d475df115046cc9c6699c9 -#+xbps.3a34b6585e7e877ed85c9a900a5ce11b7d98af9aa1b4ddd48c7293a242fc8099 -#+apk-tools.a4c58e6d53fb30e2373ffcae7463a91abc677b9021bc1bfe7c72478a798fbe8c +#+curl.21ad0cb79fe4506199334186bf7ab7f83815f77114417dd3b8075a87e9d5f3bf +#+git.6fc9e69050600960d40841040e0f44025dca5487b1aa670d1d9a381ac25b192d +#+xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d +#+apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa #+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.a5eba1dac0d0ba65dc34f52b07a22ec5f0bcaac36e31eea7c2e1adc9e94c59ae +#+libressl.a4cd21faaf27a6507f54f2b1254a95643eab1b19b22b162083d4547efdbe50a4 #+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.