commit 1f3bdef98563c8a4d6d789bc34338e24bed133fa parent dfa627bf843822edda896c082b18a400589db4e8 Author: Jan Pobrislo <ccx@te2000.cz> Date: Thu, 11 Dec 2025 12:29:13 +0000 set up tracing for pthbs-banginstall Diffstat:
37 files changed, 98 insertions(+), 94 deletions(-)
diff --git a/filelist.sha256 b/filelist.sha256 @@ -94,7 +94,7 @@ a21336df3bc3b267fbda940d9f533f66b0eacb520b8421cca3ddc943f620a791 files/mcm-musl e91027b085cc83c7724fd6b624641a74256288b16e9f48a37d3ceeab6e498f3f files/nawk-20250116-proctab.c 98a8ddd1004034aeff4cc6d18e5df23f55d2869d879735c3b571594a44ba1212 files/nlist.h ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417 files/noobjtool.patch -1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d files/pthbs-banginstall +4f3aea4566ff0e9ce46c6efaf615418e629026053770b1ec26913d38e748256d files/pthbs-banginstall 627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e files/s6_clone3_newpid.patch 2a782825cd870e1fdf77a579c80701c0530bc6d8fa94100cab24bf31f0f457d3 files/s6_clone_newpid.patch c7d3e7ef077d7673567d2f0c34ba2ebd689dab1250286ab482a3064c73ff7d7c files/s6_clone_newpid.patch.old diff --git a/files/pthbs-banginstall b/files/pthbs-banginstall @@ -1,6 +1,10 @@ #!/command/zsh setopt no_unset extended_glob +if [[ -n ${pthbs_xtrace-} ]]; then + set -x +fi + typeset -g vd # versions dir, eg: /home/ccx/versions typeset -g pvd # package versions dir, eg: # /home/ccx/versions/pthbs-banginstall.d76..99a diff --git a/templates/pkg/logincaps b/templates/pkg/logincaps @@ -10,7 +10,7 @@ {% block install -%} {{ super() -}} -pthbs-banginstall etc/loginexec "${dest}" +pthbs_xtrace=1 pthbs-banginstall etc/loginexec "${dest}" cat >"${dest}/{{bindir}}/login-keepenv" <<EOF #!$(which execlineb) -S0 diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat @@ -28,7 +28,7 @@ #+busybox-findutils.b2b8e511be4dca01dcc369198cb5a87e68c6fab6c16d34caa2515ff93ca07381 #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a -#+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df +#+pthbs-banginstall.65c793c8181cbdcb92c82c38ab0cb5b8a6cfeb9a25aa3558b0d4cec57ab54ede #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz @@ -28,7 +28,7 @@ #+busybox-findutils.b2b8e511be4dca01dcc369198cb5a87e68c6fab6c16d34caa2515ff93ca07381 #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a -#+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df +#+pthbs-banginstall.65c793c8181cbdcb92c82c38ab0cb5b8a6cfeb9a25aa3558b0d4cec57ab54ede #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -28,7 +28,7 @@ #+busybox-findutils.b2b8e511be4dca01dcc369198cb5a87e68c6fab6c16d34caa2515ff93ca07381 #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a -#+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df +#+pthbs-banginstall.65c793c8181cbdcb92c82c38ab0cb5b8a6cfeb9a25aa3558b0d4cec57ab54ede #+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92 #+alpine-keys.b022c8887d93ae486745981a1749acfe6e602da6f3cee54c5582da3e56548611 #+apk-tools.29e0d5e4389d0c818110ff0eef0af390ecd9f9439e8394831e68094ecf7ac80d diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -49,14 +49,14 @@ #+s6-portable-utils.7f4db6a16ab09d3822d709aec42170cb1d2c7c752d88f13e3792e747cbd09a28 #+s6-linux-utils.d1a273c7c3eb1a7ba3fd51168731cab02cb23df123e9e5a8ae029a14a5091df1 #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a -#+confz.f0c5901534e31abbfd9a894e726f877d840e9a4f2e2855de94fa1b8b3252ac4d -#+containers.7ca64d348a12d3f50fe4f11ec19c112656fa9a3be1a0b7fc1adadc9d02f08d70 +#+confz.102cb48a694bd45522f8546b5545557d847917ef51dcf7c3d97c811f8eed1512 +#+containers.62851b20fc169d0abe407fe43bab7fb25c2a2cc41f8a3ff43e0bef7cd3f35fd9 #+xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541fefdd9f3ed6f36055ac #+zstd.07ebc1d049247600d4df20a2640d366674671001d16f9d046fbef08699a688c0 #+apk-tools.29e0d5e4389d0c818110ff0eef0af390ecd9f9439e8394831e68094ecf7ac80d #+alpine-keys.b022c8887d93ae486745981a1749acfe6e602da6f3cee54c5582da3e56548611 #+getent.6facc15ef702b77a02ba93519f2bc0ca161b55b4704e7607138c1eb7a2cca041 -#+fileset.e5a151f626de3d82ae8cbffbe8df007f016ae78c7a795565377da03798048476 +#+fileset.93d7de4bc897149bc9fe2cb5f8c369e499a09c48bb679b62d1c313db05dd824d #+ccx-utils.e4c42eee10e697abe0659a1d12afeb8480bf9525fb18046e7934279709a0077b #+easyseccomp.330029cffaf17cca5b39ef7eaf8ccc4b7dbf01685d07c6afdb56b4dcc6e6409d #+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -62,13 +62,13 @@ #+libressl.52dc61e1ae2a68ecd33b56ecd5b6fa148bfb124535d2659e3171693a31b2534b #+s6-networking.94dc8726d5df99793a6b10063fe0a746fefe8c90b303d70497b2cfaf11329a8e #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a -#+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df -#+aat.9e1a8d84c57afc208692dea539729548b5e2c84a062f232d0abb0eabebd845c7 -#+confz.f0c5901534e31abbfd9a894e726f877d840e9a4f2e2855de94fa1b8b3252ac4d -#+containers.7ca64d348a12d3f50fe4f11ec19c112656fa9a3be1a0b7fc1adadc9d02f08d70 -#+fileset.e5a151f626de3d82ae8cbffbe8df007f016ae78c7a795565377da03798048476 -#+logincaps.dff305698371563065d0ae0795204a975129931ea7a3c066701f7fc21dfbda4c -#+snaprep.e1f72149bfae312f87fba56b1598446eeec81db67b3a2e98dc894d185924d29b +#+pthbs-banginstall.65c793c8181cbdcb92c82c38ab0cb5b8a6cfeb9a25aa3558b0d4cec57ab54ede +#+aat.40bee67e2ee850d6daf8efb69f9ab2acaa6ff33aa057b61805981cb0f9d8ac33 +#+confz.102cb48a694bd45522f8546b5545557d847917ef51dcf7c3d97c811f8eed1512 +#+containers.62851b20fc169d0abe407fe43bab7fb25c2a2cc41f8a3ff43e0bef7cd3f35fd9 +#+fileset.93d7de4bc897149bc9fe2cb5f8c369e499a09c48bb679b62d1c313db05dd824d +#+logincaps.891ca826dd54b242ed33db8b6947faf8d05222b440bf83f59c5f80abaa320223 +#+snaprep.90b6b5c55b76bb584ecd96818ecf079ef9bc72f2551ba4bfabea6340c62715ca #+curl.6cd80be195a14ec4aec65793a00822f40ca1b1a923c321e3cfae9c085f4a6d89 #+git.d29443166e3f49fbd2c291e34c8cb67deab2e7699502cd70a35745eed68c1fb6 #+xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541fefdd9f3ed6f36055ac @@ -79,7 +79,7 @@ #+libcap.07fea7e8b98d7326c2f553d66607b9039422b9cea73bdc311c3543e0d326e962 #+applyuidgid-caps.86e8ee05ac608eece9ffe61c045b392e2b912bfbf41f3431037ab902992b6c4b #+ccx-utils.e4c42eee10e697abe0659a1d12afeb8480bf9525fb18046e7934279709a0077b -#+user-env.2ca98f00eb8e292136ab731ca3bea4bd6130d1d51047fe97643f12b3895eceac +#+user-env.72af759c2537a8a88c14a0b72937c28d556df0cdaf4d9d470f4bfc01a57bdce4 #+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5 #+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 @@ -87,9 +87,9 @@ #+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128 #+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc #+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af -#+system-config.4bd988c5bcd336415bc850050a515938c1645cf94742b3ef0bc1a6bb25b6d9b0 -#+system-config-rc.a0097e942e56a4fed590931384c3cf27df9205c253c5577a70d87631dcb43624 -#+system-config-scripts.0c081aa66e7b2b7ccfb20f9c75e5dfff8f8d6804d0b4624934a8059354c14d9e -#+system-config-init.74aa667b521ddd8fa00604ae56bdeda7b32edda2461d1164961fcc28b925e9fb +#+system-config.dbf351f160c91b7a540ac218ff46d329e816255de311d5c0c74b888aef7ffc1a +#+system-config-rc.ff049f314a4bff04d4371f1c73b413ef67df4407b6f4c9c7e7112dfd1491cf5f +#+system-config-scripts.5a99f9d4aca1fa987f48eeeb76ef299fb8a69256b90327056664e25c91cfc38e +#+system-config-init.e74f1dc8c8b6fd6a265029b09ddcbb5413499b4d27b78c53ee058994deb6bb85 #+system-config-zsh.4fbaba9e3faaa13ba5a2d93a2b3dc4a5a94ebb5ed5bb7facfc94308076a14253 #+busybox.4fe6cdfe11b32717d11efe7564d0b495aba0f2d3fecad9b803ee0505e2a11c9e \ No newline at end of file diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset @@ -28,7 +28,7 @@ #+busybox-findutils.b2b8e511be4dca01dcc369198cb5a87e68c6fab6c16d34caa2515ff93ca07381 #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a -#+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df +#+pthbs-banginstall.65c793c8181cbdcb92c82c38ab0cb5b8a6cfeb9a25aa3558b0d4cec57ab54ede #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -28,7 +28,7 @@ #+busybox-findutils.b2b8e511be4dca01dcc369198cb5a87e68c6fab6c16d34caa2515ff93ca07381 #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a -#+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df +#+pthbs-banginstall.65c793c8181cbdcb92c82c38ab0cb5b8a6cfeb9a25aa3558b0d4cec57ab54ede #+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92 #+musl-cross-make.14e02e45cc77fb5c9787349ef554dda78766f71652b100aee3b00e24a3d02cd1 #+ccx-utils.e4c42eee10e697abe0659a1d12afeb8480bf9525fb18046e7934279709a0077b @@ -76,7 +76,7 @@ if test -d zsh-functions; then mv -v zsh-functions "${dest}/zsh/site-functions" fi -pthbs-banginstall etc/loginexec "${dest}" +pthbs_xtrace=1 pthbs-banginstall etc/loginexec "${dest}" cat >"${dest}/command/login-keepenv" <<EOF #!$(which execlineb) -S0 diff --git a/variants/ccx-x86_64/mdev-scripts b/variants/ccx-x86_64/mdev-scripts @@ -28,7 +28,7 @@ #+busybox-findutils.b2b8e511be4dca01dcc369198cb5a87e68c6fab6c16d34caa2515ff93ca07381 #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a -#+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df +#+pthbs-banginstall.65c793c8181cbdcb92c82c38ab0cb5b8a6cfeb9a25aa3558b0d4cec57ab54ede #@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.e2baee01308ee00acc68c4b4af7cd78018dca2084cb3c201531fd77a64987fe2 #+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92 #+s6.0d5d4703e07c3e5a0d4567706c69119aad5a0e9a37c28bf6b05dd12a27dc1eb1 -#+mdev-scripts.2c27264b06d9d8bfd6ae59af0c511706a7891c94b02d6be072b3cdad53740491 +#+mdev-scripts.8cde5f9c5bbd23f5d287d7cd931c210bf927771d1a4d737126501bb3b6498854 #+mdevd.e5729bee65528cd131ac498226925a35a014741d40214d8e4476f8cb0d97fc36 #+busybox.4fe6cdfe11b32717d11efe7564d0b495aba0f2d3fecad9b803ee0505e2a11c9e \ No newline at end of file diff --git a/variants/ccx-x86_64/pthbs-banginstall b/variants/ccx-x86_64/pthbs-banginstall @@ -28,7 +28,7 @@ #+busybox-findutils.b2b8e511be4dca01dcc369198cb5a87e68c6fab6c16d34caa2515ff93ca07381 #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a -#@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall +#@sha256:4f3aea4566ff0e9ce46c6efaf615418e629026053770b1ec26913d38e748256d:pthbs-banginstall # - build script start - diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep @@ -28,7 +28,7 @@ #+busybox-findutils.b2b8e511be4dca01dcc369198cb5a87e68c6fab6c16d34caa2515ff93ca07381 #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a -#+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df +#+pthbs-banginstall.65c793c8181cbdcb92c82c38ab0cb5b8a6cfeb9a25aa3558b0d4cec57ab54ede #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -47,8 +47,8 @@ #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 #+diffutils.c4fd5be27f31e3f1d37dc73e540338839575d6748a9d754419f66cb4f08cf056 #+gnu-make.4034f4d785c5108ad387088199242aa8aa6920e7aab1f79ce51d1f43e97cb580 -#+aat.9e1a8d84c57afc208692dea539729548b5e2c84a062f232d0abb0eabebd845c7 -#+fileset.e5a151f626de3d82ae8cbffbe8df007f016ae78c7a795565377da03798048476 +#+aat.40bee67e2ee850d6daf8efb69f9ab2acaa6ff33aa057b61805981cb0f9d8ac33 +#+fileset.93d7de4bc897149bc9fe2cb5f8c369e499a09c48bb679b62d1c313db05dd824d #+rsync.847c889c40db7d219db3b84e245db91e309c8a4330b2b872ca70ef80b57a579a #+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92 #+kbd.26cc6da4f7c7f5a87f3d7f48b1adfce521ad06d606dfe9a8d5b4886119251feb @@ -58,8 +58,8 @@ #+s6.0d5d4703e07c3e5a0d4567706c69119aad5a0e9a37c28bf6b05dd12a27dc1eb1 #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a #+libcgroup.2e9791b8acfdda601a45ea42b0833b8b351c3012affb3dd3dbfd29d0e7145e9b -#+system-config-scripts.0c081aa66e7b2b7ccfb20f9c75e5dfff8f8d6804d0b4624934a8059354c14d9e -#+logincaps.dff305698371563065d0ae0795204a975129931ea7a3c066701f7fc21dfbda4c +#+system-config-scripts.5a99f9d4aca1fa987f48eeeb76ef299fb8a69256b90327056664e25c91cfc38e +#+logincaps.891ca826dd54b242ed33db8b6947faf8d05222b440bf83f59c5f80abaa320223 #+busybox.4fe6cdfe11b32717d11efe7564d0b495aba0f2d3fecad9b803ee0505e2a11c9e #@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.e504354206aeddd729f5a90232fdc070ef864da352cff6c014c5ec7553fb2e27' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.dedf82632e6eacb3426d6e815a8bbc2d7d6fedb34d1a426fefc28849cd4c583a' \ + 'pthbs_path_containers=/home/ccx/versions/env.fff769c042647cb0a43b18a2540c4e5a87ae785d7268050b0155ee09de33400b' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.884c99f5adb986c222be969279393a08492d7a896c6496b49b44707a80a1bcf4' \ 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.7f4db6a16ab09d3822d709aec42170cb1d2c7c752d88f13e3792e747cbd09a28 #+s6-linux-init.39d00512c8a37829a751fbbe1a7cfc37003dc9e3924d0ca13722eb2835830c2b #+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92 -#+system-config-rc.a0097e942e56a4fed590931384c3cf27df9205c253c5577a70d87631dcb43624 +#+system-config-rc.ff049f314a4bff04d4371f1c73b413ef67df4407b6f4c9c7e7112dfd1491cf5f # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.a0097e942e56a4fed590931384c3cf27df9205c253c5577a70d87631dcb43624/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.ff049f314a4bff04d4371f1c73b413ef67df4407b6f4c9c7e7112dfd1491cf5f/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.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 #+busybox-diffutils.59467ff733b5e802f382c98960aae2c6ecfc7b82fa42db3df679593dc1ec8036 #+s6-rc.b3ba6e214c85c2f5cb10d42dd9d344798a776c86a200911d7eec95bcc955ef48 -#+fileset.e5a151f626de3d82ae8cbffbe8df007f016ae78c7a795565377da03798048476 -#+system-config.4bd988c5bcd336415bc850050a515938c1645cf94742b3ef0bc1a6bb25b6d9b0 +#+fileset.93d7de4bc897149bc9fe2cb5f8c369e499a09c48bb679b62d1c313db05dd824d +#+system-config.dbf351f160c91b7a540ac218ff46d329e816255de311d5c0c74b888aef7ffc1a # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.4bd988c5bcd336415bc850050a515938c1645cf94742b3ef0bc1a6bb25b6d9b0/config/s6-rc-source +src=/home/ccx/versions/system-config.dbf351f160c91b7a540ac218ff46d329e816255de311d5c0c74b888aef7ffc1a/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 @@ -28,7 +28,7 @@ #+busybox-findutils.b2b8e511be4dca01dcc369198cb5a87e68c6fab6c16d34caa2515ff93ca07381 #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a -#+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df +#+pthbs-banginstall.65c793c8181cbdcb92c82c38ab0cb5b8a6cfeb9a25aa3558b0d4cec57ab54ede #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env @@ -28,7 +28,7 @@ #+busybox-findutils.b2b8e511be4dca01dcc369198cb5a87e68c6fab6c16d34caa2515ff93ca07381 #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 #+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92 -#+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df +#+pthbs-banginstall.65c793c8181cbdcb92c82c38ab0cb5b8a6cfeb9a25aa3558b0d4cec57ab54ede #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -62,13 +62,13 @@ #+libressl.52dc61e1ae2a68ecd33b56ecd5b6fa148bfb124535d2659e3171693a31b2534b #+s6-networking.94dc8726d5df99793a6b10063fe0a746fefe8c90b303d70497b2cfaf11329a8e #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a -#+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df -#+aat.9e1a8d84c57afc208692dea539729548b5e2c84a062f232d0abb0eabebd845c7 -#+confz.f0c5901534e31abbfd9a894e726f877d840e9a4f2e2855de94fa1b8b3252ac4d -#+containers.7ca64d348a12d3f50fe4f11ec19c112656fa9a3be1a0b7fc1adadc9d02f08d70 -#+fileset.e5a151f626de3d82ae8cbffbe8df007f016ae78c7a795565377da03798048476 -#+logincaps.dff305698371563065d0ae0795204a975129931ea7a3c066701f7fc21dfbda4c -#+snaprep.e1f72149bfae312f87fba56b1598446eeec81db67b3a2e98dc894d185924d29b +#+pthbs-banginstall.65c793c8181cbdcb92c82c38ab0cb5b8a6cfeb9a25aa3558b0d4cec57ab54ede +#+aat.40bee67e2ee850d6daf8efb69f9ab2acaa6ff33aa057b61805981cb0f9d8ac33 +#+confz.102cb48a694bd45522f8546b5545557d847917ef51dcf7c3d97c811f8eed1512 +#+containers.62851b20fc169d0abe407fe43bab7fb25c2a2cc41f8a3ff43e0bef7cd3f35fd9 +#+fileset.93d7de4bc897149bc9fe2cb5f8c369e499a09c48bb679b62d1c313db05dd824d +#+logincaps.891ca826dd54b242ed33db8b6947faf8d05222b440bf83f59c5f80abaa320223 +#+snaprep.90b6b5c55b76bb584ecd96818ecf079ef9bc72f2551ba4bfabea6340c62715ca #+curl.6cd80be195a14ec4aec65793a00822f40ca1b1a923c321e3cfae9c085f4a6d89 #+git.d29443166e3f49fbd2c291e34c8cb67deab2e7699502cd70a35745eed68c1fb6 #+xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541fefdd9f3ed6f36055ac @@ -79,7 +79,7 @@ #+libcap.07fea7e8b98d7326c2f553d66607b9039422b9cea73bdc311c3543e0d326e962 #+applyuidgid-caps.86e8ee05ac608eece9ffe61c045b392e2b912bfbf41f3431037ab902992b6c4b #+ccx-utils.e4c42eee10e697abe0659a1d12afeb8480bf9525fb18046e7934279709a0077b -#+user-env.2ca98f00eb8e292136ab731ca3bea4bd6130d1d51047fe97643f12b3895eceac +#+user-env.72af759c2537a8a88c14a0b72937c28d556df0cdaf4d9d470f4bfc01a57bdce4 #+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5 #+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat @@ -28,7 +28,7 @@ #+busybox-findutils.4b6b2da77a78596fabbeb11cc0dac80b1b039580baa5e2ff5fe4a2857f931b61 #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a -#+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81 +#+pthbs-banginstall.1d3cbd595225e89f04d4b1667127c19b2bfd99b9db0b6597fd874d019fd9daff #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz @@ -28,7 +28,7 @@ #+busybox-findutils.4b6b2da77a78596fabbeb11cc0dac80b1b039580baa5e2ff5fe4a2857f931b61 #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a -#+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81 +#+pthbs-banginstall.1d3cbd595225e89f04d4b1667127c19b2bfd99b9db0b6597fd874d019fd9daff #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -28,7 +28,7 @@ #+busybox-findutils.4b6b2da77a78596fabbeb11cc0dac80b1b039580baa5e2ff5fe4a2857f931b61 #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a -#+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81 +#+pthbs-banginstall.1d3cbd595225e89f04d4b1667127c19b2bfd99b9db0b6597fd874d019fd9daff #+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5 #+alpine-keys.cf3dceec55832153ba2ec813edf663f098e3b72412def85cb3485ff7fa24ea49 #+apk-tools.61768759a496abcc715d250d77f79791b387de45fa05a9586007a253361f5be5 diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -49,14 +49,14 @@ #+s6-portable-utils.88a5962bf96a590c8844071c1802840557768dc0a96078b815c1d9aa08ebe27c #+s6-linux-utils.6b758d348392935fdee002a2ab4186ca505252fb4ef2e12d9e625ff809fb4f0d #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a -#+confz.56e8e5a838da4d763920012f278cd42d4e9e991cc202e114602b7d775a40dd30 -#+containers.cba0f8f8f7bc374961a989e3eec4f8a9f582def5b0b804344f27d8b024646e8d +#+confz.e85f9fd30f2d9d98d379dd0224794ddf904459def631bd716a396e9f5d888d48 +#+containers.7df93b2bba693bdb08785489965b448229cc271f09c4d156ca43bbdae78d9576 #+xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7ca64bb171 #+zstd.34cc749f8c590e889c6486d4f33b8c57208e3c6e7d36281d84689fac44b9a64c #+apk-tools.61768759a496abcc715d250d77f79791b387de45fa05a9586007a253361f5be5 #+alpine-keys.cf3dceec55832153ba2ec813edf663f098e3b72412def85cb3485ff7fa24ea49 #+getent.7b570642d6e9f3dbabe2ff123493183b0d8c55d8b11a566481714715dfe4a011 -#+fileset.f310a9481c4fdb71269bb232f4ae4c004a62c44ee2a053a3b1500d67813a91d3 +#+fileset.72fd18fe6056e916dbae964013165fb7b2222291f2cb2478b332894eef40fa52 #+ccx-utils.28caf3dc807988f01c379b8987708966ad250ea7ed645621164284478bcafe9c #+easyseccomp.4f85d77b24139f6fbffb5d91d791c4bfc5a6ad0a792b7f35f239f8e078947a6a #+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -62,13 +62,13 @@ #+libressl.d21c86e599c742080e4e8fc933081a93048448f55fa5d5c0f91335a107827204 #+s6-networking.505426256dad7944e9fcef89dd0d277ea92852575e34fe06c63f9ba5b7145904 #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a -#+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81 -#+aat.e3e638e18b98d6c6fd82d1f1eba60082f4cfcd2e196c975cfd621f88f00e40f0 -#+confz.56e8e5a838da4d763920012f278cd42d4e9e991cc202e114602b7d775a40dd30 -#+containers.cba0f8f8f7bc374961a989e3eec4f8a9f582def5b0b804344f27d8b024646e8d -#+fileset.f310a9481c4fdb71269bb232f4ae4c004a62c44ee2a053a3b1500d67813a91d3 -#+logincaps.3aafc7b5cc23f3d491ec65b0d2517277ee00d568d50e1c4aa9a5484e7b858992 -#+snaprep.c514bc4fb9267d7c957a1e104f808965a2d3617274e0c788c97f97f3ebc7b35f +#+pthbs-banginstall.1d3cbd595225e89f04d4b1667127c19b2bfd99b9db0b6597fd874d019fd9daff +#+aat.f80ee79b586378f602de60ae059ce8e5f7e3893ba6cad0a7159f852912118880 +#+confz.e85f9fd30f2d9d98d379dd0224794ddf904459def631bd716a396e9f5d888d48 +#+containers.7df93b2bba693bdb08785489965b448229cc271f09c4d156ca43bbdae78d9576 +#+fileset.72fd18fe6056e916dbae964013165fb7b2222291f2cb2478b332894eef40fa52 +#+logincaps.d56ff9e585439acf578301671cd074551b40a0bd933388db658bd0bef83ca1fc +#+snaprep.b62175bdfafd0ed4fc8f98aea44f1351c496abad8dd7bb8cdc34e4654099ec24 #+curl.8b29d0d07850c3479c1121b0a82ae5bd23df62dbda486169ba5428bb6de6997e #+git.5da300b219686367e9b33ce0e2a7e008684931ba314c2749bcbc929764fec01a #+xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7ca64bb171 @@ -79,7 +79,7 @@ #+libcap.376250f7c81d7af35271445611326edb9074afa93fc366af9826a7255cbedab9 #+applyuidgid-caps.b49eb7943bfbd836986e14922e012821e9945f4fbde21fa9ca8225aa39810c8a #+ccx-utils.28caf3dc807988f01c379b8987708966ad250ea7ed645621164284478bcafe9c -#+user-env.7ae31e7a184d80ea7e900f467614ce824472d48b54c7c6b2152c3f2f85e36acc +#+user-env.e6a4f98d52718ea6641a61fc3f99dc03fcbc6aebbf6d440483af355786c3a441 #+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2 #+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d @@ -87,9 +87,9 @@ #+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365 #+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac #+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8 -#+system-config.d30b3e463fe92c0694badde425fefc480a4e04addaa7c375054e48dfb5b20a9d -#+system-config-rc.51faab41e54cca6bec2d7682f7742e7a6454f73f2979224e08a7805edd83118a -#+system-config-scripts.ac2a449afef9d2c804ccca9869bdb1eaf89223a1b687c8e154f4a46216566b11 -#+system-config-init.207cf0acdd5032c84f473c82480fe69b5cf2cc3d9485e7e9b487820123fa1239 +#+system-config.714deb3815518447c148a16e721c8137ec9ecbead40c94e9668b6c9c210c28e1 +#+system-config-rc.318c8e479a7c0bc1a02a64fecea86e167a8d4fb6a609f98a7d641915518888c7 +#+system-config-scripts.09c79a4400192fee7c72518b0f6d727276bb267974a0b1ef663bf2ff200df3d7 +#+system-config-init.cef81fc080517b4eb9a1303ee23e9a7798a9ea92b2aa8ad339ed4eadfecc4406 #+system-config-zsh.cbbd0ea2d203a601fb2497946adaba74910fd150b071dacffb1d82dd8c4fb33f #+busybox-modutils.5f321825e26ecc84ba02a1cd21c040ccb3cb8324b94d5b9492012eb5163a5aa7 \ No newline at end of file diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset @@ -28,7 +28,7 @@ #+busybox-findutils.4b6b2da77a78596fabbeb11cc0dac80b1b039580baa5e2ff5fe4a2857f931b61 #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a -#+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81 +#+pthbs-banginstall.1d3cbd595225e89f04d4b1667127c19b2bfd99b9db0b6597fd874d019fd9daff #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -28,7 +28,7 @@ #+busybox-findutils.4b6b2da77a78596fabbeb11cc0dac80b1b039580baa5e2ff5fe4a2857f931b61 #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a -#+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81 +#+pthbs-banginstall.1d3cbd595225e89f04d4b1667127c19b2bfd99b9db0b6597fd874d019fd9daff #+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5 #+musl-cross-make.581e6f7496a630a91679f40945ae85b1c9a3f1f5afd725bb7608ad60c058d8f9 #+ccx-utils.28caf3dc807988f01c379b8987708966ad250ea7ed645621164284478bcafe9c @@ -76,7 +76,7 @@ if test -d zsh-functions; then mv -v zsh-functions "${dest}/zsh/site-functions" fi -pthbs-banginstall etc/loginexec "${dest}" +pthbs_xtrace=1 pthbs-banginstall etc/loginexec "${dest}" cat >"${dest}/command/login-keepenv" <<EOF #!$(which execlineb) -S0 diff --git a/variants/root-x86_64/mdev-scripts b/variants/root-x86_64/mdev-scripts @@ -28,7 +28,7 @@ #+busybox-findutils.4b6b2da77a78596fabbeb11cc0dac80b1b039580baa5e2ff5fe4a2857f931b61 #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a -#+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81 +#+pthbs-banginstall.1d3cbd595225e89f04d4b1667127c19b2bfd99b9db0b6597fd874d019fd9daff #@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.0efeb2a14ceef24d88cf7fbd688acd84ff0c916d5b3087ac466104806dfd8e0c #+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5 #+s6.04fb8499c2babe913f53ef934076b087746db184ae4955c04457a325900e11eb -#+mdev-scripts.21854e09297b779479923612e36f68bd9258848e177dacac990e17faf03463a9 +#+mdev-scripts.cee5c73a04e1ad339d32d88d9e334505978d081edfccc1cb24ec936b063fa9a6 #+mdevd.a65dac1bcbf3e45bf56ac219108fe15537401737aaabef2aa060f24682fa3a68 #+busybox-modutils.5f321825e26ecc84ba02a1cd21c040ccb3cb8324b94d5b9492012eb5163a5aa7 \ No newline at end of file diff --git a/variants/root-x86_64/pthbs-banginstall b/variants/root-x86_64/pthbs-banginstall @@ -28,7 +28,7 @@ #+busybox-findutils.4b6b2da77a78596fabbeb11cc0dac80b1b039580baa5e2ff5fe4a2857f931b61 #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a -#@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall +#@sha256:4f3aea4566ff0e9ce46c6efaf615418e629026053770b1ec26913d38e748256d:pthbs-banginstall # - build script start - diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep @@ -28,7 +28,7 @@ #+busybox-findutils.4b6b2da77a78596fabbeb11cc0dac80b1b039580baa5e2ff5fe4a2857f931b61 #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a -#+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81 +#+pthbs-banginstall.1d3cbd595225e89f04d4b1667127c19b2bfd99b9db0b6597fd874d019fd9daff #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -47,8 +47,8 @@ #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d #+diffutils.ee3ca077c894bf459999d2f2b21c5c0f1d44250dc6e1d596cc1afc4eb5230a27 #+gnu-make.98dc2bc139672e6347bc2b2220304949f81b1851d2dc14778379568a0734db59 -#+aat.e3e638e18b98d6c6fd82d1f1eba60082f4cfcd2e196c975cfd621f88f00e40f0 -#+fileset.f310a9481c4fdb71269bb232f4ae4c004a62c44ee2a053a3b1500d67813a91d3 +#+aat.f80ee79b586378f602de60ae059ce8e5f7e3893ba6cad0a7159f852912118880 +#+fileset.72fd18fe6056e916dbae964013165fb7b2222291f2cb2478b332894eef40fa52 #+rsync.1d3890b4a27d4af2ff994e114a66d747cc0890003562ae3cb3b19a09400af323 #+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5 #+kbd.e935a814b7be81a255036a94215521bcff827d7a29f9cfe3ee12b0b87a1a7468 @@ -58,8 +58,8 @@ #+s6.04fb8499c2babe913f53ef934076b087746db184ae4955c04457a325900e11eb #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a #+libcgroup.646aeafcff809ba481494b56a498a45e29d36b36df5693acdf5f14c917e927bd -#+system-config-scripts.ac2a449afef9d2c804ccca9869bdb1eaf89223a1b687c8e154f4a46216566b11 -#+logincaps.3aafc7b5cc23f3d491ec65b0d2517277ee00d568d50e1c4aa9a5484e7b858992 +#+system-config-scripts.09c79a4400192fee7c72518b0f6d727276bb267974a0b1ef663bf2ff200df3d7 +#+logincaps.d56ff9e585439acf578301671cd074551b40a0bd933388db658bd0bef83ca1fc #+busybox-modutils.5f321825e26ecc84ba02a1cd21c040ccb3cb8324b94d5b9492012eb5163a5aa7 #@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.7327fdf4882812e1dbde6fde7b8d33e3bac314fe867bc2ae35f80c8acace6382' \ - 'pthbs_path_mdevd=/versions/env.f458cfe5e0cd8bf2f58c83455f9949c77b234b8f6fa501c261d2c99912c58cd1' \ + 'pthbs_path_containers=/versions/env.5b0b82b08a39f5e8d956c7881b729dced30535c148c7c8ec8fa12fb808e0c6fa' \ + 'pthbs_path_mdevd=/versions/env.8fac6ee7222788b98a0cead54bd4682cd44c306091ea62e9869f665c78149bbc' \ 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.88a5962bf96a590c8844071c1802840557768dc0a96078b815c1d9aa08ebe27c #+s6-linux-init.7a9d91b21cceaf06297ddc4522c7be945b051eb94cd21da564920db0003350e4 #+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5 -#+system-config-rc.51faab41e54cca6bec2d7682f7742e7a6454f73f2979224e08a7805edd83118a +#+system-config-rc.318c8e479a7c0bc1a02a64fecea86e167a8d4fb6a609f98a7d641915518888c7 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.51faab41e54cca6bec2d7682f7742e7a6454f73f2979224e08a7805edd83118a/config/s6-rc-db +s6rcdb=/versions/system-config-rc.318c8e479a7c0bc1a02a64fecea86e167a8d4fb6a609f98a7d641915518888c7/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.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d #+busybox-diffutils.7297c795754c245870d8ba99b3907f9ec3932726a5af6b8d15980adcbf6c0059 #+s6-rc.bc50208569d8e23862ac3fcf169ea24354b3a9693c961a7139ed0fbaeb05ce86 -#+fileset.f310a9481c4fdb71269bb232f4ae4c004a62c44ee2a053a3b1500d67813a91d3 -#+system-config.d30b3e463fe92c0694badde425fefc480a4e04addaa7c375054e48dfb5b20a9d +#+fileset.72fd18fe6056e916dbae964013165fb7b2222291f2cb2478b332894eef40fa52 +#+system-config.714deb3815518447c148a16e721c8137ec9ecbead40c94e9668b6c9c210c28e1 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.d30b3e463fe92c0694badde425fefc480a4e04addaa7c375054e48dfb5b20a9d/config/s6-rc-source +src=/versions/system-config.714deb3815518447c148a16e721c8137ec9ecbead40c94e9668b6c9c210c28e1/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 @@ -28,7 +28,7 @@ #+busybox-findutils.4b6b2da77a78596fabbeb11cc0dac80b1b039580baa5e2ff5fe4a2857f931b61 #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a -#+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81 +#+pthbs-banginstall.1d3cbd595225e89f04d4b1667127c19b2bfd99b9db0b6597fd874d019fd9daff #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env @@ -28,7 +28,7 @@ #+busybox-findutils.4b6b2da77a78596fabbeb11cc0dac80b1b039580baa5e2ff5fe4a2857f931b61 #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d #+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5 -#+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81 +#+pthbs-banginstall.1d3cbd595225e89f04d4b1667127c19b2bfd99b9db0b6597fd874d019fd9daff #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -62,13 +62,13 @@ #+libressl.d21c86e599c742080e4e8fc933081a93048448f55fa5d5c0f91335a107827204 #+s6-networking.505426256dad7944e9fcef89dd0d277ea92852575e34fe06c63f9ba5b7145904 #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a -#+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81 -#+aat.e3e638e18b98d6c6fd82d1f1eba60082f4cfcd2e196c975cfd621f88f00e40f0 -#+confz.56e8e5a838da4d763920012f278cd42d4e9e991cc202e114602b7d775a40dd30 -#+containers.cba0f8f8f7bc374961a989e3eec4f8a9f582def5b0b804344f27d8b024646e8d -#+fileset.f310a9481c4fdb71269bb232f4ae4c004a62c44ee2a053a3b1500d67813a91d3 -#+logincaps.3aafc7b5cc23f3d491ec65b0d2517277ee00d568d50e1c4aa9a5484e7b858992 -#+snaprep.c514bc4fb9267d7c957a1e104f808965a2d3617274e0c788c97f97f3ebc7b35f +#+pthbs-banginstall.1d3cbd595225e89f04d4b1667127c19b2bfd99b9db0b6597fd874d019fd9daff +#+aat.f80ee79b586378f602de60ae059ce8e5f7e3893ba6cad0a7159f852912118880 +#+confz.e85f9fd30f2d9d98d379dd0224794ddf904459def631bd716a396e9f5d888d48 +#+containers.7df93b2bba693bdb08785489965b448229cc271f09c4d156ca43bbdae78d9576 +#+fileset.72fd18fe6056e916dbae964013165fb7b2222291f2cb2478b332894eef40fa52 +#+logincaps.d56ff9e585439acf578301671cd074551b40a0bd933388db658bd0bef83ca1fc +#+snaprep.b62175bdfafd0ed4fc8f98aea44f1351c496abad8dd7bb8cdc34e4654099ec24 #+curl.8b29d0d07850c3479c1121b0a82ae5bd23df62dbda486169ba5428bb6de6997e #+git.5da300b219686367e9b33ce0e2a7e008684931ba314c2749bcbc929764fec01a #+xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7ca64bb171 @@ -79,7 +79,7 @@ #+libcap.376250f7c81d7af35271445611326edb9074afa93fc366af9826a7255cbedab9 #+applyuidgid-caps.b49eb7943bfbd836986e14922e012821e9945f4fbde21fa9ca8225aa39810c8a #+ccx-utils.28caf3dc807988f01c379b8987708966ad250ea7ed645621164284478bcafe9c -#+user-env.7ae31e7a184d80ea7e900f467614ce824472d48b54c7c6b2152c3f2f85e36acc +#+user-env.e6a4f98d52718ea6641a61fc3f99dc03fcbc6aebbf6d440483af355786c3a441 #+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2 #+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d