commit 8f44eac45243bb87f3874af01e932d1402cfd372 parent bdc8fbb212a17d891247218fc853ee8dbf8576f8 Author: Jan Pobrislo <ccx@te2000.cz> Date: Fri, 10 Oct 2025 12:13:42 +0000 set src_dir for single_static_c packages Diffstat:
57 files changed, 147 insertions(+), 142 deletions(-)
diff --git a/templates/pkg/applyuidgid-caps b/templates/pkg/applyuidgid-caps @@ -1,3 +1,4 @@ +{%- set src_dir="." -%} {% extends "single_static_c" %} {%- block package_deps -%} #+{{pkg_install_name("skalibs")}} diff --git a/templates/pkg/certdata2pem b/templates/pkg/certdata2pem @@ -1,3 +1,4 @@ +{%- set src_dir="." -%} {% extends "single_static_c" %} {% block configure -%} CFLAGS="-D_GNU_SOURCE" diff --git a/templates/pkg/getconf b/templates/pkg/getconf @@ -1,3 +1,4 @@ +{%- set src_dir="." -%} {% extends "single_static_c" %} {% block source_deps -%} #@{{ downloads[shortname + ".c"] }}:{{ shortname }}.c diff --git a/templates/pkg/getent b/templates/pkg/getent @@ -1,3 +1,4 @@ +{%- set src_dir="." -%} {% extends "single_static_c" %} {% block source_deps -%} #@{{ downloads[shortname + ".c"] }}:{{ shortname }}.c diff --git a/templates/pkg/iconv b/templates/pkg/iconv @@ -1,3 +1,4 @@ +{%- set src_dir="." -%} {% extends "single_static_c" %} {% block source_deps -%} #@{{ downloads[shortname + ".c"] }}:{{ shortname }}.c diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools @@ -5,7 +5,7 @@ #+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 #+patch.1277150e09a29ef07de0af15ab084aa11115503e5925662adec34fb76fb48613 -#+libressl.0e4223ff2782c34729032a27df4123ed0af9612538311bd07dce948cff8649be +#+libressl.b3844633a4825247b8979b715e1fd1d3507a727aed4772c866694a5020ddc6e9 #+zstd.60eec0a0fba37da9f688bfffa76d2ec3b0629a7b41cce3fbf7830fe4a21e4af5 #+pkgconf-pkg-config.dc86bd9000166941bce3409ce80b5b66fdf22eeebf40ae49feb243ad93ae07d6 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps @@ -10,7 +10,7 @@ # - build script start - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'applyuidgid-caps' +cd '.' name='applyuidgid-caps' CFLAGS="-D_GNU_SOURCE" diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+linux.498377123da9665306564102cd50199a3194f231164a2ea623d9c10844fb525d +#+linux.9ef12fad296e8cc396179c2c166939ec05311f83066a93466c15257b7b765631 #+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 @@ -17,7 +17,7 @@ export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" # TODO: indirection via deps directory/symlink cat >>.config <<EOF -CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.498377123da9665306564102cd50199a3194f231164a2ea623d9c10844fb525d" +CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.9ef12fad296e8cc396179c2c166939ec05311f83066a93466c15257b7b765631" EOF diff --git a/variants/ccx-x86_64/ca-certificates-wip-donotuse b/variants/ccx-x86_64/ca-certificates-wip-donotuse @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 #+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f -#+certdata2pem.a1db383ca5817469392a3bdb217597ba020e1f8259fb4329d24a319f86f5b9cc +#+certdata2pem.b62b174c8a66432d12a7651a949b42f7e63ae76a5897e232ddf741075f330328 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem @@ -8,7 +8,7 @@ # - build script start - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'certdata2pem' +cd '.' name='certdata2pem' CFLAGS="-D_GNU_SOURCE" diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -5,7 +5,7 @@ #+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 #+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 #+ccx-utils.c5928357a87b486399ba68cb01c600d6c08a577156ae2a065d7ec4838351d423 -#+applyuidgid-caps.73f474cfbdbd7a37aca94b4b1c413b332834fca4791dc1ecebbe2fe6d51696d2 +#+applyuidgid-caps.6beed61c5f64573989a9e745689797ed0f9039ec69bab2b5b6306c2028b542fe #+easyseccomp.46dac91d4560e81a032da86500bfc24ab337787d24d546b7cfa6b6cc5335c5e7 #+mlog.c84070d774d221a0b227a54128d534959609f1e717cdd0dca461161a43c4e1a4 #+abduco.d3c963a78ff52e04636f5b8d275331cdf4537aba236e77663ae8d077e9b8c541 diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -5,9 +5,9 @@ #+pthbs-banginstall.21975d3e01147afc4c0efc21c223a55e64a78e16616411eb99f1b6a006784240 #+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 #+alpine-keys.5d43a7a9f0d954fd25fa71962b4fa29d51182dc1d69f408dacc4f1be93dfa8cf -#+apk-tools.7a85ff03464f0b8a38efc9f3ece382a1ddf4e4bd67dfcf7dcf457de78ddb29d9 -#+xbps.97be05ceb9743ff360a3d8ef7d90ac1f3d06676c684d06df1611328aeaf40a6b -#+container-bin-image.90ca7462a0bed6348abbdbc4d0010aab1f3a94a9ad77947e98bff9038bd65b0d +#+apk-tools.af402b875bdb1e237531811a48a42243c979f64c4872d661dd2a7b56eef61203 +#+xbps.97e3cfd2ee9858de0f821dd69925a4f5e002d0578dd836855394af9229f6aed6 +#+container-bin-image.6b07c6e683f1e0b0f2bacb9894efdd836aa1a6f993cda1eb8bf40ebbcb2def6c #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -47,8 +47,8 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "${dest}/deps/command" -ln -sf '/home/ccx/versions/apk-tools.7a85ff03464f0b8a38efc9f3ece382a1ddf4e4bd67dfcf7dcf457de78ddb29d9/command/apk.static' "${dest}/deps/command/" -ln -sf '/home/ccx/versions/xbps.97be05ceb9743ff360a3d8ef7d90ac1f3d06676c684d06df1611328aeaf40a6b/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.af402b875bdb1e237531811a48a42243c979f64c4872d661dd2a7b56eef61203/command/apk.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/xbps.97e3cfd2ee9858de0f821dd69925a4f5e002d0578dd836855394af9229f6aed6/command/xbps-install.static' "${dest}/deps/command/" for f in '/home/ccx/versions/alpine-keys.5d43a7a9f0d954fd25fa71962b4fa29d51182dc1d69f408dacc4f1be93dfa8cf'/keys/alpine/*/*; do test -f "$f" @@ -58,13 +58,13 @@ for f in '/home/ccx/versions/alpine-keys.5d43a7a9f0d954fd25fa71962b4fa29d51182dc done mkdir -p "${dest}/deps/keys/void" -for f in '/home/ccx/versions/xbps.97be05ceb9743ff360a3d8ef7d90ac1f3d06676c684d06df1611328aeaf40a6b'/keys/void/*; do +for f in '/home/ccx/versions/xbps.97e3cfd2ee9858de0f821dd69925a4f5e002d0578dd836855394af9229f6aed6'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.90ca7462a0bed6348abbdbc4d0010aab1f3a94a9ad77947e98bff9038bd65b0d/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.90ca7462a0bed6348abbdbc4d0010aab1f3a94a9ad77947e98bff9038bd65b0d/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.90ca7462a0bed6348abbdbc4d0010aab1f3a94a9ad77947e98bff9038bd65b0d/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.6b07c6e683f1e0b0f2bacb9894efdd836aa1a6f993cda1eb8bf40ebbcb2def6c/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.6b07c6e683f1e0b0f2bacb9894efdd836aa1a6f993cda1eb8bf40ebbcb2def6c/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.6b07c6e683f1e0b0f2bacb9894efdd836aa1a6f993cda1eb8bf40ebbcb2def6c/container-bin-image' "${dest}/deps/" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -7,12 +7,12 @@ #+s6-linux-utils.2f79d8e46333e4fe48d42109298801446bbfd2e5ad99beef594e0f8ed5efebb0 #+zsh.adff89439e677923c0e87543c7279cae1cac203609cbdfb959d19f351ede0b40 #+confz.d7ee77236608ebb1286a0e6114c46918a81e96ea6d37c29f8bf9ac14f3a09d39 -#+containers.a0f6f914fd91ad4a397ae7d71826a14f11ba39a0f9d8437c2da35d2820d1a9d4 -#+xbps.97be05ceb9743ff360a3d8ef7d90ac1f3d06676c684d06df1611328aeaf40a6b +#+containers.a877f5c856f0e3eafe8c8606ae9152de26054b04206f6df32a0d94aee4ceb9f2 +#+xbps.97e3cfd2ee9858de0f821dd69925a4f5e002d0578dd836855394af9229f6aed6 #+zstd.60eec0a0fba37da9f688bfffa76d2ec3b0629a7b41cce3fbf7830fe4a21e4af5 -#+apk-tools.7a85ff03464f0b8a38efc9f3ece382a1ddf4e4bd67dfcf7dcf457de78ddb29d9 +#+apk-tools.af402b875bdb1e237531811a48a42243c979f64c4872d661dd2a7b56eef61203 #+alpine-keys.5d43a7a9f0d954fd25fa71962b4fa29d51182dc1d69f408dacc4f1be93dfa8cf -#+getent.60a0ad9aec2b36cfaad5cef527b8798602cb9d97aee585080e04455faa2ee74f +#+getent.aefe6654abc4482bdca73bcb0d7edee95a2eae874a4b6024acea75acfaf22bb9 #+fileset.7f773b04cd80b892a577a745fdd430cf38f1dea8b504a313f6d279f28e2c247f #+ccx-utils.c5928357a87b486399ba68cb01c600d6c08a577156ae2a065d7ec4838351d423 #+easyseccomp.46dac91d4560e81a032da86500bfc24ab337787d24d546b7cfa6b6cc5335c5e7 \ No newline at end of file diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl @@ -5,7 +5,7 @@ #+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #+m4.6b3d7791c2027569f0adafd5a1e2425685ec048cfd8a120a33e0d5824cf58cc6 -#+libressl.0e4223ff2782c34729032a27df4123ed0af9612538311bd07dce948cff8649be +#+libressl.b3844633a4825247b8979b715e1fd1d3507a727aed4772c866694a5020ddc6e9 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -6,7 +6,7 @@ #+patch.1277150e09a29ef07de0af15ab084aa11115503e5925662adec34fb76fb48613 #+flex.3ad3990e9165295406d5b4dfbab600bc8baba3835e525792c2f39321ff481625 #+bison.8fd32b35d9fb00cc67891e019e5e74d74090b14a0f9243696333cdfc46324e32 -#+rsync.d3497f122ed71df92eec2e112a88d27fbe60739745e5abf79cc5b714588f58bf +#+rsync.16f5b463a3d013c095155fffb730a41861a95b7d72ac259a287b527f84c992d4 #+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 #+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 #+s6-rc.e3be4a113ee9715f7238427bb1ad692d5aa75f52ca7f687a32a3a76a648c708b @@ -15,31 +15,31 @@ #+s6-linux-init.bbb6c6a78dc4aea8e726ad3143233439184ac9564e9e8b3210b0eabf9e7f8238 #+mdevd.26ce383b5715db033c9cd3707798a7c1ce1f9056caf987bab46bd4586fceca7a #+s6-dns.1db2b68f9b71a747f03b48b5f25ec094ece473653bb122d9bcf75ddf932a4ca5 -#+libressl.0e4223ff2782c34729032a27df4123ed0af9612538311bd07dce948cff8649be -#+s6-networking.713c28c16ef7458c2429011864459b524e4bf69380103ba9fe9726586dacb4c7 +#+libressl.b3844633a4825247b8979b715e1fd1d3507a727aed4772c866694a5020ddc6e9 +#+s6-networking.4d2b3dac0831feebaec6dfc2fd54aa388bb65ed6c8d1526fdf286cecf608763b #+zsh.adff89439e677923c0e87543c7279cae1cac203609cbdfb959d19f351ede0b40 #+pthbs-banginstall.21975d3e01147afc4c0efc21c223a55e64a78e16616411eb99f1b6a006784240 #+aat.fb06e78a9b8c1bbae1065e2663c52d2770c362765a4aa4e2800c9bceab61d97f #+confz.d7ee77236608ebb1286a0e6114c46918a81e96ea6d37c29f8bf9ac14f3a09d39 -#+containers.a0f6f914fd91ad4a397ae7d71826a14f11ba39a0f9d8437c2da35d2820d1a9d4 +#+containers.a877f5c856f0e3eafe8c8606ae9152de26054b04206f6df32a0d94aee4ceb9f2 #+fileset.7f773b04cd80b892a577a745fdd430cf38f1dea8b504a313f6d279f28e2c247f #+logincaps.2657a78b59801044237361ee333b4f9bf533f5f845f0aab75388848000dec1b4 #+snaprep.ddba28cca63c5a50ae9c9dcc69929c45bec505ac626f64dc02e3ebe7322f6b5d -#+curl.635a5fe71d60b43830f97908602cdb3ce41c58322f15838a1bf1d81522715618 -#+git.c57d07db443daf8b5aeea607721c8bd078716a45fcf2b67808f2f9acb71d2b95 -#+xbps.97be05ceb9743ff360a3d8ef7d90ac1f3d06676c684d06df1611328aeaf40a6b -#+apk-tools.7a85ff03464f0b8a38efc9f3ece382a1ddf4e4bd67dfcf7dcf457de78ddb29d9 -#+getent.60a0ad9aec2b36cfaad5cef527b8798602cb9d97aee585080e04455faa2ee74f -#+getconf.db8807c07fd38d5fa40b5a6db9268b3436f7e8b12f45842ccb4825d20196afd8 -#+iconv.46ec2e37c5aa47dd5851ef45ca3343e3c6df895f79a4ba8fddbe2a9c2e52091b +#+curl.3167e593223472f7860604fb1488c3cc02c72a5e2f9feba2ffeb8587c3b9315b +#+git.bef266ed9d689ca898ca42e8e4a10d40c9f4b4e03a59d3c96b9888e31390acd3 +#+xbps.97e3cfd2ee9858de0f821dd69925a4f5e002d0578dd836855394af9229f6aed6 +#+apk-tools.af402b875bdb1e237531811a48a42243c979f64c4872d661dd2a7b56eef61203 +#+getent.aefe6654abc4482bdca73bcb0d7edee95a2eae874a4b6024acea75acfaf22bb9 +#+getconf.2841b5bda261d7de47781c9bda67fcf98a6bb0f4d057896228a65519d92904c6 +#+iconv.65ca192b9653738231bbbcf730dea15b4af7ef94528c85399496fb065a555251 #+libcap.67b33f3acf82937e9b968890011269d9f83a00d2d6aef120510d2dc017ff0606 -#+applyuidgid-caps.73f474cfbdbd7a37aca94b4b1c413b332834fca4791dc1ecebbe2fe6d51696d2 +#+applyuidgid-caps.6beed61c5f64573989a9e745689797ed0f9039ec69bab2b5b6306c2028b542fe #+ccx-utils.c5928357a87b486399ba68cb01c600d6c08a577156ae2a065d7ec4838351d423 #+user-env.86df1fabffc5a08d7d3251e9b766d68d7c062965331f31f02dc83d7ad02d9b1c #+strace.0e646991d4821d32b7816544a23a351bf463055f31e02975d4c01cde4b96e921 #+mlog.c84070d774d221a0b227a54128d534959609f1e717cdd0dca461161a43c4e1a4 -#+system-config.f3160a55ce25b0d05e0d29e0513b1b6b47b10144db028e5e3d3c01a1f65520cf -#+system-config-rc.bf185ee61aaec3e26e0800102970e785e7875f0ddc5ecc8796d4720e43603bda +#+system-config.7edd5e7027b8de5db27491a0588a0787162b6a5d5112bd93b722f920b5d4c04c +#+system-config-rc.5098cc0d19cf418650f0c9aa533647025b4a8d8998daaceaea5fd0408635d64b #+system-config-scripts.fcef84fd59fa5985e841d72a33de16a69f2836f3fa033887b6995a5b355580d2 -#+system-config-init.fa7ffccb7acdd19f9f016c9e4fa1410fa499321ab89317cef70e928754d19ef1 +#+system-config-init.88f0f64d3e78a86fe044ff6d1df3251e931f4b315bf8f9aa13e75b10f8e4657e #+system-config-zsh.c9f9132c6ed96f4962c8fef62d869912f35683f6d13811b395378849dce2174d \ No newline at end of file diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf @@ -8,7 +8,7 @@ # - build script start - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'getconf' +cd '.' name='getconf' diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent @@ -8,7 +8,7 @@ # - build script start - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'getent' +cd '.' name='getent' diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git @@ -5,8 +5,8 @@ #+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 #+m4.6b3d7791c2027569f0adafd5a1e2425685ec048cfd8a120a33e0d5824cf58cc6 -#+libressl.0e4223ff2782c34729032a27df4123ed0af9612538311bd07dce948cff8649be -#+curl.635a5fe71d60b43830f97908602cdb3ce41c58322f15838a1bf1d81522715618 +#+libressl.b3844633a4825247b8979b715e1fd1d3507a727aed4772c866694a5020ddc6e9 +#+curl.3167e593223472f7860604fb1488c3cc02c72a5e2f9feba2ffeb8587c3b9315b #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv @@ -8,7 +8,7 @@ # - build script start - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'iconv' +cd '.' name='iconv' diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment @@ -1,3 +1,3 @@ #!/usr/bin/env pthbs-build -#+linux.498377123da9665306564102cd50199a3194f231164a2ea623d9c10844fb525d -#+busybox.b32e71b2ace0845a796409e61ccb90445a444e25faf64081412fae0419190ad3- \ No newline at end of file +#+linux.9ef12fad296e8cc396179c2c166939ec05311f83066a93466c15257b7b765631 +#+busybox.ca6ec8bfc77c27856f041b668e6c3528257bf258574472073f4b0c83cefa1ab4+ \ No newline at end of file diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl @@ -5,7 +5,7 @@ #+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #+m4.6b3d7791c2027569f0adafd5a1e2425685ec048cfd8a120a33e0d5824cf58cc6 -#+ca-certificates-wip-donotuse.2aceae5f95544f48b1721667d1d70ab7d86f8362d9500ca0dfbe500c73387187 +#+ca-certificates-wip-donotuse.e45b8f0cb65664ce027298eb2673863809b5489c2ae75da660ec5d31ebde1673 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. @@ -71,7 +71,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) 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.2aceae5f95544f48b1721667d1d70ab7d86f8362d9500ca0dfbe500c73387187/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.e45b8f0cb65664ce027298eb2673863809b5489c2ae75da660ec5d31ebde1673/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" ./c_rehash "$pthbs_destdir/$prefix/config/ssl/certs/" cd "$pthbs_destdir/$prefix/config/ssl/" mv cert.pem libressl-cert.pem diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux @@ -7,7 +7,7 @@ #+patch.1277150e09a29ef07de0af15ab084aa11115503e5925662adec34fb76fb48613 #+flex.3ad3990e9165295406d5b4dfbab600bc8baba3835e525792c2f39321ff481625 #+bison.8fd32b35d9fb00cc67891e019e5e74d74090b14a0f9243696333cdfc46324e32 -#+rsync.d3497f122ed71df92eec2e112a88d27fbe60739745e5abf79cc5b714588f58bf +#+rsync.16f5b463a3d013c095155fffb730a41861a95b7d72ac259a287b527f84c992d4 #+zstd.60eec0a0fba37da9f688bfffa76d2ec3b0629a7b41cce3fbf7830fe4a21e4af5 #+libelf.52606be181390441db69e106a2a8217d87fb150d0cc13b815ee729a7065eed5b #+pkgconf-pkg-config.dc86bd9000166941bce3409ce80b5b66fdf22eeebf40ae49feb243ad93ae07d6 diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest @@ -7,7 +7,7 @@ #+patch.1277150e09a29ef07de0af15ab084aa11115503e5925662adec34fb76fb48613 #+flex.3ad3990e9165295406d5b4dfbab600bc8baba3835e525792c2f39321ff481625 #+bison.8fd32b35d9fb00cc67891e019e5e74d74090b14a0f9243696333cdfc46324e32 -#+rsync.d3497f122ed71df92eec2e112a88d27fbe60739745e5abf79cc5b714588f58bf +#+rsync.16f5b463a3d013c095155fffb730a41861a95b7d72ac259a287b527f84c992d4 #+zstd.60eec0a0fba37da9f688bfffa76d2ec3b0629a7b41cce3fbf7830fe4a21e4af5 #+libelf.52606be181390441db69e106a2a8217d87fb150d0cc13b815ee729a7065eed5b #+pkgconf-pkg-config.dc86bd9000166941bce3409ce80b5b66fdf22eeebf40ae49feb243ad93ae07d6 diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync @@ -6,7 +6,7 @@ #+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #+m4.6b3d7791c2027569f0adafd5a1e2425685ec048cfd8a120a33e0d5824cf58cc6 #+popt.b70745c0bdf49278bc639e6f4bf6329f0cdd7a0baae60a5e83be937956abca16 -#+libressl.0e4223ff2782c34729032a27df4123ed0af9612538311bd07dce948cff8649be +#+libressl.b3844633a4825247b8979b715e1fd1d3507a727aed4772c866694a5020ddc6e9 #+zstd.60eec0a0fba37da9f688bfffa76d2ec3b0629a7b41cce3fbf7830fe4a21e4af5 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking @@ -7,7 +7,7 @@ #+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 #+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 #+s6-dns.1db2b68f9b71a747f03b48b5f25ec094ece473653bb122d9bcf75ddf932a4ca5 -#+libressl.0e4223ff2782c34729032a27df4123ed0af9612538311bd07dce948cff8649be +#+libressl.b3844633a4825247b8979b715e1fd1d3507a727aed4772c866694a5020ddc6e9 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -5,7 +5,7 @@ #+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #+aat.fb06e78a9b8c1bbae1065e2663c52d2770c362765a4aa4e2800c9bceab61d97f #+fileset.7f773b04cd80b892a577a745fdd430cf38f1dea8b504a313f6d279f28e2c247f -#+rsync.d3497f122ed71df92eec2e112a88d27fbe60739745e5abf79cc5b714588f58bf +#+rsync.16f5b463a3d013c095155fffb730a41861a95b7d72ac259a287b527f84c992d4 #+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 #+kbd.36a5479f7570bf993240d126c8210b64c51406cd417b531e06d986674fcb6b0f #+mdevd.26ce383b5715db033c9cd3707798a7c1ce1f9056caf987bab46bd4586fceca7a @@ -50,7 +50,7 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/home/ccx/versions/env.c835e3f646a88b44833e36651a47af01a6fa6a9c36dd47966cc7c804291658a0' \ + 'pthbs_path_containers=/home/ccx/versions/env.75c4f07e85f49100f547b8a0523927092bf3ac5af1b550eefec5f1ca45cb2f1b' \ 'pthbs_path_mdevd=/home/ccx/versions/env.30496f67fe2b41d2e3beb270ac5306c5f8a86dd9f1d7ed61ebe69343c1b0497b' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -6,7 +6,7 @@ #+s6-portable-utils.171f71742faa2f5265177ddf14a06b967498cfee79e6899a4aa6f32023e7b2fd #+s6-linux-init.bbb6c6a78dc4aea8e726ad3143233439184ac9564e9e8b3210b0eabf9e7f8238 #+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 -#+system-config-rc.bf185ee61aaec3e26e0800102970e785e7875f0ddc5ecc8796d4720e43603bda +#+system-config-rc.5098cc0d19cf418650f0c9aa533647025b4a8d8998daaceaea5fd0408635d64b # - build script start - @@ -29,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/home/ccx/versions/system-config-rc.bf185ee61aaec3e26e0800102970e785e7875f0ddc5ecc8796d4720e43603bda/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.5098cc0d19cf418650f0c9aa533647025b4a8d8998daaceaea5fd0408635d64b/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//home/ccx/versions" diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc @@ -4,7 +4,7 @@ #+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 #+s6-rc.e3be4a113ee9715f7238427bb1ad692d5aa75f52ca7f687a32a3a76a648c708b #+fileset.7f773b04cd80b892a577a745fdd430cf38f1dea8b504a313f6d279f28e2c247f -#+system-config.f3160a55ce25b0d05e0d29e0513b1b6b47b10144db028e5e3d3c01a1f65520cf +#+system-config.7edd5e7027b8de5db27491a0588a0787162b6a5d5112bd93b722f920b5d4c04c # - build script start - @@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/home/ccx/versions/system-config.f3160a55ce25b0d05e0d29e0513b1b6b47b10144db028e5e3d3c01a1f65520cf/config/s6-rc-source +src=/home/ccx/versions/system-config.7edd5e7027b8de5db27491a0588a0787162b6a5d5112bd93b722f920b5d4c04c/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.1277150e09a29ef07de0af15ab084aa11115503e5925662adec34fb76fb48613 #+flex.3ad3990e9165295406d5b4dfbab600bc8baba3835e525792c2f39321ff481625 #+bison.8fd32b35d9fb00cc67891e019e5e74d74090b14a0f9243696333cdfc46324e32 -#+rsync.d3497f122ed71df92eec2e112a88d27fbe60739745e5abf79cc5b714588f58bf +#+rsync.16f5b463a3d013c095155fffb730a41861a95b7d72ac259a287b527f84c992d4 #+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 #+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 #+s6-rc.e3be4a113ee9715f7238427bb1ad692d5aa75f52ca7f687a32a3a76a648c708b @@ -15,25 +15,25 @@ #+s6-linux-init.bbb6c6a78dc4aea8e726ad3143233439184ac9564e9e8b3210b0eabf9e7f8238 #+mdevd.26ce383b5715db033c9cd3707798a7c1ce1f9056caf987bab46bd4586fceca7a #+s6-dns.1db2b68f9b71a747f03b48b5f25ec094ece473653bb122d9bcf75ddf932a4ca5 -#+libressl.0e4223ff2782c34729032a27df4123ed0af9612538311bd07dce948cff8649be -#+s6-networking.713c28c16ef7458c2429011864459b524e4bf69380103ba9fe9726586dacb4c7 +#+libressl.b3844633a4825247b8979b715e1fd1d3507a727aed4772c866694a5020ddc6e9 +#+s6-networking.4d2b3dac0831feebaec6dfc2fd54aa388bb65ed6c8d1526fdf286cecf608763b #+zsh.adff89439e677923c0e87543c7279cae1cac203609cbdfb959d19f351ede0b40 #+pthbs-banginstall.21975d3e01147afc4c0efc21c223a55e64a78e16616411eb99f1b6a006784240 #+aat.fb06e78a9b8c1bbae1065e2663c52d2770c362765a4aa4e2800c9bceab61d97f #+confz.d7ee77236608ebb1286a0e6114c46918a81e96ea6d37c29f8bf9ac14f3a09d39 -#+containers.a0f6f914fd91ad4a397ae7d71826a14f11ba39a0f9d8437c2da35d2820d1a9d4 +#+containers.a877f5c856f0e3eafe8c8606ae9152de26054b04206f6df32a0d94aee4ceb9f2 #+fileset.7f773b04cd80b892a577a745fdd430cf38f1dea8b504a313f6d279f28e2c247f #+logincaps.2657a78b59801044237361ee333b4f9bf533f5f845f0aab75388848000dec1b4 #+snaprep.ddba28cca63c5a50ae9c9dcc69929c45bec505ac626f64dc02e3ebe7322f6b5d -#+curl.635a5fe71d60b43830f97908602cdb3ce41c58322f15838a1bf1d81522715618 -#+git.c57d07db443daf8b5aeea607721c8bd078716a45fcf2b67808f2f9acb71d2b95 -#+xbps.97be05ceb9743ff360a3d8ef7d90ac1f3d06676c684d06df1611328aeaf40a6b -#+apk-tools.7a85ff03464f0b8a38efc9f3ece382a1ddf4e4bd67dfcf7dcf457de78ddb29d9 -#+getent.60a0ad9aec2b36cfaad5cef527b8798602cb9d97aee585080e04455faa2ee74f -#+getconf.db8807c07fd38d5fa40b5a6db9268b3436f7e8b12f45842ccb4825d20196afd8 -#+iconv.46ec2e37c5aa47dd5851ef45ca3343e3c6df895f79a4ba8fddbe2a9c2e52091b +#+curl.3167e593223472f7860604fb1488c3cc02c72a5e2f9feba2ffeb8587c3b9315b +#+git.bef266ed9d689ca898ca42e8e4a10d40c9f4b4e03a59d3c96b9888e31390acd3 +#+xbps.97e3cfd2ee9858de0f821dd69925a4f5e002d0578dd836855394af9229f6aed6 +#+apk-tools.af402b875bdb1e237531811a48a42243c979f64c4872d661dd2a7b56eef61203 +#+getent.aefe6654abc4482bdca73bcb0d7edee95a2eae874a4b6024acea75acfaf22bb9 +#+getconf.2841b5bda261d7de47781c9bda67fcf98a6bb0f4d057896228a65519d92904c6 +#+iconv.65ca192b9653738231bbbcf730dea15b4af7ef94528c85399496fb065a555251 #+libcap.67b33f3acf82937e9b968890011269d9f83a00d2d6aef120510d2dc017ff0606 -#+applyuidgid-caps.73f474cfbdbd7a37aca94b4b1c413b332834fca4791dc1ecebbe2fe6d51696d2 +#+applyuidgid-caps.6beed61c5f64573989a9e745689797ed0f9039ec69bab2b5b6306c2028b542fe #+ccx-utils.c5928357a87b486399ba68cb01c600d6c08a577156ae2a065d7ec4838351d423 #+user-env.86df1fabffc5a08d7d3251e9b766d68d7c062965331f31f02dc83d7ad02d9b1c #+strace.0e646991d4821d32b7816544a23a351bf463055f31e02975d4c01cde4b96e921 diff --git a/variants/ccx-x86_64/vm.environment b/variants/ccx-x86_64/vm.environment @@ -1,2 +1,2 @@ #!/usr/bin/env pthbs-build -#+linux-qemu-guest.69520c1b5aed16041a6a4f0e0d61da2410e0be7023bf6ef760ede7c25436ac1b- \ No newline at end of file +#+linux-qemu-guest.aaccc1bc03ad28833cf9e0a8f10d3ddf2275330767363937e027c96b4f227900+ \ No newline at end of file diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps @@ -2,7 +2,7 @@ #+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 #+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f #+libarchive.ec4caa747f19f72eca7f9c0f44c639e9ff7c1a4d786b72a3e1ef2c6a407b3ca9 -#+libressl.0e4223ff2782c34729032a27df4123ed0af9612538311bd07dce948cff8649be +#+libressl.b3844633a4825247b8979b715e1fd1d3507a727aed4772c866694a5020ddc6e9 #+pkgconf-pkg-config.dc86bd9000166941bce3409ce80b5b66fdf22eeebf40ae49feb243ad93ae07d6 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools @@ -5,7 +5,7 @@ #+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 #+patch.979dd142dbb50a2396529aa17b650cf51e2f394b39b14336cc6939805c9d7379 -#+libressl.6ad2db3b5fde5d6fa1f882d91b1c6429447317409ae0caed9fba9f97842c7df4 +#+libressl.ecd089b63222b6d2d8574961d0d10ba37071baa6bfaa1d38f1b369ece8f2ad56 #+zstd.c0b8bcba8a27ce5d349790a9588c0d5e3a0668658b31f3fee630eead62d7a22a #+pkgconf-pkg-config.7bbbc6f27f84ce65804e298304ce25154c1a92d9ca1c2b353d9148c5687e3864 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps @@ -10,7 +10,7 @@ # - build script start - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'applyuidgid-caps' +cd '.' name='applyuidgid-caps' CFLAGS="-D_GNU_SOURCE" diff --git a/variants/root-x86_64/busybox:modutils b/variants/root-x86_64/busybox:modutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+linux.72c97e9234f37ccaef90b77f3fcf57c8cdcb5642eadba0cf43d420f3d49b1f29 +#+linux.82682aaf7c1886ad35beba606e7bdc490c4bd6760244a2451ccb2cdcae6dec9b #+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 @@ -17,7 +17,7 @@ export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" # TODO: indirection via deps directory/symlink cat >>.config <<EOF -CONFIG_DEFAULT_MODULES_DIR="/versions/linux.72c97e9234f37ccaef90b77f3fcf57c8cdcb5642eadba0cf43d420f3d49b1f29" +CONFIG_DEFAULT_MODULES_DIR="/versions/linux.82682aaf7c1886ad35beba606e7bdc490c4bd6760244a2451ccb2cdcae6dec9b" EOF diff --git a/variants/root-x86_64/ca-certificates-wip-donotuse b/variants/root-x86_64/ca-certificates-wip-donotuse @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 #+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 -#+certdata2pem.16385793a47d368b5c3a153d608ac4a21e701917057efc9f37c6ddc711b2d6e2 +#+certdata2pem.7a7d557966addaeee929e43e518829ae4b157940700744115fb22b4fa795e82e #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem @@ -8,7 +8,7 @@ # - build script start - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'certdata2pem' +cd '.' name='certdata2pem' CFLAGS="-D_GNU_SOURCE" diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -5,7 +5,7 @@ #+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 #+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 #+ccx-utils.44f8a3d6ec19d6da0bfbfdf73577bebedb8c6f046fb105609138bf59794b7d87 -#+applyuidgid-caps.74e93aa2a95831c61353a13d96bbaf8345bbd7d7ffa4535ae30cd579c2647318 +#+applyuidgid-caps.24cd678aacaa2c4656769739da05cf6630b2175b79bcba193b2c89cde34acabc #+easyseccomp.520e49deae166e5d575fae91ba142bddcaed4282bd27a7d4aa152d8b022cab0d #+mlog.f6e876fbff20d311c177432ca821cc33b98f205d343105aa37ef81d40fdf1bc0 #+abduco.cb1ff92df788b2fdd674286b7aee6712b1ca36bc4f312d5fa1aa8eb24f7d3058 diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -5,9 +5,9 @@ #+pthbs-banginstall.c778079de6b3c448b7670c1d09474bfecbd64658c11e75734cf48a85196ca318 #+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 #+alpine-keys.8fcbad8520af4e46aeb6560fe86202e9cd8ade32b7f4909df4283bdf8a98f03f -#+apk-tools.26ff46ce321cf746d8c47d1562299a299701d618e0d871b98b5463cf28152d20 -#+xbps.8fd1c758f8d987cd0e25da010744551f316b8b90761ea1a30d2d031068ad43d6 -#+container-bin-image.0bad941af9b6f7c57a6480f07797b8768a28b689286a10d3b21387506d0676d5 +#+apk-tools.43e2773cf7ba7947227a50224c4114cb2e90725e5ce677ef15ca88549c317518 +#+xbps.d9fb16a1353ddd5f037638875faa46ddb6980fcdc62ba298078fba8a3218fe8b +#+container-bin-image.9d13c0804a78327340af74b59c41e1d2be51373014f2ab22f462c383ce66379e #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -47,8 +47,8 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "${dest}/deps/command" -ln -sf '/versions/apk-tools.26ff46ce321cf746d8c47d1562299a299701d618e0d871b98b5463cf28152d20/command/apk.static' "${dest}/deps/command/" -ln -sf '/versions/xbps.8fd1c758f8d987cd0e25da010744551f316b8b90761ea1a30d2d031068ad43d6/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/versions/apk-tools.43e2773cf7ba7947227a50224c4114cb2e90725e5ce677ef15ca88549c317518/command/apk.static' "${dest}/deps/command/" +ln -sf '/versions/xbps.d9fb16a1353ddd5f037638875faa46ddb6980fcdc62ba298078fba8a3218fe8b/command/xbps-install.static' "${dest}/deps/command/" for f in '/versions/alpine-keys.8fcbad8520af4e46aeb6560fe86202e9cd8ade32b7f4909df4283bdf8a98f03f'/keys/alpine/*/*; do test -f "$f" @@ -58,13 +58,13 @@ for f in '/versions/alpine-keys.8fcbad8520af4e46aeb6560fe86202e9cd8ade32b7f4909d done mkdir -p "${dest}/deps/keys/void" -for f in '/versions/xbps.8fd1c758f8d987cd0e25da010744551f316b8b90761ea1a30d2d031068ad43d6'/keys/void/*; do +for f in '/versions/xbps.d9fb16a1353ddd5f037638875faa46ddb6980fcdc62ba298078fba8a3218fe8b'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.0bad941af9b6f7c57a6480f07797b8768a28b689286a10d3b21387506d0676d5/container-bin-image' -test -f '/versions/container-bin-image.0bad941af9b6f7c57a6480f07797b8768a28b689286a10d3b21387506d0676d5/container-bin-image/if' -ln -sf '/versions/container-bin-image.0bad941af9b6f7c57a6480f07797b8768a28b689286a10d3b21387506d0676d5/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.9d13c0804a78327340af74b59c41e1d2be51373014f2ab22f462c383ce66379e/container-bin-image' +test -f '/versions/container-bin-image.9d13c0804a78327340af74b59c41e1d2be51373014f2ab22f462c383ce66379e/container-bin-image/if' +ln -sf '/versions/container-bin-image.9d13c0804a78327340af74b59c41e1d2be51373014f2ab22f462c383ce66379e/container-bin-image' "${dest}/deps/" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -7,12 +7,12 @@ #+s6-linux-utils.37b19062018cb44159d0c2b2e08b3e098134c767810ef243455abaffe4c48bf2 #+zsh.01a31d86cd787f4ac02a6e672a26990184f9a7994a6daeac7197b37447ce273a #+confz.bc3491bab75ab7de12e29d4614347f3b3c90b4987012c5817284775b89f46ff6 -#+containers.8ae72586622ac7593d715a0a6753408a1be0128db81685a251fde2711df1f005 -#+xbps.8fd1c758f8d987cd0e25da010744551f316b8b90761ea1a30d2d031068ad43d6 +#+containers.3090ac7a65c9eb7d978cafb5c4ac2687b0bdd48fd4ddc3268d0df6cb36597af8 +#+xbps.d9fb16a1353ddd5f037638875faa46ddb6980fcdc62ba298078fba8a3218fe8b #+zstd.c0b8bcba8a27ce5d349790a9588c0d5e3a0668658b31f3fee630eead62d7a22a -#+apk-tools.26ff46ce321cf746d8c47d1562299a299701d618e0d871b98b5463cf28152d20 +#+apk-tools.43e2773cf7ba7947227a50224c4114cb2e90725e5ce677ef15ca88549c317518 #+alpine-keys.8fcbad8520af4e46aeb6560fe86202e9cd8ade32b7f4909df4283bdf8a98f03f -#+getent.dd5870b1ea3d10659d7ebee0e300ddb11538c928c7cad10e57d26b860945425f +#+getent.07cccc7d53d18bc3cd261612d999cd6c6deb16f40960670899606e9044b9f440 #+fileset.215ca6d3fbfb730899911dffa91b92bbd8391f14b7639a6d0b37620d26e7f1ca #+ccx-utils.44f8a3d6ec19d6da0bfbfdf73577bebedb8c6f046fb105609138bf59794b7d87 #+easyseccomp.520e49deae166e5d575fae91ba142bddcaed4282bd27a7d4aa152d8b022cab0d \ No newline at end of file diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl @@ -5,7 +5,7 @@ #+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #+m4.3f3d010f1f1f14f7b2a0c5eb2fea37f77757d1cb404c6ddd69525d3f55af8009 -#+libressl.6ad2db3b5fde5d6fa1f882d91b1c6429447317409ae0caed9fba9f97842c7df4 +#+libressl.ecd089b63222b6d2d8574961d0d10ba37071baa6bfaa1d38f1b369ece8f2ad56 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -6,7 +6,7 @@ #+patch.979dd142dbb50a2396529aa17b650cf51e2f394b39b14336cc6939805c9d7379 #+flex.2237e4fdd5678fbacfef665fa1fb964ee62e1e45ab29f32a086629be17ed9001 #+bison.5fbd30012053f464c156e0c0b0fa4b59be176d9525cdd25f792ddfaad1176c84 -#+rsync.1d218c6a6ac52828af4954fb15c8a5d7961a677031ba843c74379243cdae8e12 +#+rsync.15768ca4cc994c0627852b75c6f443143aab4fee22b435b6b2d0d42534d7a67c #+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 #+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 #+s6-rc.3790f2b77a5785fe78e78d0ae8f036fd8e6bdd70af979ba1cd752668ae29be82 @@ -15,31 +15,31 @@ #+s6-linux-init.676e77c29e34f95108eb83ef131a78de5afa7ae0f27fecbf504d43e0d8d0d30d #+mdevd.c2e962ba272a196b1798c2eab73f2bd1b69b168f897e72e9be3e30bef0e8d985 #+s6-dns.2a3e90f799cebf15491101cc0b1ba2a0bdc9f68320e02943cfcd4a873fb036fb -#+libressl.6ad2db3b5fde5d6fa1f882d91b1c6429447317409ae0caed9fba9f97842c7df4 -#+s6-networking.b30267afdd262180ecca526818a67e1ce298a1a55cef995a37e0e83e9d0573d1 +#+libressl.ecd089b63222b6d2d8574961d0d10ba37071baa6bfaa1d38f1b369ece8f2ad56 +#+s6-networking.21545d4266a2511310b06c5f878f7576cc8962dd50c858d110527012502d3346 #+zsh.01a31d86cd787f4ac02a6e672a26990184f9a7994a6daeac7197b37447ce273a #+pthbs-banginstall.c778079de6b3c448b7670c1d09474bfecbd64658c11e75734cf48a85196ca318 #+aat.c744ec67755ae2988d0e53158520de7272fa0f0e7ecbd44b71559c26910bd6f8 #+confz.bc3491bab75ab7de12e29d4614347f3b3c90b4987012c5817284775b89f46ff6 -#+containers.8ae72586622ac7593d715a0a6753408a1be0128db81685a251fde2711df1f005 +#+containers.3090ac7a65c9eb7d978cafb5c4ac2687b0bdd48fd4ddc3268d0df6cb36597af8 #+fileset.215ca6d3fbfb730899911dffa91b92bbd8391f14b7639a6d0b37620d26e7f1ca #+logincaps.158f87e6162f9cce62abc68cc28e3343da75cb19847c4232b82024c607dce35f #+snaprep.dd3c4d7374997842d23ff11c496cc9d0705df5acb6ea6511c68a3e95f6bff366 -#+curl.64b76ea44285662d9800862d0c998d68132b41707ad85672f90b018503a33fec -#+git.5f753af65469102de8c755d42071cbf39a4be26cfd5f6fc0954a0352c3d1cede -#+xbps.8fd1c758f8d987cd0e25da010744551f316b8b90761ea1a30d2d031068ad43d6 -#+apk-tools.26ff46ce321cf746d8c47d1562299a299701d618e0d871b98b5463cf28152d20 -#+getent.dd5870b1ea3d10659d7ebee0e300ddb11538c928c7cad10e57d26b860945425f -#+getconf.06490ab44f696a1f37d3abf6d3687ddf922394f8955ecb2eb8aada4629f6e712 -#+iconv.99e2ccc1055b1dd9b9709579a21f075507a104ef99a17eb8d714a245089a5f02 +#+curl.4898b6941dbebfff9a3119566095d23d24cc9bcdd13e2beece1211fcae207056 +#+git.1d648ddad55a0190c53a630cfc504c519ef574e1d83516298a50b9fe5d7c9b85 +#+xbps.d9fb16a1353ddd5f037638875faa46ddb6980fcdc62ba298078fba8a3218fe8b +#+apk-tools.43e2773cf7ba7947227a50224c4114cb2e90725e5ce677ef15ca88549c317518 +#+getent.07cccc7d53d18bc3cd261612d999cd6c6deb16f40960670899606e9044b9f440 +#+getconf.04c5a2684e9c9d6f046062a1066aed42727969bf8387bcde064acd0eb6894912 +#+iconv.627703e7d8f5928e9511b059673537dae3002569c513393b42a94911f7228219 #+libcap.a01b94d3158cbf92ee91d53dea8626b351230aabfb46fb3479f7851cf6c30f3c -#+applyuidgid-caps.74e93aa2a95831c61353a13d96bbaf8345bbd7d7ffa4535ae30cd579c2647318 +#+applyuidgid-caps.24cd678aacaa2c4656769739da05cf6630b2175b79bcba193b2c89cde34acabc #+ccx-utils.44f8a3d6ec19d6da0bfbfdf73577bebedb8c6f046fb105609138bf59794b7d87 #+user-env.8d98c43570fddf00ddbb256796b8ac2abf78872f674b48e050ba71e3c5591191 #+strace.801cacfe6901b6858381e9f63acd57675cf43200e02340f81966a1a9b9b008cb #+mlog.f6e876fbff20d311c177432ca821cc33b98f205d343105aa37ef81d40fdf1bc0 -#+system-config.35a99465902f7fc9fb0a28e085588f9270acaaf0eb2f3e83ba69c9959afa4492 -#+system-config-rc.00de75e3214ce800f53e41a56925f3a06429cd2b63c72337025ba09920790c14 +#+system-config.ed67272d689f41bab4b1a652a791ee20b1c3b9460a02b4786348739cbcc96af8 +#+system-config-rc.d70771326d5b4d91f6d2e28eeaa820dba3f44ae1068a26d2872de8888bda8ab5 #+system-config-scripts.280123bda87bc2c47d6ed993e8cedc4de55e9cf4d478daeacdcb554e6459180d -#+system-config-init.0977642635d465cfa8666d007034e5066a609a95152b751b9e351555cae54fab +#+system-config-init.ad4f574aed7a41cb6c0075956b47b1a47b986ebcf5019a8ebea7de361c1e372f #+system-config-zsh.6cea9d302b79e02443a23bcc0fa29a512570db99e891ec1e74cfce7a4496b670 \ No newline at end of file diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf @@ -8,7 +8,7 @@ # - build script start - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'getconf' +cd '.' name='getconf' diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent @@ -8,7 +8,7 @@ # - build script start - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'getent' +cd '.' name='getent' diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git @@ -5,8 +5,8 @@ #+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 #+m4.3f3d010f1f1f14f7b2a0c5eb2fea37f77757d1cb404c6ddd69525d3f55af8009 -#+libressl.6ad2db3b5fde5d6fa1f882d91b1c6429447317409ae0caed9fba9f97842c7df4 -#+curl.64b76ea44285662d9800862d0c998d68132b41707ad85672f90b018503a33fec +#+libressl.ecd089b63222b6d2d8574961d0d10ba37071baa6bfaa1d38f1b369ece8f2ad56 +#+curl.4898b6941dbebfff9a3119566095d23d24cc9bcdd13e2beece1211fcae207056 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv @@ -8,7 +8,7 @@ # - build script start - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'iconv' +cd '.' name='iconv' diff --git a/variants/root-x86_64/kernel.environment b/variants/root-x86_64/kernel.environment @@ -1,3 +1,3 @@ #!/usr/bin/env pthbs-build -#+linux.72c97e9234f37ccaef90b77f3fcf57c8cdcb5642eadba0cf43d420f3d49b1f29 -#+busybox.fee8b8f144c39d8af4f9e632b47be6104312edc23d6cf3124e76b63cd7699af9- \ No newline at end of file +#+linux.82682aaf7c1886ad35beba606e7bdc490c4bd6760244a2451ccb2cdcae6dec9b +#+busybox.147a0d2651b525f4e1b6bb25d4959c5a0aa946d88708bf0954ec7936de119cc6+ \ No newline at end of file diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl @@ -5,7 +5,7 @@ #+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #+m4.3f3d010f1f1f14f7b2a0c5eb2fea37f77757d1cb404c6ddd69525d3f55af8009 -#+ca-certificates-wip-donotuse.6ddb47ee8d1b8b6637333736ce05ba39614952990736839e7f6b3f3a37acb41e +#+ca-certificates-wip-donotuse.7d00119043cb91cb185afa2ca1994605eac001cea6c03f9743a0d18dde87a17e #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. @@ -71,7 +71,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) 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.6ddb47ee8d1b8b6637333736ce05ba39614952990736839e7f6b3f3a37acb41e/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/versions/ca-certificates-wip-donotuse.7d00119043cb91cb185afa2ca1994605eac001cea6c03f9743a0d18dde87a17e/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" ./c_rehash "$pthbs_destdir/$prefix/config/ssl/certs/" cd "$pthbs_destdir/$prefix/config/ssl/" mv cert.pem libressl-cert.pem diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux @@ -7,7 +7,7 @@ #+patch.979dd142dbb50a2396529aa17b650cf51e2f394b39b14336cc6939805c9d7379 #+flex.2237e4fdd5678fbacfef665fa1fb964ee62e1e45ab29f32a086629be17ed9001 #+bison.5fbd30012053f464c156e0c0b0fa4b59be176d9525cdd25f792ddfaad1176c84 -#+rsync.1d218c6a6ac52828af4954fb15c8a5d7961a677031ba843c74379243cdae8e12 +#+rsync.15768ca4cc994c0627852b75c6f443143aab4fee22b435b6b2d0d42534d7a67c #+zstd.c0b8bcba8a27ce5d349790a9588c0d5e3a0668658b31f3fee630eead62d7a22a #+libelf.2235d2fb133b0b778c59bc32cf74da225dac9aa97ed9fde912bfb431e853fce9 #+pkgconf-pkg-config.7bbbc6f27f84ce65804e298304ce25154c1a92d9ca1c2b353d9148c5687e3864 diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest @@ -7,7 +7,7 @@ #+patch.979dd142dbb50a2396529aa17b650cf51e2f394b39b14336cc6939805c9d7379 #+flex.2237e4fdd5678fbacfef665fa1fb964ee62e1e45ab29f32a086629be17ed9001 #+bison.5fbd30012053f464c156e0c0b0fa4b59be176d9525cdd25f792ddfaad1176c84 -#+rsync.1d218c6a6ac52828af4954fb15c8a5d7961a677031ba843c74379243cdae8e12 +#+rsync.15768ca4cc994c0627852b75c6f443143aab4fee22b435b6b2d0d42534d7a67c #+zstd.c0b8bcba8a27ce5d349790a9588c0d5e3a0668658b31f3fee630eead62d7a22a #+libelf.2235d2fb133b0b778c59bc32cf74da225dac9aa97ed9fde912bfb431e853fce9 #+pkgconf-pkg-config.7bbbc6f27f84ce65804e298304ce25154c1a92d9ca1c2b353d9148c5687e3864 diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync @@ -6,7 +6,7 @@ #+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #+m4.3f3d010f1f1f14f7b2a0c5eb2fea37f77757d1cb404c6ddd69525d3f55af8009 #+popt.4f29df1aa4266fa31b7beb351a1721e0d74cfacc363a1eddc0d6b78797ac7efb -#+libressl.6ad2db3b5fde5d6fa1f882d91b1c6429447317409ae0caed9fba9f97842c7df4 +#+libressl.ecd089b63222b6d2d8574961d0d10ba37071baa6bfaa1d38f1b369ece8f2ad56 #+zstd.c0b8bcba8a27ce5d349790a9588c0d5e3a0668658b31f3fee630eead62d7a22a #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking @@ -7,7 +7,7 @@ #+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 #+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 #+s6-dns.2a3e90f799cebf15491101cc0b1ba2a0bdc9f68320e02943cfcd4a873fb036fb -#+libressl.6ad2db3b5fde5d6fa1f882d91b1c6429447317409ae0caed9fba9f97842c7df4 +#+libressl.ecd089b63222b6d2d8574961d0d10ba37071baa6bfaa1d38f1b369ece8f2ad56 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -5,7 +5,7 @@ #+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #+aat.c744ec67755ae2988d0e53158520de7272fa0f0e7ecbd44b71559c26910bd6f8 #+fileset.215ca6d3fbfb730899911dffa91b92bbd8391f14b7639a6d0b37620d26e7f1ca -#+rsync.1d218c6a6ac52828af4954fb15c8a5d7961a677031ba843c74379243cdae8e12 +#+rsync.15768ca4cc994c0627852b75c6f443143aab4fee22b435b6b2d0d42534d7a67c #+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 #+kbd.837ef6eb78ddb4d5a8cc6f63e24696b73cbe13779f248f4036049b7fa1b0b336 #+mdevd.c2e962ba272a196b1798c2eab73f2bd1b69b168f897e72e9be3e30bef0e8d985 @@ -50,7 +50,7 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.fb7a8e0de7df3d6ec30e74184f45f34ab9454276dc16d9477291846be6cc0596' \ + 'pthbs_path_containers=/versions/env.7e07546bb30ffa811e8009ef01732a1a5462c234818d7179978eba107149aef9' \ 'pthbs_path_mdevd=/versions/env.d807e78e177309501d36becd2dd34f58b557c5e718b650e7a972d46fc46ce2cf' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -6,7 +6,7 @@ #+s6-portable-utils.02a66968f0ac9c69d31491a4172e24ef37cab78fc968d5a75e46a1dcf0a588a9 #+s6-linux-init.676e77c29e34f95108eb83ef131a78de5afa7ae0f27fecbf504d43e0d8d0d30d #+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 -#+system-config-rc.00de75e3214ce800f53e41a56925f3a06429cd2b63c72337025ba09920790c14 +#+system-config-rc.d70771326d5b4d91f6d2e28eeaa820dba3f44ae1068a26d2872de8888bda8ab5 # - build script start - @@ -29,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/versions/system-config-rc.00de75e3214ce800f53e41a56925f3a06429cd2b63c72337025ba09920790c14/config/s6-rc-db +s6rcdb=/versions/system-config-rc.d70771326d5b4d91f6d2e28eeaa820dba3f44ae1068a26d2872de8888bda8ab5/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//versions" diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc @@ -4,7 +4,7 @@ #+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 #+s6-rc.3790f2b77a5785fe78e78d0ae8f036fd8e6bdd70af979ba1cd752668ae29be82 #+fileset.215ca6d3fbfb730899911dffa91b92bbd8391f14b7639a6d0b37620d26e7f1ca -#+system-config.35a99465902f7fc9fb0a28e085588f9270acaaf0eb2f3e83ba69c9959afa4492 +#+system-config.ed67272d689f41bab4b1a652a791ee20b1c3b9460a02b4786348739cbcc96af8 # - build script start - @@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/versions/system-config.35a99465902f7fc9fb0a28e085588f9270acaaf0eb2f3e83ba69c9959afa4492/config/s6-rc-source +src=/versions/system-config.ed67272d689f41bab4b1a652a791ee20b1c3b9460a02b4786348739cbcc96af8/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.979dd142dbb50a2396529aa17b650cf51e2f394b39b14336cc6939805c9d7379 #+flex.2237e4fdd5678fbacfef665fa1fb964ee62e1e45ab29f32a086629be17ed9001 #+bison.5fbd30012053f464c156e0c0b0fa4b59be176d9525cdd25f792ddfaad1176c84 -#+rsync.1d218c6a6ac52828af4954fb15c8a5d7961a677031ba843c74379243cdae8e12 +#+rsync.15768ca4cc994c0627852b75c6f443143aab4fee22b435b6b2d0d42534d7a67c #+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 #+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 #+s6-rc.3790f2b77a5785fe78e78d0ae8f036fd8e6bdd70af979ba1cd752668ae29be82 @@ -15,25 +15,25 @@ #+s6-linux-init.676e77c29e34f95108eb83ef131a78de5afa7ae0f27fecbf504d43e0d8d0d30d #+mdevd.c2e962ba272a196b1798c2eab73f2bd1b69b168f897e72e9be3e30bef0e8d985 #+s6-dns.2a3e90f799cebf15491101cc0b1ba2a0bdc9f68320e02943cfcd4a873fb036fb -#+libressl.6ad2db3b5fde5d6fa1f882d91b1c6429447317409ae0caed9fba9f97842c7df4 -#+s6-networking.b30267afdd262180ecca526818a67e1ce298a1a55cef995a37e0e83e9d0573d1 +#+libressl.ecd089b63222b6d2d8574961d0d10ba37071baa6bfaa1d38f1b369ece8f2ad56 +#+s6-networking.21545d4266a2511310b06c5f878f7576cc8962dd50c858d110527012502d3346 #+zsh.01a31d86cd787f4ac02a6e672a26990184f9a7994a6daeac7197b37447ce273a #+pthbs-banginstall.c778079de6b3c448b7670c1d09474bfecbd64658c11e75734cf48a85196ca318 #+aat.c744ec67755ae2988d0e53158520de7272fa0f0e7ecbd44b71559c26910bd6f8 #+confz.bc3491bab75ab7de12e29d4614347f3b3c90b4987012c5817284775b89f46ff6 -#+containers.8ae72586622ac7593d715a0a6753408a1be0128db81685a251fde2711df1f005 +#+containers.3090ac7a65c9eb7d978cafb5c4ac2687b0bdd48fd4ddc3268d0df6cb36597af8 #+fileset.215ca6d3fbfb730899911dffa91b92bbd8391f14b7639a6d0b37620d26e7f1ca #+logincaps.158f87e6162f9cce62abc68cc28e3343da75cb19847c4232b82024c607dce35f #+snaprep.dd3c4d7374997842d23ff11c496cc9d0705df5acb6ea6511c68a3e95f6bff366 -#+curl.64b76ea44285662d9800862d0c998d68132b41707ad85672f90b018503a33fec -#+git.5f753af65469102de8c755d42071cbf39a4be26cfd5f6fc0954a0352c3d1cede -#+xbps.8fd1c758f8d987cd0e25da010744551f316b8b90761ea1a30d2d031068ad43d6 -#+apk-tools.26ff46ce321cf746d8c47d1562299a299701d618e0d871b98b5463cf28152d20 -#+getent.dd5870b1ea3d10659d7ebee0e300ddb11538c928c7cad10e57d26b860945425f -#+getconf.06490ab44f696a1f37d3abf6d3687ddf922394f8955ecb2eb8aada4629f6e712 -#+iconv.99e2ccc1055b1dd9b9709579a21f075507a104ef99a17eb8d714a245089a5f02 +#+curl.4898b6941dbebfff9a3119566095d23d24cc9bcdd13e2beece1211fcae207056 +#+git.1d648ddad55a0190c53a630cfc504c519ef574e1d83516298a50b9fe5d7c9b85 +#+xbps.d9fb16a1353ddd5f037638875faa46ddb6980fcdc62ba298078fba8a3218fe8b +#+apk-tools.43e2773cf7ba7947227a50224c4114cb2e90725e5ce677ef15ca88549c317518 +#+getent.07cccc7d53d18bc3cd261612d999cd6c6deb16f40960670899606e9044b9f440 +#+getconf.04c5a2684e9c9d6f046062a1066aed42727969bf8387bcde064acd0eb6894912 +#+iconv.627703e7d8f5928e9511b059673537dae3002569c513393b42a94911f7228219 #+libcap.a01b94d3158cbf92ee91d53dea8626b351230aabfb46fb3479f7851cf6c30f3c -#+applyuidgid-caps.74e93aa2a95831c61353a13d96bbaf8345bbd7d7ffa4535ae30cd579c2647318 +#+applyuidgid-caps.24cd678aacaa2c4656769739da05cf6630b2175b79bcba193b2c89cde34acabc #+ccx-utils.44f8a3d6ec19d6da0bfbfdf73577bebedb8c6f046fb105609138bf59794b7d87 #+user-env.8d98c43570fddf00ddbb256796b8ac2abf78872f674b48e050ba71e3c5591191 #+strace.801cacfe6901b6858381e9f63acd57675cf43200e02340f81966a1a9b9b008cb diff --git a/variants/root-x86_64/vm.environment b/variants/root-x86_64/vm.environment @@ -1,2 +1,2 @@ #!/usr/bin/env pthbs-build -#+linux-qemu-guest.af6078873577b246165f85d99fd40177ca1c0aa99f3249a22f5837415417408a- \ No newline at end of file +#+linux-qemu-guest.a3a50bb2d5e2f0f584b865b9d0c812fd35c29639649a82806dd576971c2e8860+ \ No newline at end of file diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps @@ -2,7 +2,7 @@ #+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 #+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 #+libarchive.64274ebaf7a65eb19c536c6200b8e658ff6aca7b8ebb3d48acc79a8082432d9c -#+libressl.6ad2db3b5fde5d6fa1f882d91b1c6429447317409ae0caed9fba9f97842c7df4 +#+libressl.ecd089b63222b6d2d8574961d0d10ba37071baa6bfaa1d38f1b369ece8f2ad56 #+pkgconf-pkg-config.7bbbc6f27f84ce65804e298304ce25154c1a92d9ca1c2b353d9148c5687e3864 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.