commit d1a03369f7bc266e6320042c7bbca482a5561ab0 parent a422ff71f5b65aaa916b46729abd4567d25505ef Author: Jan Pobrislo <ccx@te2000.cz> Date: Tue, 16 Dec 2025 00:44:50 +0000 remove configure-only patches Diffstat:
39 files changed, 118 insertions(+), 130 deletions(-)
diff --git a/templates/pkg/zsh b/templates/pkg/zsh @@ -8,14 +8,10 @@ #+{{pkg_install_name("patch")}} #@git:{{submodule.current["zsh_config"]}}:zsh_config #@sha256:{{files["zsh-"~pkg_version~"-skip-test-failing-on-musl.patch"]}}:skip-test-failing-on-musl.patch -#@sha256:{{files["zsh-"~pkg_version~"-fix-gcc14-incompatible-pointer-types.patch"]}}:fix-gcc14-incompatible-pointer-types.patch -#@sha256:{{files["zsh-"~pkg_version~"-implicit.patch"]}}:implicit.patch {% endblock package_deps %} {%- block prepare %} {{- super() -}} patch -p1 <../skip-test-failing-on-musl.patch -patch -p1 <../fix-gcc14-incompatible-pointer-types.patch -patch -p1 <../implicit.patch {% endblock prepare %} {%- block configure %} export CPATH=$pthbs_build_environment/{{includedir|shesc}} diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.a6f010e8cb375d93beae7c44f78488f31aa5ce31501d99982e907441513eac72 -#+pthbs-banginstall.f09b378ac71be5d27fd011668814935416407df866550e40b872750152a36abe +#+zsh.20417af58e0870ff062032e6c2bcc87d25414feb2af07ed991bb4522ec374d62 +#+pthbs-banginstall.509f91e69608c110441529bfdb2f884b6bdb0f9f0b917bf4c34ae319e835ac69 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.a6f010e8cb375d93beae7c44f78488f31aa5ce31501d99982e907441513eac72 -#+pthbs-banginstall.f09b378ac71be5d27fd011668814935416407df866550e40b872750152a36abe +#+zsh.20417af58e0870ff062032e6c2bcc87d25414feb2af07ed991bb4522ec374d62 +#+pthbs-banginstall.509f91e69608c110441529bfdb2f884b6bdb0f9f0b917bf4c34ae319e835ac69 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.a6f010e8cb375d93beae7c44f78488f31aa5ce31501d99982e907441513eac72 -#+pthbs-banginstall.f09b378ac71be5d27fd011668814935416407df866550e40b872750152a36abe +#+zsh.20417af58e0870ff062032e6c2bcc87d25414feb2af07ed991bb4522ec374d62 +#+pthbs-banginstall.509f91e69608c110441529bfdb2f884b6bdb0f9f0b917bf4c34ae319e835ac69 #+execline.88e76844a30419b26b2f1de188eed4d9cb0cbaf1d0dce7d437b84370e3e8edc0 #+alpine-keys.4d60a079202a5b94391f2a3ed914cfa31845df7c92cf6f05099c57632f2c3f3e #+apk-tools.eb39312a3fb2e8414e26202242515b8713fdd35483f6503d426bd951840ddadb diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -48,15 +48,15 @@ #+s6.f9a0c2f670e50dea1946f24633e7accee58edde9714af1f72aa6e1fd04db0486 #+s6-portable-utils.1796c72f15cf939402618d7743934203f32b5abc88cbc5089a44a35073254019 #+s6-linux-utils.d1865a98af7940ca8b5fd72a7d076cfad8ed1c82aad1e4daa6529649bf888f71 -#+zsh.a6f010e8cb375d93beae7c44f78488f31aa5ce31501d99982e907441513eac72 -#+confz.34087f542c5a0ebf274e01514b70b9447159bdaf74ced5d5bb64479762f47a0e -#+containers.c09b71f30a4c334780fc469c6173f4bab2590f826360dc78a10d7a75de0fa634 +#+zsh.20417af58e0870ff062032e6c2bcc87d25414feb2af07ed991bb4522ec374d62 +#+confz.a97e6aaea63e2417c39adf192ff332aa2a24f4fe388c7dafbc7a88055cbdab5d +#+containers.f0187866b23239e1b7d0042a60e3ad7816a48006e967531dcb12663d9b6102aa #+xbps.4e2f4ea5c069b243fd183bb43a2b20ae1625f332315b89d1f55f4eec7008fadc #+zstd.9f5c1c4efbf89f176ac088d2951e687936dd6a52a6fc0de93d5c22a6eea95165 #+apk-tools.eb39312a3fb2e8414e26202242515b8713fdd35483f6503d426bd951840ddadb #+alpine-keys.4d60a079202a5b94391f2a3ed914cfa31845df7c92cf6f05099c57632f2c3f3e #+getent.86c869c75fab5245dcdc92e0dcbb178a7303d82d954b3b668d0987848d698833 -#+fileset.51050da957885b463e858272bedcda849761cda0a381d412197f43cdc9a78606 +#+fileset.4edba0b0b6a6ad0ea95bc586410c9a9e6cadecc8154eb736aea1f48fbc361138 #+ccx-utils.72ed047d6ddd5ce8fd4eb6d1515f53b7c4aeabc7b224af7b5b44973cdf8a155d #+easyseccomp.85c8976bdef1e5140e0db0ef0dd8a43b2b9d3229af5c58ca2a41875292765a52 #+findutils.821fd3ba4dd7c936362cac192f3f20c46dc8fa35e7ec996d6c6ad7f0e1860e2b diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -61,14 +61,14 @@ #+s6-dns.91e0124146faaa10d333e32a42c0d7d5f45840e3566584530e8730cb644790d7 #+libressl.69bcfd75d05aab2621b5509053ea9b038b5e930a3dc1704829be4451c3f92209 #+s6-networking.3f957c3e8f1ec71354b0e0402c662d7f9ff650191929836764cf506216a862b6 -#+zsh.a6f010e8cb375d93beae7c44f78488f31aa5ce31501d99982e907441513eac72 -#+pthbs-banginstall.f09b378ac71be5d27fd011668814935416407df866550e40b872750152a36abe -#+aat.deedcb739b415596113946d31f7f40142555bf8f03102cd7a95a26906eccf68a -#+confz.34087f542c5a0ebf274e01514b70b9447159bdaf74ced5d5bb64479762f47a0e -#+containers.c09b71f30a4c334780fc469c6173f4bab2590f826360dc78a10d7a75de0fa634 -#+fileset.51050da957885b463e858272bedcda849761cda0a381d412197f43cdc9a78606 -#+logincaps.5481178c48be7faf0620e9e436cfc90f61f4a641470592b85e0c7cb7b3835980 -#+snaprep.bf7023575cf0500102beb2d91543105a6fce199e5c0b3ca86c0e3a262bdd6348 +#+zsh.20417af58e0870ff062032e6c2bcc87d25414feb2af07ed991bb4522ec374d62 +#+pthbs-banginstall.509f91e69608c110441529bfdb2f884b6bdb0f9f0b917bf4c34ae319e835ac69 +#+aat.22a31ef8d601f79b05bd1c7fc8737b0f3fb9f457a1ca1d0925b06f31d411c60a +#+confz.a97e6aaea63e2417c39adf192ff332aa2a24f4fe388c7dafbc7a88055cbdab5d +#+containers.f0187866b23239e1b7d0042a60e3ad7816a48006e967531dcb12663d9b6102aa +#+fileset.4edba0b0b6a6ad0ea95bc586410c9a9e6cadecc8154eb736aea1f48fbc361138 +#+logincaps.2cbf7b4af3d34fce5aafd254eda83288866c4ea50bed9761f0f06498ea42298e +#+snaprep.f8f68be079b74a067938c0dd991619f3a28902244169c6c963adad1b20b7765a #+curl.0e65db5bb39f6bb4486d6402140328039310815f379850d5c6ed90c5ae072fa9 #+git.f5f8f4c7ca3a777ef1607367fd98a61f674fed3b0f986ad17ecbae7f57c253a3 #+xbps.4e2f4ea5c069b243fd183bb43a2b20ae1625f332315b89d1f55f4eec7008fadc @@ -79,7 +79,7 @@ #+libcap.3bbce58edcc50c830ab9a39964d09cfe4e47aea694a03756210e84f7f9fc226d #+applyuidgid-caps.69fbc89fd6a8912c86ef5c4394db75e406d5a98474255a0fde0d9eeb4d6b25ee #+ccx-utils.72ed047d6ddd5ce8fd4eb6d1515f53b7c4aeabc7b224af7b5b44973cdf8a155d -#+user-env.7c11c804c7d8f049c9d0c0ef460b48a73840277d64d2092f87d366d5eb6b9ff3 +#+user-env.64d5743cd2708d2a6ceba0e1dd7486379bed005c5f04615899f3ecd4a50bccfa #+mlog.5ddb8f9b9e8ab343d6218d162cf435967694138fdc2a8691637738e64b0c2d46 #+findutils.821fd3ba4dd7c936362cac192f3f20c46dc8fa35e7ec996d6c6ad7f0e1860e2b #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f @@ -87,9 +87,9 @@ #+squashfs-tools.1b32395a427ffeb9dbcd13098bc31d885cc2fc14c7a77fc32597d1c09868096f #+mandoc.099a08af56c6fe54e24432816a7bae11dff399d0a0b0eaee384245507cf11245 #+tinyssh.4a62259081d3cb66c5d84a43e21937aef91ee0a9615ddc0dc002058b9f126ede -#+system-config.e828c501e09a696c68e688c8a33ce1051f6cdcb189fb808e1e357bdde5641901 -#+system-config-rc.d1d5eea95b629c30b39248ea22b0707cede4726c6d6a65071b6c30d1fc59dfc1 -#+system-config-scripts.2b88459213b0071e537eeab9681a2744bc0da7498a133623c9a64fcc42763546 -#+system-config-init.45074640b09a0ccfa582c670508e62663057fe3645128135862aec1edd2f6f8b -#+system-config-zsh.86ba67a3a3455786904e3c92297fd0361041e9ffe9b35ecc92b8c6e3f54d1d29 +#+system-config.86e7c3fe3f747e2cb41b4ff2f9f98f51dc3a13b175dee36e5e19f520a7ef885f +#+system-config-rc.48d73c9c515107990b68730548bb007aa7193599cf11e14f7e98d0c24b4ba1b1 +#+system-config-scripts.e7aff623c4c78db4f0bab8cde11d146578ed71faafd8fe4e29875870c657e255 +#+system-config-init.7d67bc3a915ef5d2f9bd0edf9aab88c6b0dc4f7f9cbfaec339ca3a71f8903c67 +#+system-config-zsh.817db50fa2fdbb1b32fe7bd416c15cb7cd3848ea99e4ba58bf1b2f39a55f28a7 #+busybox.2ce453a8111e476e4d172ae26de49f8f79d8c0b9bb7b83eed53fe7c7a0c203d2 \ No newline at end of file diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.a6f010e8cb375d93beae7c44f78488f31aa5ce31501d99982e907441513eac72 -#+pthbs-banginstall.f09b378ac71be5d27fd011668814935416407df866550e40b872750152a36abe +#+zsh.20417af58e0870ff062032e6c2bcc87d25414feb2af07ed991bb4522ec374d62 +#+pthbs-banginstall.509f91e69608c110441529bfdb2f884b6bdb0f9f0b917bf4c34ae319e835ac69 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.a6f010e8cb375d93beae7c44f78488f31aa5ce31501d99982e907441513eac72 -#+pthbs-banginstall.f09b378ac71be5d27fd011668814935416407df866550e40b872750152a36abe +#+zsh.20417af58e0870ff062032e6c2bcc87d25414feb2af07ed991bb4522ec374d62 +#+pthbs-banginstall.509f91e69608c110441529bfdb2f884b6bdb0f9f0b917bf4c34ae319e835ac69 #+execline.88e76844a30419b26b2f1de188eed4d9cb0cbaf1d0dce7d437b84370e3e8edc0 #+musl-cross-make.c3441fbe0e30140d774335b945fab76d703905dc4a5f0660f109084d6dec9b94 #+ccx-utils.72ed047d6ddd5ce8fd4eb6d1515f53b7c4aeabc7b224af7b5b44973cdf8a155d diff --git a/variants/ccx-x86_64/mdev-scripts b/variants/ccx-x86_64/mdev-scripts @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.a6f010e8cb375d93beae7c44f78488f31aa5ce31501d99982e907441513eac72 -#+pthbs-banginstall.f09b378ac71be5d27fd011668814935416407df866550e40b872750152a36abe +#+zsh.20417af58e0870ff062032e6c2bcc87d25414feb2af07ed991bb4522ec374d62 +#+pthbs-banginstall.509f91e69608c110441529bfdb2f884b6bdb0f9f0b917bf4c34ae319e835ac69 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -45,6 +45,6 @@ #+busybox-cron.e33735df25412afb66cf4f2d0f3548b85c35a3a567210a42e4268a794b3e2975 #+execline.88e76844a30419b26b2f1de188eed4d9cb0cbaf1d0dce7d437b84370e3e8edc0 #+s6.f9a0c2f670e50dea1946f24633e7accee58edde9714af1f72aa6e1fd04db0486 -#+mdev-scripts.e1d3900c9fcb6aae80b022218e01d94237f3851cd45611c066c8e6b28d0c8e0c +#+mdev-scripts.b2f2a577abfcc41df19c4509a1f1f346fbdf14304ca7fe463070d72a2aa030fb #+mdevd.c16acf759740427f5c49b4fc52ca69481a0a411d4cef7af1714b77c7831ae391 #+busybox.2ce453a8111e476e4d172ae26de49f8f79d8c0b9bb7b83eed53fe7c7a0c203d2 \ No newline at end of file diff --git a/variants/ccx-x86_64/pthbs-banginstall b/variants/ccx-x86_64/pthbs-banginstall @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.a6f010e8cb375d93beae7c44f78488f31aa5ce31501d99982e907441513eac72 +#+zsh.20417af58e0870ff062032e6c2bcc87d25414feb2af07ed991bb4522ec374d62 #@sha256:577cbaf04486ebc113d1c0b9dabd9a8eb29506dbfbdb5824d1e0601df4262715:pthbs-banginstall diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.a6f010e8cb375d93beae7c44f78488f31aa5ce31501d99982e907441513eac72 -#+pthbs-banginstall.f09b378ac71be5d27fd011668814935416407df866550e40b872750152a36abe +#+zsh.20417af58e0870ff062032e6c2bcc87d25414feb2af07ed991bb4522ec374d62 +#+pthbs-banginstall.509f91e69608c110441529bfdb2f884b6bdb0f9f0b917bf4c34ae319e835ac69 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -47,8 +47,8 @@ #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f #+diffutils.61d804a97b23b50137fc9e38e1cdcd0bf9d37832139edfdaa921b305f3f1fd7a #+gnu-make.d80534c0fc3649445dd60c4d82154c8bd9cf4eb57f5cf53f70b1fd63d90ae544 -#+aat.deedcb739b415596113946d31f7f40142555bf8f03102cd7a95a26906eccf68a -#+fileset.51050da957885b463e858272bedcda849761cda0a381d412197f43cdc9a78606 +#+aat.22a31ef8d601f79b05bd1c7fc8737b0f3fb9f457a1ca1d0925b06f31d411c60a +#+fileset.4edba0b0b6a6ad0ea95bc586410c9a9e6cadecc8154eb736aea1f48fbc361138 #+rsync.e3fad078ac173272e180ecd9a133b92b3eceb3ae311e68796c6161f85b8f3907 #+execline.88e76844a30419b26b2f1de188eed4d9cb0cbaf1d0dce7d437b84370e3e8edc0 #+kbd.aed3da60e482cce0cb3841872228f9c59a7fb20a5103845a02671b5b8517636b @@ -56,10 +56,10 @@ #+s6-linux-utils.d1865a98af7940ca8b5fd72a7d076cfad8ed1c82aad1e4daa6529649bf888f71 #+s6-rc.fd611fea84d68724e6ed8543d310e29b02b383f4f4335021e64e6638423e196d #+s6.f9a0c2f670e50dea1946f24633e7accee58edde9714af1f72aa6e1fd04db0486 -#+zsh.a6f010e8cb375d93beae7c44f78488f31aa5ce31501d99982e907441513eac72 +#+zsh.20417af58e0870ff062032e6c2bcc87d25414feb2af07ed991bb4522ec374d62 #+libcgroup.be4f083a75c52754c9f5043824d1cee88bf8856c7f59f0610d524e57d33870d6 -#+system-config-scripts.2b88459213b0071e537eeab9681a2744bc0da7498a133623c9a64fcc42763546 -#+logincaps.5481178c48be7faf0620e9e436cfc90f61f4a641470592b85e0c7cb7b3835980 +#+system-config-scripts.e7aff623c4c78db4f0bab8cde11d146578ed71faafd8fe4e29875870c657e255 +#+logincaps.2cbf7b4af3d34fce5aafd254eda83288866c4ea50bed9761f0f06498ea42298e #+busybox.2ce453a8111e476e4d172ae26de49f8f79d8c0b9bb7b83eed53fe7c7a0c203d2 #@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config @@ -97,8 +97,8 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/home/ccx/versions/env.be5618ba4ebe1816e7914874013f76e960bb7d0733f34ed4b1c4725cf10072aa' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.eab56af489568018d75bca0bfaba10bd52a157b856956de16cc0d20266217b58' \ + 'pthbs_path_containers=/home/ccx/versions/env.121a8b401b9e4dddb1fd545d591bc6dce7dc21c8730afea680d57c55a8a8f9ab' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.2f6585895286ae2e9179483bd2c35855d4c1a8fd9b3a465ca5293c12e2a5cb4c' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -50,7 +50,7 @@ #+s6-portable-utils.1796c72f15cf939402618d7743934203f32b5abc88cbc5089a44a35073254019 #+s6-linux-init.5dd53210945f7cd550a27c30892a4305888e6dde1c30a3c072ee3a4a2b82c2a8 #+execline.88e76844a30419b26b2f1de188eed4d9cb0cbaf1d0dce7d437b84370e3e8edc0 -#+system-config-rc.d1d5eea95b629c30b39248ea22b0707cede4726c6d6a65071b6c30d1fc59dfc1 +#+system-config-rc.48d73c9c515107990b68730548bb007aa7193599cf11e14f7e98d0c24b4ba1b1 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.d1d5eea95b629c30b39248ea22b0707cede4726c6d6a65071b6c30d1fc59dfc1/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.48d73c9c515107990b68730548bb007aa7193599cf11e14f7e98d0c24b4ba1b1/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 @@ -29,8 +29,8 @@ #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f #+busybox-diffutils.89a8c63d9a07390f09f31562e27cd4b0d711110bae836a27376131b427b7e442 #+s6-rc.fd611fea84d68724e6ed8543d310e29b02b383f4f4335021e64e6638423e196d -#+fileset.51050da957885b463e858272bedcda849761cda0a381d412197f43cdc9a78606 -#+system-config.e828c501e09a696c68e688c8a33ce1051f6cdcb189fb808e1e357bdde5641901 +#+fileset.4edba0b0b6a6ad0ea95bc586410c9a9e6cadecc8154eb736aea1f48fbc361138 +#+system-config.86e7c3fe3f747e2cb41b4ff2f9f98f51dc3a13b175dee36e5e19f520a7ef885f # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.e828c501e09a696c68e688c8a33ce1051f6cdcb189fb808e1e357bdde5641901/config/s6-rc-source +src=/home/ccx/versions/system-config.86e7c3fe3f747e2cb41b4ff2f9f98f51dc3a13b175dee36e5e19f520a7ef885f/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/system-config-scripts b/variants/ccx-x86_64/system-config-scripts @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.a6f010e8cb375d93beae7c44f78488f31aa5ce31501d99982e907441513eac72 -#+pthbs-banginstall.f09b378ac71be5d27fd011668814935416407df866550e40b872750152a36abe +#+zsh.20417af58e0870ff062032e6c2bcc87d25414feb2af07ed991bb4522ec374d62 +#+pthbs-banginstall.509f91e69608c110441529bfdb2f884b6bdb0f9f0b917bf4c34ae319e835ac69 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts diff --git a/variants/ccx-x86_64/system-config-zsh b/variants/ccx-x86_64/system-config-zsh @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.a6f010e8cb375d93beae7c44f78488f31aa5ce31501d99982e907441513eac72 +#+zsh.20417af58e0870ff062032e6c2bcc87d25414feb2af07ed991bb4522ec374d62 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env @@ -28,7 +28,7 @@ #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f #+execline.88e76844a30419b26b2f1de188eed4d9cb0cbaf1d0dce7d437b84370e3e8edc0 -#+pthbs-banginstall.f09b378ac71be5d27fd011668814935416407df866550e40b872750152a36abe +#+pthbs-banginstall.509f91e69608c110441529bfdb2f884b6bdb0f9f0b917bf4c34ae319e835ac69 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -61,14 +61,14 @@ #+s6-dns.91e0124146faaa10d333e32a42c0d7d5f45840e3566584530e8730cb644790d7 #+libressl.69bcfd75d05aab2621b5509053ea9b038b5e930a3dc1704829be4451c3f92209 #+s6-networking.3f957c3e8f1ec71354b0e0402c662d7f9ff650191929836764cf506216a862b6 -#+zsh.a6f010e8cb375d93beae7c44f78488f31aa5ce31501d99982e907441513eac72 -#+pthbs-banginstall.f09b378ac71be5d27fd011668814935416407df866550e40b872750152a36abe -#+aat.deedcb739b415596113946d31f7f40142555bf8f03102cd7a95a26906eccf68a -#+confz.34087f542c5a0ebf274e01514b70b9447159bdaf74ced5d5bb64479762f47a0e -#+containers.c09b71f30a4c334780fc469c6173f4bab2590f826360dc78a10d7a75de0fa634 -#+fileset.51050da957885b463e858272bedcda849761cda0a381d412197f43cdc9a78606 -#+logincaps.5481178c48be7faf0620e9e436cfc90f61f4a641470592b85e0c7cb7b3835980 -#+snaprep.bf7023575cf0500102beb2d91543105a6fce199e5c0b3ca86c0e3a262bdd6348 +#+zsh.20417af58e0870ff062032e6c2bcc87d25414feb2af07ed991bb4522ec374d62 +#+pthbs-banginstall.509f91e69608c110441529bfdb2f884b6bdb0f9f0b917bf4c34ae319e835ac69 +#+aat.22a31ef8d601f79b05bd1c7fc8737b0f3fb9f457a1ca1d0925b06f31d411c60a +#+confz.a97e6aaea63e2417c39adf192ff332aa2a24f4fe388c7dafbc7a88055cbdab5d +#+containers.f0187866b23239e1b7d0042a60e3ad7816a48006e967531dcb12663d9b6102aa +#+fileset.4edba0b0b6a6ad0ea95bc586410c9a9e6cadecc8154eb736aea1f48fbc361138 +#+logincaps.2cbf7b4af3d34fce5aafd254eda83288866c4ea50bed9761f0f06498ea42298e +#+snaprep.f8f68be079b74a067938c0dd991619f3a28902244169c6c963adad1b20b7765a #+curl.0e65db5bb39f6bb4486d6402140328039310815f379850d5c6ed90c5ae072fa9 #+git.f5f8f4c7ca3a777ef1607367fd98a61f674fed3b0f986ad17ecbae7f57c253a3 #+xbps.4e2f4ea5c069b243fd183bb43a2b20ae1625f332315b89d1f55f4eec7008fadc @@ -79,7 +79,7 @@ #+libcap.3bbce58edcc50c830ab9a39964d09cfe4e47aea694a03756210e84f7f9fc226d #+applyuidgid-caps.69fbc89fd6a8912c86ef5c4394db75e406d5a98474255a0fde0d9eeb4d6b25ee #+ccx-utils.72ed047d6ddd5ce8fd4eb6d1515f53b7c4aeabc7b224af7b5b44973cdf8a155d -#+user-env.7c11c804c7d8f049c9d0c0ef460b48a73840277d64d2092f87d366d5eb6b9ff3 +#+user-env.64d5743cd2708d2a6ceba0e1dd7486379bed005c5f04615899f3ecd4a50bccfa #+mlog.5ddb8f9b9e8ab343d6218d162cf435967694138fdc2a8691637738e64b0c2d46 #+findutils.821fd3ba4dd7c936362cac192f3f20c46dc8fa35e7ec996d6c6ad7f0e1860e2b #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh @@ -36,8 +36,6 @@ #+patch.861b0ed37908a58b57ed2dd5dde0563d5c004964680cc80e0dd547d8771f77fd #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@sha256:02f8f8bc764f0bcb83c03675cd8bfd27ed7554563f01a1a96e567f8c1a517be7:skip-test-failing-on-musl.patch -#@sha256:637f1198129209e3546ce9b3d340be6a8fddda5a54e13b4d7ecddfb2058ac795:fix-gcc14-incompatible-pointer-types.patch -#@sha256:c2f1de94290969a07130559a6544be93ac3ab2034ccddffaa1c7873112d373f1:implicit.patch #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. @@ -91,8 +89,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'zsh-5.9' patch -p1 <../skip-test-failing-on-musl.patch -patch -p1 <../fix-gcc14-incompatible-pointer-types.patch -patch -p1 <../implicit.patch export CPATH=$pthbs_build_environment/'include' diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.ae6cb0efaaa95aec3d8ec6828b87467192353eeaac8670808f6993e2c2f26cbb -#+pthbs-banginstall.3fe7fc2b8f196f5520fb6397602ac110c504cd49f24f8c74f7696fe6774ea4f7 +#+zsh.fac724dce123ee6354b10348f3405eaa9cd1912ea9c40602352a60a718cba69b +#+pthbs-banginstall.6b90772fce1b322227660fd2599366880ae696b3de14c7371aba083527a8d5de #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.ae6cb0efaaa95aec3d8ec6828b87467192353eeaac8670808f6993e2c2f26cbb -#+pthbs-banginstall.3fe7fc2b8f196f5520fb6397602ac110c504cd49f24f8c74f7696fe6774ea4f7 +#+zsh.fac724dce123ee6354b10348f3405eaa9cd1912ea9c40602352a60a718cba69b +#+pthbs-banginstall.6b90772fce1b322227660fd2599366880ae696b3de14c7371aba083527a8d5de #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.ae6cb0efaaa95aec3d8ec6828b87467192353eeaac8670808f6993e2c2f26cbb -#+pthbs-banginstall.3fe7fc2b8f196f5520fb6397602ac110c504cd49f24f8c74f7696fe6774ea4f7 +#+zsh.fac724dce123ee6354b10348f3405eaa9cd1912ea9c40602352a60a718cba69b +#+pthbs-banginstall.6b90772fce1b322227660fd2599366880ae696b3de14c7371aba083527a8d5de #+execline.67203c458bf7acff865509a59d8601930cd9d0b762796198f8cc658f25e85a3a #+alpine-keys.6d4bacf41a7227e0dd7324e542dfccc638f4c62a1e49d3bec531cd242ba23c40 #+apk-tools.21aa724553ff28021a474791357765d9818e6aab2dd2d8e2eef2f56ccc339fd1 diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -48,15 +48,15 @@ #+s6.56ff669c701d5de606e58c38bf8135f8e64d3217ba96cbcf8a1856d8463dfa45 #+s6-portable-utils.de6bd725492abae2a88540fc19b915f74967ca77e71f074f76c4d71bb1f78ded #+s6-linux-utils.a7c2dbb5495230005406024ed4111e2fc42741e49a77f57c4028947dc63eed48 -#+zsh.ae6cb0efaaa95aec3d8ec6828b87467192353eeaac8670808f6993e2c2f26cbb -#+confz.a5f2f169a888d816a743e1ab6d41421bfd1d9f625da681b449ceec6e3a734a58 -#+containers.fa32b75bffd3cce3a67f41aec9bbde69db609dd7c09bb805d350f76a242c500c +#+zsh.fac724dce123ee6354b10348f3405eaa9cd1912ea9c40602352a60a718cba69b +#+confz.578d4817321401b70cf01463ae706834fbfa5d6e5208b9dfda0b6442ad1a1ab3 +#+containers.d4f2883dfc552df1ea4ca12a6c3b839a5fbc487def64cd90926e6af10614bd7a #+xbps.2f0f75d783403363b5f1df490715d40d14a0599d3f79026eb1812c36a48c9bc2 #+zstd.bef9f00e9c205f0cc38e30b3f88bae3a16d725a2791f6db24ae11ed5d73ff7f4 #+apk-tools.21aa724553ff28021a474791357765d9818e6aab2dd2d8e2eef2f56ccc339fd1 #+alpine-keys.6d4bacf41a7227e0dd7324e542dfccc638f4c62a1e49d3bec531cd242ba23c40 #+getent.0936ed103e469c1452520dd8db14e0de421d79edd562df2324bb6220d2593346 -#+fileset.f8610e6bbea5f0d557913120e574a6b6335b4bc234e239a86307000528b032ea +#+fileset.51c300f547c7807e84edf1fff800d84ad80bcdc154244c0d4cbbaa01b65aa5c9 #+ccx-utils.4cc69559cc7197bc4c7f2b829b17d019637304658c7faa6361027bd1a6b7e9ee #+easyseccomp.c47e12257692dc203285b8093a275de33cd874362a7a38c5fde1d31340f5acad #+findutils.6e1c11dd369b6af8598bb021a609cea553bd6dd3888f39a3f032f3122e6dc752 diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -61,14 +61,14 @@ #+s6-dns.098fa9d6563b4377376269b3efc07cba279f227af48726802a89635b0cab5270 #+libressl.027ad93b75fe650b2d6df50f160dfc68ce0894fa543b4459aa8e0c003e4bf950 #+s6-networking.f3a482f5988c22c18dd95d71a183cce811d86bab49d7503812487c094d2c04a0 -#+zsh.ae6cb0efaaa95aec3d8ec6828b87467192353eeaac8670808f6993e2c2f26cbb -#+pthbs-banginstall.3fe7fc2b8f196f5520fb6397602ac110c504cd49f24f8c74f7696fe6774ea4f7 -#+aat.5be956fb08f5a8a9791dc321a2bf1170498280ea7a9d3513bf61d44b2ce072fb -#+confz.a5f2f169a888d816a743e1ab6d41421bfd1d9f625da681b449ceec6e3a734a58 -#+containers.fa32b75bffd3cce3a67f41aec9bbde69db609dd7c09bb805d350f76a242c500c -#+fileset.f8610e6bbea5f0d557913120e574a6b6335b4bc234e239a86307000528b032ea -#+logincaps.c0a5a10d32d7fb61b07d72b11b64f3db623a8a1683c7f274642ca98de89a9677 -#+snaprep.b58dd0157ba50d11994cefd4466c280769ee575db8a06545c3fcdeaf4dda1fde +#+zsh.fac724dce123ee6354b10348f3405eaa9cd1912ea9c40602352a60a718cba69b +#+pthbs-banginstall.6b90772fce1b322227660fd2599366880ae696b3de14c7371aba083527a8d5de +#+aat.83d8acd1b4045f478fe5daf715f7f172fdf4c7216852598ac7d0bf7d4a9ef768 +#+confz.578d4817321401b70cf01463ae706834fbfa5d6e5208b9dfda0b6442ad1a1ab3 +#+containers.d4f2883dfc552df1ea4ca12a6c3b839a5fbc487def64cd90926e6af10614bd7a +#+fileset.51c300f547c7807e84edf1fff800d84ad80bcdc154244c0d4cbbaa01b65aa5c9 +#+logincaps.ed7d875d1b703e84e56c5f02e235b080500fb1170c516d5c639e303621707440 +#+snaprep.df42175317da2bff2b5c26e0db4ad71662df84c00d278e5f356bf915c602ad8f #+curl.8619a4c494e022953bebe64abe725a9e7c56bfbec2c8cd259cf7c8e9beeb6d42 #+git.af468fbc90368a5ce00837bea508ab60f7fc9154e1ce836bfd013502ca010872 #+xbps.2f0f75d783403363b5f1df490715d40d14a0599d3f79026eb1812c36a48c9bc2 @@ -79,7 +79,7 @@ #+libcap.c7f63e1f43c6ecb4eb53f37df98d86588e50bc796de116b114d1073e6b18c80e #+applyuidgid-caps.4b553a40253e50b2feeea8a1953c310df0012693fed64f731ffd90cc3aca3d5a #+ccx-utils.4cc69559cc7197bc4c7f2b829b17d019637304658c7faa6361027bd1a6b7e9ee -#+user-env.000d67233a0f8e4c0ef85236e29c97a5274ce7ac74ed157a2a6a2fad1e159512 +#+user-env.bdabd82b48974a74d0fd7dd943fe146fbae223d8f672b4098cb551136b8a52d9 #+mlog.0b224ab6f19b71888dde9fcac11161a3dfabb5c7c76499faad3c8b4c15ccd222 #+findutils.6e1c11dd369b6af8598bb021a609cea553bd6dd3888f39a3f032f3122e6dc752 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 @@ -87,9 +87,9 @@ #+squashfs-tools.d260ec95b9c4fd9785a2b5cc18396a3bac41d784f661d8ef798d0cfb8082bebf #+mandoc.39761c2ffd4043932efc37327208a2d642eed793d788ef68d254445528d26ea1 #+tinyssh.467e70e862010c83ab6c915451821b7f53b60da2745ec9e05ac781fe7b725ecc -#+system-config.c13aba24008a3f3f5138ca6c21f88ebbc1ef095548453d4a3a7c1a312039b24e -#+system-config-rc.5da304f7693b69fbf9e12b71d298d0b23fd40f2daa31866aa87afa73b9954639 -#+system-config-scripts.969394cd7c8e47dc3c8c0d667d6c1e6bc78c1803b4132d98540f407ff3bdb2d0 -#+system-config-init.6ed1ae856c48a675342aabfbb0822e180b3434b4795cc240ccc8297ac9574bd3 -#+system-config-zsh.342405e361b8a246be17fc039d8daf03cb109e780fb15e883af8b10ba2fc27ba +#+system-config.81207947a6509325f2c014251f9f451736dd0bf22847b9f3d2c69224ba320237 +#+system-config-rc.de629be1f9e21e11c562bd814a89631f0e1f49ea9188bc81ae74f433d801b360 +#+system-config-scripts.9d2ad593023913eced46657c6f29b0a2635fb0338ab11ef20ab3e34adf6dcfcb +#+system-config-init.c8b92050925ba7da2eaa16f26b52bfa0f60e9c92b4340c492ab34c7e59e77e6d +#+system-config-zsh.8e3c4a682bd450967243d23abd5358c2aab4cdcb8900c21741264f943af12ea4 #+busybox-modutils.f523c9c2d657e3375ca7b081ebb659bf606b103db8865c728be5956079255ed0 \ No newline at end of file diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.ae6cb0efaaa95aec3d8ec6828b87467192353eeaac8670808f6993e2c2f26cbb -#+pthbs-banginstall.3fe7fc2b8f196f5520fb6397602ac110c504cd49f24f8c74f7696fe6774ea4f7 +#+zsh.fac724dce123ee6354b10348f3405eaa9cd1912ea9c40602352a60a718cba69b +#+pthbs-banginstall.6b90772fce1b322227660fd2599366880ae696b3de14c7371aba083527a8d5de #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.ae6cb0efaaa95aec3d8ec6828b87467192353eeaac8670808f6993e2c2f26cbb -#+pthbs-banginstall.3fe7fc2b8f196f5520fb6397602ac110c504cd49f24f8c74f7696fe6774ea4f7 +#+zsh.fac724dce123ee6354b10348f3405eaa9cd1912ea9c40602352a60a718cba69b +#+pthbs-banginstall.6b90772fce1b322227660fd2599366880ae696b3de14c7371aba083527a8d5de #+execline.67203c458bf7acff865509a59d8601930cd9d0b762796198f8cc658f25e85a3a #+musl-cross-make.cd12e9d331fd3f602f554602ef6eae95ee92dee8a9d1e3d9e668d2e890b61156 #+ccx-utils.4cc69559cc7197bc4c7f2b829b17d019637304658c7faa6361027bd1a6b7e9ee diff --git a/variants/root-x86_64/mdev-scripts b/variants/root-x86_64/mdev-scripts @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.ae6cb0efaaa95aec3d8ec6828b87467192353eeaac8670808f6993e2c2f26cbb -#+pthbs-banginstall.3fe7fc2b8f196f5520fb6397602ac110c504cd49f24f8c74f7696fe6774ea4f7 +#+zsh.fac724dce123ee6354b10348f3405eaa9cd1912ea9c40602352a60a718cba69b +#+pthbs-banginstall.6b90772fce1b322227660fd2599366880ae696b3de14c7371aba083527a8d5de #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment @@ -45,6 +45,6 @@ #+busybox-cron.2aafad4cee8c900ff3536339dae42bfe8ff11bbb258aa2a7fc1f1e75ecee0632 #+execline.67203c458bf7acff865509a59d8601930cd9d0b762796198f8cc658f25e85a3a #+s6.56ff669c701d5de606e58c38bf8135f8e64d3217ba96cbcf8a1856d8463dfa45 -#+mdev-scripts.01f487f76a77ced42408b6354abc20852b100e79120363a4e7564f811d0690ae +#+mdev-scripts.a2b333d11a9e89eed11b518015c892d30198e88da4083c654128ae547d5160c7 #+mdevd.7122c304421366d0569204e6bad60b2052f2dcc89aa08b35babf701c5907a8b6 #+busybox-modutils.f523c9c2d657e3375ca7b081ebb659bf606b103db8865c728be5956079255ed0 \ No newline at end of file diff --git a/variants/root-x86_64/pthbs-banginstall b/variants/root-x86_64/pthbs-banginstall @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.ae6cb0efaaa95aec3d8ec6828b87467192353eeaac8670808f6993e2c2f26cbb +#+zsh.fac724dce123ee6354b10348f3405eaa9cd1912ea9c40602352a60a718cba69b #@sha256:577cbaf04486ebc113d1c0b9dabd9a8eb29506dbfbdb5824d1e0601df4262715:pthbs-banginstall diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.ae6cb0efaaa95aec3d8ec6828b87467192353eeaac8670808f6993e2c2f26cbb -#+pthbs-banginstall.3fe7fc2b8f196f5520fb6397602ac110c504cd49f24f8c74f7696fe6774ea4f7 +#+zsh.fac724dce123ee6354b10348f3405eaa9cd1912ea9c40602352a60a718cba69b +#+pthbs-banginstall.6b90772fce1b322227660fd2599366880ae696b3de14c7371aba083527a8d5de #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -47,8 +47,8 @@ #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 #+diffutils.582822692039a355c7d278e9fc099ff3655da434458a8b3e69214fb15b408f32 #+gnu-make.0cd32abcb147224ce13b28cb5726f928c1269666569a65649cfff0b566a20ecd -#+aat.5be956fb08f5a8a9791dc321a2bf1170498280ea7a9d3513bf61d44b2ce072fb -#+fileset.f8610e6bbea5f0d557913120e574a6b6335b4bc234e239a86307000528b032ea +#+aat.83d8acd1b4045f478fe5daf715f7f172fdf4c7216852598ac7d0bf7d4a9ef768 +#+fileset.51c300f547c7807e84edf1fff800d84ad80bcdc154244c0d4cbbaa01b65aa5c9 #+rsync.e94935064dfee96fd9d56361b98387a76231718db009996065bc4a07d3b55ff0 #+execline.67203c458bf7acff865509a59d8601930cd9d0b762796198f8cc658f25e85a3a #+kbd.ddebd7ad90e262071e43c3451f52b1fb0a8193e83a7c65f2ea312d9b57c90bda @@ -56,10 +56,10 @@ #+s6-linux-utils.a7c2dbb5495230005406024ed4111e2fc42741e49a77f57c4028947dc63eed48 #+s6-rc.5d4d0a4afffa7579cd840e68e5616703803bd020d0541897b21e2b89027ddf0c #+s6.56ff669c701d5de606e58c38bf8135f8e64d3217ba96cbcf8a1856d8463dfa45 -#+zsh.ae6cb0efaaa95aec3d8ec6828b87467192353eeaac8670808f6993e2c2f26cbb +#+zsh.fac724dce123ee6354b10348f3405eaa9cd1912ea9c40602352a60a718cba69b #+libcgroup.1f2f76896f984e27b169a1220e6b148d6ba3b0bc46cd784e4e7f7e1813c98b40 -#+system-config-scripts.969394cd7c8e47dc3c8c0d667d6c1e6bc78c1803b4132d98540f407ff3bdb2d0 -#+logincaps.c0a5a10d32d7fb61b07d72b11b64f3db623a8a1683c7f274642ca98de89a9677 +#+system-config-scripts.9d2ad593023913eced46657c6f29b0a2635fb0338ab11ef20ab3e34adf6dcfcb +#+logincaps.ed7d875d1b703e84e56c5f02e235b080500fb1170c516d5c639e303621707440 #+busybox-modutils.f523c9c2d657e3375ca7b081ebb659bf606b103db8865c728be5956079255ed0 #@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config @@ -97,8 +97,8 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.2409925bf3937e8650387471d568d9c5b276b56025f1ff8c4fd844b90e669f59' \ - 'pthbs_path_mdevd=/versions/env.aa34ec8ff5c9bfc282cf5aabab5f0e63cb71546ba2ca748e3f0bc6a3f6a4e79e' \ + 'pthbs_path_containers=/versions/env.ca8744959e61ba71604ed430485810ea6ea38d1e4894ac0ef8b0753bec6ad26f' \ + 'pthbs_path_mdevd=/versions/env.277e138690fd5f075c7ebd82ff70ab5e9e0d4b11416c8545d8c5914997e43e04' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -50,7 +50,7 @@ #+s6-portable-utils.de6bd725492abae2a88540fc19b915f74967ca77e71f074f76c4d71bb1f78ded #+s6-linux-init.58fc58cdec1ca2460fba9ef0c4e86972ec1f73a6f5cc2b7f350e3573f650669f #+execline.67203c458bf7acff865509a59d8601930cd9d0b762796198f8cc658f25e85a3a -#+system-config-rc.5da304f7693b69fbf9e12b71d298d0b23fd40f2daa31866aa87afa73b9954639 +#+system-config-rc.de629be1f9e21e11c562bd814a89631f0e1f49ea9188bc81ae74f433d801b360 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.5da304f7693b69fbf9e12b71d298d0b23fd40f2daa31866aa87afa73b9954639/config/s6-rc-db +s6rcdb=/versions/system-config-rc.de629be1f9e21e11c562bd814a89631f0e1f49ea9188bc81ae74f433d801b360/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 @@ -29,8 +29,8 @@ #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 #+busybox-diffutils.6c40cfac430f81e28c210960ed2ce0917cbb08974b985c2c22fc4f0fd870854e #+s6-rc.5d4d0a4afffa7579cd840e68e5616703803bd020d0541897b21e2b89027ddf0c -#+fileset.f8610e6bbea5f0d557913120e574a6b6335b4bc234e239a86307000528b032ea -#+system-config.c13aba24008a3f3f5138ca6c21f88ebbc1ef095548453d4a3a7c1a312039b24e +#+fileset.51c300f547c7807e84edf1fff800d84ad80bcdc154244c0d4cbbaa01b65aa5c9 +#+system-config.81207947a6509325f2c014251f9f451736dd0bf22847b9f3d2c69224ba320237 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.c13aba24008a3f3f5138ca6c21f88ebbc1ef095548453d4a3a7c1a312039b24e/config/s6-rc-source +src=/versions/system-config.81207947a6509325f2c014251f9f451736dd0bf22847b9f3d2c69224ba320237/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/system-config-scripts b/variants/root-x86_64/system-config-scripts @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.ae6cb0efaaa95aec3d8ec6828b87467192353eeaac8670808f6993e2c2f26cbb -#+pthbs-banginstall.3fe7fc2b8f196f5520fb6397602ac110c504cd49f24f8c74f7696fe6774ea4f7 +#+zsh.fac724dce123ee6354b10348f3405eaa9cd1912ea9c40602352a60a718cba69b +#+pthbs-banginstall.6b90772fce1b322227660fd2599366880ae696b3de14c7371aba083527a8d5de #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts diff --git a/variants/root-x86_64/system-config-zsh b/variants/root-x86_64/system-config-zsh @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.ae6cb0efaaa95aec3d8ec6828b87467192353eeaac8670808f6993e2c2f26cbb +#+zsh.fac724dce123ee6354b10348f3405eaa9cd1912ea9c40602352a60a718cba69b #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env @@ -28,7 +28,7 @@ #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 #+execline.67203c458bf7acff865509a59d8601930cd9d0b762796198f8cc658f25e85a3a -#+pthbs-banginstall.3fe7fc2b8f196f5520fb6397602ac110c504cd49f24f8c74f7696fe6774ea4f7 +#+pthbs-banginstall.6b90772fce1b322227660fd2599366880ae696b3de14c7371aba083527a8d5de #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -61,14 +61,14 @@ #+s6-dns.098fa9d6563b4377376269b3efc07cba279f227af48726802a89635b0cab5270 #+libressl.027ad93b75fe650b2d6df50f160dfc68ce0894fa543b4459aa8e0c003e4bf950 #+s6-networking.f3a482f5988c22c18dd95d71a183cce811d86bab49d7503812487c094d2c04a0 -#+zsh.ae6cb0efaaa95aec3d8ec6828b87467192353eeaac8670808f6993e2c2f26cbb -#+pthbs-banginstall.3fe7fc2b8f196f5520fb6397602ac110c504cd49f24f8c74f7696fe6774ea4f7 -#+aat.5be956fb08f5a8a9791dc321a2bf1170498280ea7a9d3513bf61d44b2ce072fb -#+confz.a5f2f169a888d816a743e1ab6d41421bfd1d9f625da681b449ceec6e3a734a58 -#+containers.fa32b75bffd3cce3a67f41aec9bbde69db609dd7c09bb805d350f76a242c500c -#+fileset.f8610e6bbea5f0d557913120e574a6b6335b4bc234e239a86307000528b032ea -#+logincaps.c0a5a10d32d7fb61b07d72b11b64f3db623a8a1683c7f274642ca98de89a9677 -#+snaprep.b58dd0157ba50d11994cefd4466c280769ee575db8a06545c3fcdeaf4dda1fde +#+zsh.fac724dce123ee6354b10348f3405eaa9cd1912ea9c40602352a60a718cba69b +#+pthbs-banginstall.6b90772fce1b322227660fd2599366880ae696b3de14c7371aba083527a8d5de +#+aat.83d8acd1b4045f478fe5daf715f7f172fdf4c7216852598ac7d0bf7d4a9ef768 +#+confz.578d4817321401b70cf01463ae706834fbfa5d6e5208b9dfda0b6442ad1a1ab3 +#+containers.d4f2883dfc552df1ea4ca12a6c3b839a5fbc487def64cd90926e6af10614bd7a +#+fileset.51c300f547c7807e84edf1fff800d84ad80bcdc154244c0d4cbbaa01b65aa5c9 +#+logincaps.ed7d875d1b703e84e56c5f02e235b080500fb1170c516d5c639e303621707440 +#+snaprep.df42175317da2bff2b5c26e0db4ad71662df84c00d278e5f356bf915c602ad8f #+curl.8619a4c494e022953bebe64abe725a9e7c56bfbec2c8cd259cf7c8e9beeb6d42 #+git.af468fbc90368a5ce00837bea508ab60f7fc9154e1ce836bfd013502ca010872 #+xbps.2f0f75d783403363b5f1df490715d40d14a0599d3f79026eb1812c36a48c9bc2 @@ -79,7 +79,7 @@ #+libcap.c7f63e1f43c6ecb4eb53f37df98d86588e50bc796de116b114d1073e6b18c80e #+applyuidgid-caps.4b553a40253e50b2feeea8a1953c310df0012693fed64f731ffd90cc3aca3d5a #+ccx-utils.4cc69559cc7197bc4c7f2b829b17d019637304658c7faa6361027bd1a6b7e9ee -#+user-env.000d67233a0f8e4c0ef85236e29c97a5274ce7ac74ed157a2a6a2fad1e159512 +#+user-env.bdabd82b48974a74d0fd7dd943fe146fbae223d8f672b4098cb551136b8a52d9 #+mlog.0b224ab6f19b71888dde9fcac11161a3dfabb5c7c76499faad3c8b4c15ccd222 #+findutils.6e1c11dd369b6af8598bb021a609cea553bd6dd3888f39a3f032f3122e6dc752 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh @@ -36,8 +36,6 @@ #+patch.db18099714dbe2ca0ccf1d9425ba34403d505c98c499702aad7bc098628b373b #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@sha256:02f8f8bc764f0bcb83c03675cd8bfd27ed7554563f01a1a96e567f8c1a517be7:skip-test-failing-on-musl.patch -#@sha256:637f1198129209e3546ce9b3d340be6a8fddda5a54e13b4d7ecddfb2058ac795:fix-gcc14-incompatible-pointer-types.patch -#@sha256:c2f1de94290969a07130559a6544be93ac3ab2034ccddffaa1c7873112d373f1:implicit.patch #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. @@ -91,8 +89,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'zsh-5.9' patch -p1 <../skip-test-failing-on-musl.patch -patch -p1 <../fix-gcc14-incompatible-pointer-types.patch -patch -p1 <../implicit.patch export CPATH=$pthbs_build_environment/'include'