commit 56b4b590a0c9efff21138f5688f3d8a71b64ac7f parent 8c6e24e08035279e2e8ec0a6dd3a7ca047ced7ea Author: Jan Pobrislo <ccx@te2000.cz> Date: Fri, 10 Oct 2025 15:20:00 +0000 zsh: compile without ctty Diffstat:
39 files changed, 126 insertions(+), 123 deletions(-)
diff --git a/templates/pkg/zsh b/templates/pkg/zsh @@ -18,7 +18,8 @@ --enable-site-scriptdir="${prefix}/zsh/site-scripts" \ --enable-fndir="${prefix}/zsh/functions" \ --enable-site-fndir="${prefix}/zsh/site-functions" \ - --enable-runhelpdir="${prefix}/zsh/help" + --enable-runhelpdir="${prefix}/zsh/help" \ + --with-tcsetpgrp {% endblock %} {% block configure -%} {{ super() -}} diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build #+busybox.95e47e8860cf7e55e06683c45e714cb5157f2b5586b90532ad0696266b0565b1 #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 -#+zsh.30a58a8b8ca2cad7a47427fbc7890ef218729c3d7d168a05dae2fe257bc50f36 -#+pthbs-banginstall.a137a298558267114677feb03f64ac1c43caf5bb0b85acef3bfd6499166e83c3 +#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 +#+pthbs-banginstall.d8c1e01fa0673006dd7775e7229ad30ce2b2e80d85e6e2422cc1a0161daa90f5 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build #+busybox.95e47e8860cf7e55e06683c45e714cb5157f2b5586b90532ad0696266b0565b1 #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 -#+zsh.30a58a8b8ca2cad7a47427fbc7890ef218729c3d7d168a05dae2fe257bc50f36 -#+pthbs-banginstall.a137a298558267114677feb03f64ac1c43caf5bb0b85acef3bfd6499166e83c3 +#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 +#+pthbs-banginstall.d8c1e01fa0673006dd7775e7229ad30ce2b2e80d85e6e2422cc1a0161daa90f5 # - build script start - diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build #+busybox.95e47e8860cf7e55e06683c45e714cb5157f2b5586b90532ad0696266b0565b1 #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 -#+zsh.30a58a8b8ca2cad7a47427fbc7890ef218729c3d7d168a05dae2fe257bc50f36 -#+pthbs-banginstall.a137a298558267114677feb03f64ac1c43caf5bb0b85acef3bfd6499166e83c3 +#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 +#+pthbs-banginstall.d8c1e01fa0673006dd7775e7229ad30ce2b2e80d85e6e2422cc1a0161daa90f5 #+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a #+alpine-keys.8d9a97bce320472beb53c62bf7a068ebd453250e3ee99b7c90caac0669ae75fe #+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -5,14 +5,14 @@ #+s6.f852407c0b0743b39e769f67ffcaaabeb17233500699e2219937aed7b9774cc6 #+s6-portable-utils.1118fd2f6ea4b1390c615802d601bd6803cf4545b03a89bed68e36bc2a13087e #+s6-linux-utils.84f2d6d918b74fffc508df6cee48ed0f25124bd6c09f12558626d27992174226 -#+zsh.30a58a8b8ca2cad7a47427fbc7890ef218729c3d7d168a05dae2fe257bc50f36 -#+confz.ac912709a09d1c1171bd380b30789c991d049eea8e4dfe91a8f63a880d293dd5 -#+containers.55fd1a460489bfbb4cb9806deef08f4cc8a4f3e814d25c8d29f15f2fa461ce94 +#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 +#+confz.8a71d364d92d9bb818630e4b61ca4068b4ec81875f80e5c68dfcc4d9eac0dee8 +#+containers.9cca2c5309d058ac37f6b12f3147db7bb70581086bcffd6d86ed8657ef385af6 #+xbps.c800a4acd968f595949056f8a302a1e6ee0d960461318dce06c39a235e39b44b #+zstd.31469429bdd997f0a7a7eeb7dc4aa44b1e88d15227b1711943b136dc14cf753f #+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a #+alpine-keys.8d9a97bce320472beb53c62bf7a068ebd453250e3ee99b7c90caac0669ae75fe #+getent.08248f0ec8ff20bd1279b61e637208961f5959b2b8bb33caee7720289dad2b5c -#+fileset.8f5c0670709d8697ba2be5638f7bb1ec20417a14bdcacef9348962487627d144 +#+fileset.1e4c35e19575ab1aa3e3780fd5ea65e44b07d8c9a6522d0823c0731783874a2a #+ccx-utils.5d4a03d8fac908bceccbb03c49ab3e893b2cf08384226b326a9f6a062b8693fd #+easyseccomp.5c8cbd09f114926a5b62c89f014622c63c676a7b12613e12b85168652cdb4c30 \ No newline at end of file diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -17,14 +17,14 @@ #+s6-dns.033c7e71004ac30789388a68913ce24a9645227a24caa7633621ba1a24d772da #+libressl.a8eadd9e593afc24966b0233a9891bada3303a894c7303ff472f8cfcf19f432a #+s6-networking.6f3b376f54eeb4ebedd0e480ab1d2ad4a114a3df3e5a0ad4760bae55e3d437fe -#+zsh.30a58a8b8ca2cad7a47427fbc7890ef218729c3d7d168a05dae2fe257bc50f36 -#+pthbs-banginstall.a137a298558267114677feb03f64ac1c43caf5bb0b85acef3bfd6499166e83c3 -#+aat.4acb7a2b5bad5354b524f1dc2db30ecc186721b59af07c1f51c969e23b12b231 -#+confz.ac912709a09d1c1171bd380b30789c991d049eea8e4dfe91a8f63a880d293dd5 -#+containers.55fd1a460489bfbb4cb9806deef08f4cc8a4f3e814d25c8d29f15f2fa461ce94 -#+fileset.8f5c0670709d8697ba2be5638f7bb1ec20417a14bdcacef9348962487627d144 -#+logincaps.353045a06ece05a4017f97e0422fd7eb407ad16a39a9c617f7732936f8cc880a -#+snaprep.56c88a723db2464f2a0076f8d4d33cfb6be576a7cd1d72e26bf4ac3bbd2b186b +#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 +#+pthbs-banginstall.d8c1e01fa0673006dd7775e7229ad30ce2b2e80d85e6e2422cc1a0161daa90f5 +#+aat.62307fd1e13f86d94a1467a35fa9d3834fad9356a910cb509aa40f2d71244ecb +#+confz.8a71d364d92d9bb818630e4b61ca4068b4ec81875f80e5c68dfcc4d9eac0dee8 +#+containers.9cca2c5309d058ac37f6b12f3147db7bb70581086bcffd6d86ed8657ef385af6 +#+fileset.1e4c35e19575ab1aa3e3780fd5ea65e44b07d8c9a6522d0823c0731783874a2a +#+logincaps.ed682471f65da82f12f87e784f5ebc28d6b3aa0278adb40f22d60488a1778a87 +#+snaprep.b542802281d43aacc74c2eddecc5f5092dd1ca1b00dac9eaa85765334fac5373 #+curl.b77362632ee7e28e099c231bbda3b6220cc0cbc62aece9c63f4957cc3f415284 #+git.01a0c1531eb47cb51bf38a4082a0e16caf7be302d04fa24fde800985f8e37773 #+xbps.c800a4acd968f595949056f8a302a1e6ee0d960461318dce06c39a235e39b44b @@ -35,11 +35,11 @@ #+libcap.fb3b00482a6822dad5f4e5411bd5f929fd597a49fa535977dd37b785e13f22f0 #+applyuidgid-caps.6dc8f41171814dbb75b716a5d748812c48d6eef5ed7520db9172cf6dd6016936 #+ccx-utils.5d4a03d8fac908bceccbb03c49ab3e893b2cf08384226b326a9f6a062b8693fd -#+user-env.28c2274a67ddfea77815a3a2276a9946938a585a57439d592523c121d86059c8 +#+user-env.5b2549e66c95289333ac7c6a2b55ed1f0deecacfa752f4dc21e231183645f793 #+strace.40668df6151b4574b553a5923103e07c6ddb344daca606f04edd0ac48e060d55 #+mlog.a882a51752c5081bd671d7d564ea8b5c4502b93c0951cb77a20aa0238c66bc82 -#+system-config.c58bb8174f5811b3453d11d849e95f2f2d32e3efd8810f9d58920af3fe24ce12 -#+system-config-rc.5139ed3fba5eacfe7190a41d77b9c83ea2fa98a85c452716e994fa2fdecf8367 -#+system-config-scripts.3e1f409a3de4d44a9eae0d5a63ad5a0150f84cecd9104737df46839c9b9d78e7 -#+system-config-init.f7480822d6a229b8a78d6231df7e6eead0d58352041fc99da4b3105f81812a53 -#+system-config-zsh.552d5659234fc92d13ca8b2cf959f12fa2c45d33817db0391ffa0bf25701d17c- \ No newline at end of file +#+system-config.d133b64917f3b4e20a0bdd8cadd35c41aecd4f6bb80541b8a18bfaec47d64335 +#+system-config-rc.235ac2e0380aa130dd86fe0a2446da3c6e9c967ada5d71a73c2e4e19612e76f8 +#+system-config-scripts.8f77e88e05bb42a06362791abb2dc8334f7d17b5984ebddf445ea9e67a88de8d +#+system-config-init.1669e24d847b116b60625ee3f91af75b2f5f21fb70160c6bf59db332b346014f +#+system-config-zsh.ca45b9086a867eb594d68b32cb4826f747b819c640cb472a6fd1b649b1a1d760+ \ No newline at end of file diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build #+busybox.95e47e8860cf7e55e06683c45e714cb5157f2b5586b90532ad0696266b0565b1 #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 -#+zsh.30a58a8b8ca2cad7a47427fbc7890ef218729c3d7d168a05dae2fe257bc50f36 -#+pthbs-banginstall.a137a298558267114677feb03f64ac1c43caf5bb0b85acef3bfd6499166e83c3 +#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 +#+pthbs-banginstall.d8c1e01fa0673006dd7775e7229ad30ce2b2e80d85e6e2422cc1a0161daa90f5 # - build script start - diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build #+busybox.95e47e8860cf7e55e06683c45e714cb5157f2b5586b90532ad0696266b0565b1 #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 -#+zsh.30a58a8b8ca2cad7a47427fbc7890ef218729c3d7d168a05dae2fe257bc50f36 -#+pthbs-banginstall.a137a298558267114677feb03f64ac1c43caf5bb0b85acef3bfd6499166e83c3 +#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 +#+pthbs-banginstall.d8c1e01fa0673006dd7775e7229ad30ce2b2e80d85e6e2422cc1a0161daa90f5 #+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a #+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 #+ccx-utils.5d4a03d8fac908bceccbb03c49ab3e893b2cf08384226b326a9f6a062b8693fd diff --git a/variants/ccx-x86_64/mdev-scripts b/variants/ccx-x86_64/mdev-scripts @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+zsh.30a58a8b8ca2cad7a47427fbc7890ef218729c3d7d168a05dae2fe257bc50f36 -#+pthbs-banginstall.a137a298558267114677feb03f64ac1c43caf5bb0b85acef3bfd6499166e83c3 +#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 +#+pthbs-banginstall.d8c1e01fa0673006dd7775e7229ad30ce2b2e80d85e6e2422cc1a0161daa90f5 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -2,5 +2,5 @@ #+busybox.95e47e8860cf7e55e06683c45e714cb5157f2b5586b90532ad0696266b0565b1 #+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a #+s6.f852407c0b0743b39e769f67ffcaaabeb17233500699e2219937aed7b9774cc6 -#+mdev-scripts.7942b4b49ce625a33034e80cb18d74904e45782f84aa373d35894cd32491db30 +#+mdev-scripts.d45b984dd0ad5babd4bea4a5c6f68b9fb487cac68fbfcf41fe7cbe1ebf0ebca7 #+mdevd.eab2ce45bba3d843a3851ce1bece4c2650309df57d06b73ad633da3c019705b5 \ No newline at end of file diff --git a/variants/ccx-x86_64/pthbs-banginstall b/variants/ccx-x86_64/pthbs-banginstall @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #+busybox.95e47e8860cf7e55e06683c45e714cb5157f2b5586b90532ad0696266b0565b1 #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 -#+zsh.30a58a8b8ca2cad7a47427fbc7890ef218729c3d7d168a05dae2fe257bc50f36 +#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build #+busybox.95e47e8860cf7e55e06683c45e714cb5157f2b5586b90532ad0696266b0565b1 #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 -#+zsh.30a58a8b8ca2cad7a47427fbc7890ef218729c3d7d168a05dae2fe257bc50f36 -#+pthbs-banginstall.a137a298558267114677feb03f64ac1c43caf5bb0b85acef3bfd6499166e83c3 +#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 +#+pthbs-banginstall.d8c1e01fa0673006dd7775e7229ad30ce2b2e80d85e6e2422cc1a0161daa90f5 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -3,8 +3,8 @@ #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 #+diffutils.fc4061b81466c8eb17c5bd31bcf32c265b2d68f445edff7c6aac50de2cf23bf4 #+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+aat.4acb7a2b5bad5354b524f1dc2db30ecc186721b59af07c1f51c969e23b12b231 -#+fileset.8f5c0670709d8697ba2be5638f7bb1ec20417a14bdcacef9348962487627d144 +#+aat.62307fd1e13f86d94a1467a35fa9d3834fad9356a910cb509aa40f2d71244ecb +#+fileset.1e4c35e19575ab1aa3e3780fd5ea65e44b07d8c9a6522d0823c0731783874a2a #+rsync.ec6ab62cd8c365ad672dbdf63bb0b328386808a63957980e02d666b4f7915446 #+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a #+kbd.24923f91c68cff17fd63bc1b411d93c1e0797ebfd2f5865ddbcdd1198440e9c2 @@ -12,9 +12,9 @@ #+s6-linux-utils.84f2d6d918b74fffc508df6cee48ed0f25124bd6c09f12558626d27992174226 #+s6-rc.4709b0b39ae84f7a1efa984a66237c0f6133cec32466acdf0a139e2ef142f5ee #+s6.f852407c0b0743b39e769f67ffcaaabeb17233500699e2219937aed7b9774cc6 -#+zsh.30a58a8b8ca2cad7a47427fbc7890ef218729c3d7d168a05dae2fe257bc50f36 -#+system-config-scripts.3e1f409a3de4d44a9eae0d5a63ad5a0150f84cecd9104737df46839c9b9d78e7 -#+logincaps.353045a06ece05a4017f97e0422fd7eb407ad16a39a9c617f7732936f8cc880a +#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 +#+system-config-scripts.8f77e88e05bb42a06362791abb2dc8334f7d17b5984ebddf445ea9e67a88de8d +#+logincaps.ed682471f65da82f12f87e784f5ebc28d6b3aa0278adb40f22d60488a1778a87 #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config @@ -50,8 +50,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.cea0d886fee39a770cc040bfb4d21543106743c07f26c593f1c0412fc53dbfb7' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.39cdb7d54492af1e530354c1e4955c78b1fac97070e170c00edd961c6f66e879' \ + 'pthbs_path_containers=/home/ccx/versions/env.7faa8a665e2354776e09bb03aff1be11b49d2e5540b3a4664cd12a80e8309b82' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.6e5b147987b7538a00a94911fc69b3639b39d288a9495331f68e2a994ebc5953' \ 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 @@ -6,7 +6,7 @@ #+s6-portable-utils.1118fd2f6ea4b1390c615802d601bd6803cf4545b03a89bed68e36bc2a13087e #+s6-linux-init.a6dbfc71babdb9506c53cad385c613f13a602885c2db0a5db609a86ecc687bac #+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a -#+system-config-rc.5139ed3fba5eacfe7190a41d77b9c83ea2fa98a85c452716e994fa2fdecf8367 +#+system-config-rc.235ac2e0380aa130dd86fe0a2446da3c6e9c967ada5d71a73c2e4e19612e76f8 # - 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.5139ed3fba5eacfe7190a41d77b9c83ea2fa98a85c452716e994fa2fdecf8367/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.235ac2e0380aa130dd86fe0a2446da3c6e9c967ada5d71a73c2e4e19612e76f8/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 @@ -3,8 +3,8 @@ #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 #+busybox-diffutils.963ce6582575680763337552764b6a3c1be781d9fada1d52aa2d04fadeb229d0 #+s6-rc.4709b0b39ae84f7a1efa984a66237c0f6133cec32466acdf0a139e2ef142f5ee -#+fileset.8f5c0670709d8697ba2be5638f7bb1ec20417a14bdcacef9348962487627d144 -#+system-config.c58bb8174f5811b3453d11d849e95f2f2d32e3efd8810f9d58920af3fe24ce12 +#+fileset.1e4c35e19575ab1aa3e3780fd5ea65e44b07d8c9a6522d0823c0731783874a2a +#+system-config.d133b64917f3b4e20a0bdd8cadd35c41aecd4f6bb80541b8a18bfaec47d64335 # - build script start - @@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/home/ccx/versions/system-config.c58bb8174f5811b3453d11d849e95f2f2d32e3efd8810f9d58920af3fe24ce12/config/s6-rc-source +src=/home/ccx/versions/system-config.d133b64917f3b4e20a0bdd8cadd35c41aecd4f6bb80541b8a18bfaec47d64335/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 @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build #+busybox.95e47e8860cf7e55e06683c45e714cb5157f2b5586b90532ad0696266b0565b1 #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 -#+zsh.30a58a8b8ca2cad7a47427fbc7890ef218729c3d7d168a05dae2fe257bc50f36 -#+pthbs-banginstall.a137a298558267114677feb03f64ac1c43caf5bb0b85acef3bfd6499166e83c3 +#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 +#+pthbs-banginstall.d8c1e01fa0673006dd7775e7229ad30ce2b2e80d85e6e2422cc1a0161daa90f5 # - build script start - diff --git a/variants/ccx-x86_64/system-config-zsh b/variants/ccx-x86_64/system-config-zsh @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #+busybox.95e47e8860cf7e55e06683c45e714cb5157f2b5586b90532ad0696266b0565b1 #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 -#+zsh.30a58a8b8ca2cad7a47427fbc7890ef218729c3d7d168a05dae2fe257bc50f36 +#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env @@ -2,7 +2,7 @@ #+busybox.95e47e8860cf7e55e06683c45e714cb5157f2b5586b90532ad0696266b0565b1 #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 #+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a -#+pthbs-banginstall.a137a298558267114677feb03f64ac1c43caf5bb0b85acef3bfd6499166e83c3 +#+pthbs-banginstall.d8c1e01fa0673006dd7775e7229ad30ce2b2e80d85e6e2422cc1a0161daa90f5 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -17,14 +17,14 @@ #+s6-dns.033c7e71004ac30789388a68913ce24a9645227a24caa7633621ba1a24d772da #+libressl.a8eadd9e593afc24966b0233a9891bada3303a894c7303ff472f8cfcf19f432a #+s6-networking.6f3b376f54eeb4ebedd0e480ab1d2ad4a114a3df3e5a0ad4760bae55e3d437fe -#+zsh.30a58a8b8ca2cad7a47427fbc7890ef218729c3d7d168a05dae2fe257bc50f36 -#+pthbs-banginstall.a137a298558267114677feb03f64ac1c43caf5bb0b85acef3bfd6499166e83c3 -#+aat.4acb7a2b5bad5354b524f1dc2db30ecc186721b59af07c1f51c969e23b12b231 -#+confz.ac912709a09d1c1171bd380b30789c991d049eea8e4dfe91a8f63a880d293dd5 -#+containers.55fd1a460489bfbb4cb9806deef08f4cc8a4f3e814d25c8d29f15f2fa461ce94 -#+fileset.8f5c0670709d8697ba2be5638f7bb1ec20417a14bdcacef9348962487627d144 -#+logincaps.353045a06ece05a4017f97e0422fd7eb407ad16a39a9c617f7732936f8cc880a -#+snaprep.56c88a723db2464f2a0076f8d4d33cfb6be576a7cd1d72e26bf4ac3bbd2b186b +#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 +#+pthbs-banginstall.d8c1e01fa0673006dd7775e7229ad30ce2b2e80d85e6e2422cc1a0161daa90f5 +#+aat.62307fd1e13f86d94a1467a35fa9d3834fad9356a910cb509aa40f2d71244ecb +#+confz.8a71d364d92d9bb818630e4b61ca4068b4ec81875f80e5c68dfcc4d9eac0dee8 +#+containers.9cca2c5309d058ac37f6b12f3147db7bb70581086bcffd6d86ed8657ef385af6 +#+fileset.1e4c35e19575ab1aa3e3780fd5ea65e44b07d8c9a6522d0823c0731783874a2a +#+logincaps.ed682471f65da82f12f87e784f5ebc28d6b3aa0278adb40f22d60488a1778a87 +#+snaprep.b542802281d43aacc74c2eddecc5f5092dd1ca1b00dac9eaa85765334fac5373 #+curl.b77362632ee7e28e099c231bbda3b6220cc0cbc62aece9c63f4957cc3f415284 #+git.01a0c1531eb47cb51bf38a4082a0e16caf7be302d04fa24fde800985f8e37773 #+xbps.c800a4acd968f595949056f8a302a1e6ee0d960461318dce06c39a235e39b44b @@ -35,6 +35,6 @@ #+libcap.fb3b00482a6822dad5f4e5411bd5f929fd597a49fa535977dd37b785e13f22f0 #+applyuidgid-caps.6dc8f41171814dbb75b716a5d748812c48d6eef5ed7520db9172cf6dd6016936 #+ccx-utils.5d4a03d8fac908bceccbb03c49ab3e893b2cf08384226b326a9f6a062b8693fd -#+user-env.28c2274a67ddfea77815a3a2276a9946938a585a57439d592523c121d86059c8 +#+user-env.5b2549e66c95289333ac7c6a2b55ed1f0deecacfa752f4dc21e231183645f793 #+strace.40668df6151b4574b553a5923103e07c6ddb344daca606f04edd0ac48e060d55 #+mlog.a882a51752c5081bd671d7d564ea8b5c4502b93c0951cb77a20aa0238c66bc82 \ No newline at end of file diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh @@ -73,7 +73,8 @@ autotools_config_static --enable-static --disable-shared \ --enable-site-scriptdir="${prefix}/zsh/site-scripts" \ --enable-fndir="${prefix}/zsh/functions" \ --enable-site-fndir="${prefix}/zsh/site-functions" \ - --enable-runhelpdir="${prefix}/zsh/help" + --enable-runhelpdir="${prefix}/zsh/help" \ + --with-tcsetpgrp sed -Ee '/name=zsh\/(files|stat|system|zselect|zutil|regex|net\/socket|net\/tcp) /s/link=[^ ]+/link=static/' -i config.modules diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build #+busybox.2526c34c97fd930f1ab4798292308fa8f146dbdaca63c001cd94b6293991c621 #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d -#+zsh.4d5b36c7fe86c5110ce4c2af3884d6e79cec35d08df274b7a96911786fb9ca79 -#+pthbs-banginstall.9fb2091651ae22b1255489978104475a37f28deb21c5e576966ed933ce2c10f2 +#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 +#+pthbs-banginstall.a41f474adb0671a1ae113ec92835d33abed7cac61bf39cccc2f3ef3798e63801 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build #+busybox.2526c34c97fd930f1ab4798292308fa8f146dbdaca63c001cd94b6293991c621 #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d -#+zsh.4d5b36c7fe86c5110ce4c2af3884d6e79cec35d08df274b7a96911786fb9ca79 -#+pthbs-banginstall.9fb2091651ae22b1255489978104475a37f28deb21c5e576966ed933ce2c10f2 +#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 +#+pthbs-banginstall.a41f474adb0671a1ae113ec92835d33abed7cac61bf39cccc2f3ef3798e63801 # - build script start - diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build #+busybox.2526c34c97fd930f1ab4798292308fa8f146dbdaca63c001cd94b6293991c621 #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d -#+zsh.4d5b36c7fe86c5110ce4c2af3884d6e79cec35d08df274b7a96911786fb9ca79 -#+pthbs-banginstall.9fb2091651ae22b1255489978104475a37f28deb21c5e576966ed933ce2c10f2 +#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 +#+pthbs-banginstall.a41f474adb0671a1ae113ec92835d33abed7cac61bf39cccc2f3ef3798e63801 #+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab #+alpine-keys.d1fc739a1c6183675d38c994f8923e9d9ad79fae9f270de3e92f091efa4e0f03 #+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9 diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -5,14 +5,14 @@ #+s6.e2ee6b1e77f60e714bd5e81d709b65a07b24dbbd9af559918a598ef82523a8c5 #+s6-portable-utils.f4a82103130cfcc49f440896a006e18566297bd1eaec89689a29869958a3982b #+s6-linux-utils.825109564ccf0b423888de36d9946db0453a95ffbce5970d994da9007f8a34cd -#+zsh.4d5b36c7fe86c5110ce4c2af3884d6e79cec35d08df274b7a96911786fb9ca79 -#+confz.81f6d2a16f62d40cb5a622b885383ef50b59e13485819299e6c9e74348f4342a -#+containers.39b2646c2604d232bc0c60c17c7de394e1bd1a5e44740745789aab25e7e2fb74 +#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 +#+confz.2dbfc7f50224514e4ef6ac0b9bdf11bd88f4510b122060f41534947a5d6b0ef5 +#+containers.42e2a845439ec360cda43d32a96eabe575797558b46627bd262a9cb7f73b90e8 #+xbps.7e8a9a3746e363f5897183fa19a00a1ba4230822591552d2769a8771065d2b6f #+zstd.0c21eeca000c0fc1b714595d83cc5210adfa581edcf45820b95cb5921c46fcc4 #+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9 #+alpine-keys.d1fc739a1c6183675d38c994f8923e9d9ad79fae9f270de3e92f091efa4e0f03 #+getent.69120bd1e42219ed632181e8c4743c83e86e377d4b1d1197e6f8aa4c227b38ef -#+fileset.4db474e75d1c9f47a6bc27676fe4d970df2e0538b44ef9484d1ffb196e5aff03 +#+fileset.1a553242ae3584741d34c4c23884e39592f7029f4a8420ef1ee9d1fc7df370c9 #+ccx-utils.020204071392f91013fe10d159d85b96ce1cfcf6b0666afd324594dfefdf3b0a #+easyseccomp.269467cf87ab99af0934bb17ca3a9bc6c667dba73374df74a7f7e45b24bba298 \ No newline at end of file diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -17,14 +17,14 @@ #+s6-dns.8afcd2d5e584f27a60d214996ceaa8a3011c8430081cd7e00367775d46a9d311 #+libressl.73544348b521aed2a2f57a38489ce8c949c816a076783c913b7244cd8b75edae #+s6-networking.ca47d28ac08fed0aa231f80c6715c6b4ccecf133e904dc1800f7eb2f6a57f0bd -#+zsh.4d5b36c7fe86c5110ce4c2af3884d6e79cec35d08df274b7a96911786fb9ca79 -#+pthbs-banginstall.9fb2091651ae22b1255489978104475a37f28deb21c5e576966ed933ce2c10f2 -#+aat.1799e8dbbae83143cf707102160133aab2d64b47f743b90b6259fc6ebabe527a -#+confz.81f6d2a16f62d40cb5a622b885383ef50b59e13485819299e6c9e74348f4342a -#+containers.39b2646c2604d232bc0c60c17c7de394e1bd1a5e44740745789aab25e7e2fb74 -#+fileset.4db474e75d1c9f47a6bc27676fe4d970df2e0538b44ef9484d1ffb196e5aff03 -#+logincaps.56a5c1326898546387e923566ad7cbecd530e7b41a5ee0c36523363eacb2f244 -#+snaprep.e30d480c11e1ecd08277140842ace638bc74582b78e54f8b60c628d7c22a004f +#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 +#+pthbs-banginstall.a41f474adb0671a1ae113ec92835d33abed7cac61bf39cccc2f3ef3798e63801 +#+aat.96f28bf3da682f91a0806e7fab7cc9150bab177e519b4f25cd938f4641ec2756 +#+confz.2dbfc7f50224514e4ef6ac0b9bdf11bd88f4510b122060f41534947a5d6b0ef5 +#+containers.42e2a845439ec360cda43d32a96eabe575797558b46627bd262a9cb7f73b90e8 +#+fileset.1a553242ae3584741d34c4c23884e39592f7029f4a8420ef1ee9d1fc7df370c9 +#+logincaps.15cc2382756d15b36284933143c1ac596f64eb17d00f2f31867eb2353ad21b18 +#+snaprep.5de8254639f4212a1c99ee1f5aef4dc14f40dbc6bdc0655c5e369b84b5193c63 #+curl.7d12db521501148254cee062ca7489c9381330bb81fcfb28239e7846987a5db8 #+git.f01264e188e8d5c54cf4fce7f662f01ad1b1e8558e305368277e2521f7b6945d #+xbps.7e8a9a3746e363f5897183fa19a00a1ba4230822591552d2769a8771065d2b6f @@ -35,11 +35,11 @@ #+libcap.690eef0b9368137f247dff6177735aea6f9be49b1fdd5e8784c6fd4c8b84af48 #+applyuidgid-caps.8d7ac4d1fafc6213e4902c3cd0f946f5b1361a06897ded604b2dc4eff80d1bab #+ccx-utils.020204071392f91013fe10d159d85b96ce1cfcf6b0666afd324594dfefdf3b0a -#+user-env.09a5c832f8b7523d4ca0f63a36b5fc88b1e2f90174da119b6c38aa1eb4748052 +#+user-env.480496924079687a4a5512ef9a9ee1f509e11337af0b24a8f3faa860e4091385 #+strace.f9dbe83d3eaac5f19c4d7b3971928e97af25794472024ea02b4fd20ef5d977c2 #+mlog.7a615a6cd358a942b7d328b13562fc11cb3c82d2933f3de7fa727db87d48e6c2 -#+system-config.083fb16dc34da47f5ff9e9f7d679672225f866fe18b553249ab973423ab4d7ac -#+system-config-rc.562b8db2248dfe553a0a5611340e0be2e4e2225c7fe6d4e02c107a22957ebf3e -#+system-config-scripts.79d6495407a3e0f35f7d9885984dcb0d751692f64ce3864e45fdddf68ab0fa35 -#+system-config-init.40a80055931c60285d8da10b4696b9f4a57a9b81f315a9776c14838c9e9cad1e -#+system-config-zsh.573941fb2f946b7b4d32213fe1b40e1b22734527a1ce571863a3e3812a827d40- \ No newline at end of file +#+system-config.ae9b1236b40fcab26ce8fc05d696287cb09bc9969e045cd21202f10f3d3fdf31 +#+system-config-rc.79eeb46cda24f651cf812806e75d37e3dad600042353f249c9f927d32b314337 +#+system-config-scripts.ab783c1a7795825a2095a143834394caea0c59d53adc337dad9856557dd105c0 +#+system-config-init.1f977aa752b221a95e1dc28fb1b46aa4eed27e6496a316af2c2b0adcfe2d6e61 +#+system-config-zsh.2395a0ac100619f08b05c21044f60208ef3fcb135a9302047c299e6d7ee2a6b1+ \ No newline at end of file diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build #+busybox.2526c34c97fd930f1ab4798292308fa8f146dbdaca63c001cd94b6293991c621 #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d -#+zsh.4d5b36c7fe86c5110ce4c2af3884d6e79cec35d08df274b7a96911786fb9ca79 -#+pthbs-banginstall.9fb2091651ae22b1255489978104475a37f28deb21c5e576966ed933ce2c10f2 +#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 +#+pthbs-banginstall.a41f474adb0671a1ae113ec92835d33abed7cac61bf39cccc2f3ef3798e63801 # - build script start - diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build #+busybox.2526c34c97fd930f1ab4798292308fa8f146dbdaca63c001cd94b6293991c621 #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d -#+zsh.4d5b36c7fe86c5110ce4c2af3884d6e79cec35d08df274b7a96911786fb9ca79 -#+pthbs-banginstall.9fb2091651ae22b1255489978104475a37f28deb21c5e576966ed933ce2c10f2 +#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 +#+pthbs-banginstall.a41f474adb0671a1ae113ec92835d33abed7cac61bf39cccc2f3ef3798e63801 #+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab #+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f #+ccx-utils.020204071392f91013fe10d159d85b96ce1cfcf6b0666afd324594dfefdf3b0a diff --git a/variants/root-x86_64/mdev-scripts b/variants/root-x86_64/mdev-scripts @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+zsh.4d5b36c7fe86c5110ce4c2af3884d6e79cec35d08df274b7a96911786fb9ca79 -#+pthbs-banginstall.9fb2091651ae22b1255489978104475a37f28deb21c5e576966ed933ce2c10f2 +#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 +#+pthbs-banginstall.a41f474adb0671a1ae113ec92835d33abed7cac61bf39cccc2f3ef3798e63801 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment @@ -2,5 +2,5 @@ #+busybox.2526c34c97fd930f1ab4798292308fa8f146dbdaca63c001cd94b6293991c621 #+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab #+s6.e2ee6b1e77f60e714bd5e81d709b65a07b24dbbd9af559918a598ef82523a8c5 -#+mdev-scripts.3ab34afcbf1f25c37d5662f67511959a0581d6537937d001db81b153593605e9 +#+mdev-scripts.97d5319496ba3ea3dfd1063532e1cbc7bb75135be36ef606c4b1ed632aef49b4 #+mdevd.11a79d9cd767081f3e6406772baa528b4dff8810a17694435f34ac675ec617c1 \ No newline at end of file diff --git a/variants/root-x86_64/pthbs-banginstall b/variants/root-x86_64/pthbs-banginstall @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #+busybox.2526c34c97fd930f1ab4798292308fa8f146dbdaca63c001cd94b6293991c621 #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d -#+zsh.4d5b36c7fe86c5110ce4c2af3884d6e79cec35d08df274b7a96911786fb9ca79 +#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build #+busybox.2526c34c97fd930f1ab4798292308fa8f146dbdaca63c001cd94b6293991c621 #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d -#+zsh.4d5b36c7fe86c5110ce4c2af3884d6e79cec35d08df274b7a96911786fb9ca79 -#+pthbs-banginstall.9fb2091651ae22b1255489978104475a37f28deb21c5e576966ed933ce2c10f2 +#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 +#+pthbs-banginstall.a41f474adb0671a1ae113ec92835d33abed7cac61bf39cccc2f3ef3798e63801 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -3,8 +3,8 @@ #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d #+diffutils.c5771cacb014b64df08c4d6c22f639d8203518119ef0bb57dac26020cb4db0b6 #+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+aat.1799e8dbbae83143cf707102160133aab2d64b47f743b90b6259fc6ebabe527a -#+fileset.4db474e75d1c9f47a6bc27676fe4d970df2e0538b44ef9484d1ffb196e5aff03 +#+aat.96f28bf3da682f91a0806e7fab7cc9150bab177e519b4f25cd938f4641ec2756 +#+fileset.1a553242ae3584741d34c4c23884e39592f7029f4a8420ef1ee9d1fc7df370c9 #+rsync.c8a1e6d8328390565e688b8646258be9ec9430e16a50e1c6dfaf70ba05114f14 #+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab #+kbd.4a936e7295cc33542f5bb78e558229a8904355b0a9126b329f6e356179711a6f @@ -12,9 +12,9 @@ #+s6-linux-utils.825109564ccf0b423888de36d9946db0453a95ffbce5970d994da9007f8a34cd #+s6-rc.6785af4c10f0e833235def47f34d88b8ac76fa2116f63d3bff478fb78de38b04 #+s6.e2ee6b1e77f60e714bd5e81d709b65a07b24dbbd9af559918a598ef82523a8c5 -#+zsh.4d5b36c7fe86c5110ce4c2af3884d6e79cec35d08df274b7a96911786fb9ca79 -#+system-config-scripts.79d6495407a3e0f35f7d9885984dcb0d751692f64ce3864e45fdddf68ab0fa35 -#+logincaps.56a5c1326898546387e923566ad7cbecd530e7b41a5ee0c36523363eacb2f244 +#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 +#+system-config-scripts.ab783c1a7795825a2095a143834394caea0c59d53adc337dad9856557dd105c0 +#+logincaps.15cc2382756d15b36284933143c1ac596f64eb17d00f2f31867eb2353ad21b18 #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config @@ -50,8 +50,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.4b821665a4fde85eb6a92ca8214b00164c706e29e5c976e147c8fb47b570d26b' \ - 'pthbs_path_mdevd=/versions/env.1a9ccb56165cbf9500c0bc19a58750f14f5c5c3bcf0e2ed59cdbbe0ce77d76b5' \ + 'pthbs_path_containers=/versions/env.bd40d1f8e1d98c482a750988546312166d845a40424a02afce1870282a7b6d99' \ + 'pthbs_path_mdevd=/versions/env.6e1522972252b294fec7f75674d0aba049486a5957b94ab2e1bd8554ba4278db' \ 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 @@ -6,7 +6,7 @@ #+s6-portable-utils.f4a82103130cfcc49f440896a006e18566297bd1eaec89689a29869958a3982b #+s6-linux-init.07931b00ba7cfaca6877d09e985caf229cbd20c34f35b30754a35b9d19762b56 #+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab -#+system-config-rc.562b8db2248dfe553a0a5611340e0be2e4e2225c7fe6d4e02c107a22957ebf3e +#+system-config-rc.79eeb46cda24f651cf812806e75d37e3dad600042353f249c9f927d32b314337 # - 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.562b8db2248dfe553a0a5611340e0be2e4e2225c7fe6d4e02c107a22957ebf3e/config/s6-rc-db +s6rcdb=/versions/system-config-rc.79eeb46cda24f651cf812806e75d37e3dad600042353f249c9f927d32b314337/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 @@ -3,8 +3,8 @@ #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d #+busybox-diffutils.38ca9e723dfa24bd5cc2281952ff03c7dd312918a28dc0619b9816a293b5c8f5 #+s6-rc.6785af4c10f0e833235def47f34d88b8ac76fa2116f63d3bff478fb78de38b04 -#+fileset.4db474e75d1c9f47a6bc27676fe4d970df2e0538b44ef9484d1ffb196e5aff03 -#+system-config.083fb16dc34da47f5ff9e9f7d679672225f866fe18b553249ab973423ab4d7ac +#+fileset.1a553242ae3584741d34c4c23884e39592f7029f4a8420ef1ee9d1fc7df370c9 +#+system-config.ae9b1236b40fcab26ce8fc05d696287cb09bc9969e045cd21202f10f3d3fdf31 # - build script start - @@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/versions/system-config.083fb16dc34da47f5ff9e9f7d679672225f866fe18b553249ab973423ab4d7ac/config/s6-rc-source +src=/versions/system-config.ae9b1236b40fcab26ce8fc05d696287cb09bc9969e045cd21202f10f3d3fdf31/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 @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build #+busybox.2526c34c97fd930f1ab4798292308fa8f146dbdaca63c001cd94b6293991c621 #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d -#+zsh.4d5b36c7fe86c5110ce4c2af3884d6e79cec35d08df274b7a96911786fb9ca79 -#+pthbs-banginstall.9fb2091651ae22b1255489978104475a37f28deb21c5e576966ed933ce2c10f2 +#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 +#+pthbs-banginstall.a41f474adb0671a1ae113ec92835d33abed7cac61bf39cccc2f3ef3798e63801 # - build script start - diff --git a/variants/root-x86_64/system-config-zsh b/variants/root-x86_64/system-config-zsh @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #+busybox.2526c34c97fd930f1ab4798292308fa8f146dbdaca63c001cd94b6293991c621 #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d -#+zsh.4d5b36c7fe86c5110ce4c2af3884d6e79cec35d08df274b7a96911786fb9ca79 +#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env @@ -2,7 +2,7 @@ #+busybox.2526c34c97fd930f1ab4798292308fa8f146dbdaca63c001cd94b6293991c621 #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d #+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab -#+pthbs-banginstall.9fb2091651ae22b1255489978104475a37f28deb21c5e576966ed933ce2c10f2 +#+pthbs-banginstall.a41f474adb0671a1ae113ec92835d33abed7cac61bf39cccc2f3ef3798e63801 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -17,14 +17,14 @@ #+s6-dns.8afcd2d5e584f27a60d214996ceaa8a3011c8430081cd7e00367775d46a9d311 #+libressl.73544348b521aed2a2f57a38489ce8c949c816a076783c913b7244cd8b75edae #+s6-networking.ca47d28ac08fed0aa231f80c6715c6b4ccecf133e904dc1800f7eb2f6a57f0bd -#+zsh.4d5b36c7fe86c5110ce4c2af3884d6e79cec35d08df274b7a96911786fb9ca79 -#+pthbs-banginstall.9fb2091651ae22b1255489978104475a37f28deb21c5e576966ed933ce2c10f2 -#+aat.1799e8dbbae83143cf707102160133aab2d64b47f743b90b6259fc6ebabe527a -#+confz.81f6d2a16f62d40cb5a622b885383ef50b59e13485819299e6c9e74348f4342a -#+containers.39b2646c2604d232bc0c60c17c7de394e1bd1a5e44740745789aab25e7e2fb74 -#+fileset.4db474e75d1c9f47a6bc27676fe4d970df2e0538b44ef9484d1ffb196e5aff03 -#+logincaps.56a5c1326898546387e923566ad7cbecd530e7b41a5ee0c36523363eacb2f244 -#+snaprep.e30d480c11e1ecd08277140842ace638bc74582b78e54f8b60c628d7c22a004f +#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 +#+pthbs-banginstall.a41f474adb0671a1ae113ec92835d33abed7cac61bf39cccc2f3ef3798e63801 +#+aat.96f28bf3da682f91a0806e7fab7cc9150bab177e519b4f25cd938f4641ec2756 +#+confz.2dbfc7f50224514e4ef6ac0b9bdf11bd88f4510b122060f41534947a5d6b0ef5 +#+containers.42e2a845439ec360cda43d32a96eabe575797558b46627bd262a9cb7f73b90e8 +#+fileset.1a553242ae3584741d34c4c23884e39592f7029f4a8420ef1ee9d1fc7df370c9 +#+logincaps.15cc2382756d15b36284933143c1ac596f64eb17d00f2f31867eb2353ad21b18 +#+snaprep.5de8254639f4212a1c99ee1f5aef4dc14f40dbc6bdc0655c5e369b84b5193c63 #+curl.7d12db521501148254cee062ca7489c9381330bb81fcfb28239e7846987a5db8 #+git.f01264e188e8d5c54cf4fce7f662f01ad1b1e8558e305368277e2521f7b6945d #+xbps.7e8a9a3746e363f5897183fa19a00a1ba4230822591552d2769a8771065d2b6f @@ -35,6 +35,6 @@ #+libcap.690eef0b9368137f247dff6177735aea6f9be49b1fdd5e8784c6fd4c8b84af48 #+applyuidgid-caps.8d7ac4d1fafc6213e4902c3cd0f946f5b1361a06897ded604b2dc4eff80d1bab #+ccx-utils.020204071392f91013fe10d159d85b96ce1cfcf6b0666afd324594dfefdf3b0a -#+user-env.09a5c832f8b7523d4ca0f63a36b5fc88b1e2f90174da119b6c38aa1eb4748052 +#+user-env.480496924079687a4a5512ef9a9ee1f509e11337af0b24a8f3faa860e4091385 #+strace.f9dbe83d3eaac5f19c4d7b3971928e97af25794472024ea02b4fd20ef5d977c2 #+mlog.7a615a6cd358a942b7d328b13562fc11cb3c82d2933f3de7fa727db87d48e6c2 \ No newline at end of file diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh @@ -73,7 +73,8 @@ autotools_config_static --enable-static --disable-shared \ --enable-site-scriptdir="${prefix}/zsh/site-scripts" \ --enable-fndir="${prefix}/zsh/functions" \ --enable-site-fndir="${prefix}/zsh/site-functions" \ - --enable-runhelpdir="${prefix}/zsh/help" + --enable-runhelpdir="${prefix}/zsh/help" \ + --with-tcsetpgrp sed -Ee '/name=zsh\/(files|stat|system|zselect|zutil|regex|net\/socket|net\/tcp) /s/link=[^ ]+/link=static/' -i config.modules