commit 523697bb8630d5f7f97405f214366a54ced0e8f8 parent 1f3bdef98563c8a4d6d789bc34338e24bed133fa Author: Jan Pobrislo <ccx@te2000.cz> Date: Thu, 11 Dec 2025 12:41:21 +0000 more pthbs_banginstall tracing Diffstat:
27 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/templates/scriptsetup b/templates/scriptsetup @@ -11,7 +11,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat @@ -44,7 +44,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz @@ -44,7 +44,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -49,7 +49,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done 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.102cb48a694bd45522f8546b5545557d847917ef51dcf7c3d97c811f8eed1512 -#+containers.62851b20fc169d0abe407fe43bab7fb25c2a2cc41f8a3ff43e0bef7cd3f35fd9 +#+confz.362302f303f1fcc82afa62acaa8fd052dc9644b2d1d5498841a4d35048c15664 +#+containers.18ff97267c3b6124c376ecd8f417c5c03cc348d5a9038a7442c9b287571b62dd #+xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541fefdd9f3ed6f36055ac #+zstd.07ebc1d049247600d4df20a2640d366674671001d16f9d046fbef08699a688c0 #+apk-tools.29e0d5e4389d0c818110ff0eef0af390ecd9f9439e8394831e68094ecf7ac80d #+alpine-keys.b022c8887d93ae486745981a1749acfe6e602da6f3cee54c5582da3e56548611 #+getent.6facc15ef702b77a02ba93519f2bc0ca161b55b4704e7607138c1eb7a2cca041 -#+fileset.93d7de4bc897149bc9fe2cb5f8c369e499a09c48bb679b62d1c313db05dd824d +#+fileset.b77e84b3ef68d6227a712cc399c905b46dd6a4f397cade11f4c310ccd72a8568 #+ccx-utils.e4c42eee10e697abe0659a1d12afeb8480bf9525fb18046e7934279709a0077b #+easyseccomp.330029cffaf17cca5b39ef7eaf8ccc4b7dbf01685d07c6afdb56b4dcc6e6409d #+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -63,12 +63,12 @@ #+s6-networking.94dc8726d5df99793a6b10063fe0a746fefe8c90b303d70497b2cfaf11329a8e #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a #+pthbs-banginstall.65c793c8181cbdcb92c82c38ab0cb5b8a6cfeb9a25aa3558b0d4cec57ab54ede -#+aat.40bee67e2ee850d6daf8efb69f9ab2acaa6ff33aa057b61805981cb0f9d8ac33 -#+confz.102cb48a694bd45522f8546b5545557d847917ef51dcf7c3d97c811f8eed1512 -#+containers.62851b20fc169d0abe407fe43bab7fb25c2a2cc41f8a3ff43e0bef7cd3f35fd9 -#+fileset.93d7de4bc897149bc9fe2cb5f8c369e499a09c48bb679b62d1c313db05dd824d -#+logincaps.891ca826dd54b242ed33db8b6947faf8d05222b440bf83f59c5f80abaa320223 -#+snaprep.90b6b5c55b76bb584ecd96818ecf079ef9bc72f2551ba4bfabea6340c62715ca +#+aat.3ef2411739892c89763bed7cfdefee155283b6b00ac571a2c8d951b78d8d1985 +#+confz.362302f303f1fcc82afa62acaa8fd052dc9644b2d1d5498841a4d35048c15664 +#+containers.18ff97267c3b6124c376ecd8f417c5c03cc348d5a9038a7442c9b287571b62dd +#+fileset.b77e84b3ef68d6227a712cc399c905b46dd6a4f397cade11f4c310ccd72a8568 +#+logincaps.8acaf4975efcb60181c183ee24bc8889883ae6af682ab6190fa70d5516f8e257 +#+snaprep.7e872b9aada334e5bbd27ced85cf02c2b391e55430e0730ebf985c9007612cde #+curl.6cd80be195a14ec4aec65793a00822f40ca1b1a923c321e3cfae9c085f4a6d89 #+git.d29443166e3f49fbd2c291e34c8cb67deab2e7699502cd70a35745eed68c1fb6 #+xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541fefdd9f3ed6f36055ac @@ -87,9 +87,9 @@ #+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128 #+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc #+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af -#+system-config.dbf351f160c91b7a540ac218ff46d329e816255de311d5c0c74b888aef7ffc1a -#+system-config-rc.ff049f314a4bff04d4371f1c73b413ef67df4407b6f4c9c7e7112dfd1491cf5f -#+system-config-scripts.5a99f9d4aca1fa987f48eeeb76ef299fb8a69256b90327056664e25c91cfc38e -#+system-config-init.e74f1dc8c8b6fd6a265029b09ddcbb5413499b4d27b78c53ee058994deb6bb85 +#+system-config.39c55004eacbb8e6bcdf88b24f84fce9a29061383da94f0bc3b41e8eb437d34a +#+system-config-rc.534d30addfafbf43681e13a3afeecdf32355aba6788fa602025388a3951ca3ad +#+system-config-scripts.6464dbacdf95b4f20e154bed3e5c8ef3446b1dcff82135be8377045ae4b827f7 +#+system-config-init.fcfc8c590974f935380d63ab73f3b157c4894762de7325bc3dd9f05f4f1e1380 #+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 @@ -44,7 +44,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -62,7 +62,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep @@ -44,7 +44,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done 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.40bee67e2ee850d6daf8efb69f9ab2acaa6ff33aa057b61805981cb0f9d8ac33 -#+fileset.93d7de4bc897149bc9fe2cb5f8c369e499a09c48bb679b62d1c313db05dd824d +#+aat.3ef2411739892c89763bed7cfdefee155283b6b00ac571a2c8d951b78d8d1985 +#+fileset.b77e84b3ef68d6227a712cc399c905b46dd6a4f397cade11f4c310ccd72a8568 #+rsync.847c889c40db7d219db3b84e245db91e309c8a4330b2b872ca70ef80b57a579a #+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92 #+kbd.26cc6da4f7c7f5a87f3d7f48b1adfce521ad06d606dfe9a8d5b4886119251feb @@ -58,8 +58,8 @@ #+s6.0d5d4703e07c3e5a0d4567706c69119aad5a0e9a37c28bf6b05dd12a27dc1eb1 #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a #+libcgroup.2e9791b8acfdda601a45ea42b0833b8b351c3012affb3dd3dbfd29d0e7145e9b -#+system-config-scripts.5a99f9d4aca1fa987f48eeeb76ef299fb8a69256b90327056664e25c91cfc38e -#+logincaps.891ca826dd54b242ed33db8b6947faf8d05222b440bf83f59c5f80abaa320223 +#+system-config-scripts.6464dbacdf95b4f20e154bed3e5c8ef3446b1dcff82135be8377045ae4b827f7 +#+logincaps.8acaf4975efcb60181c183ee24bc8889883ae6af682ab6190fa70d5516f8e257 #+busybox.4fe6cdfe11b32717d11efe7564d0b495aba0f2d3fecad9b803ee0505e2a11c9e #@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config @@ -97,7 +97,7 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/home/ccx/versions/env.fff769c042647cb0a43b18a2540c4e5a87ae785d7268050b0155ee09de33400b' \ + 'pthbs_path_containers=/home/ccx/versions/env.1e70c16478153a59b5a9af44cae86c86c343e073afaf0a86a6e8b7416341856c' \ 'pthbs_path_mdevd=/home/ccx/versions/env.884c99f5adb986c222be969279393a08492d7a896c6496b49b44707a80a1bcf4' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -50,7 +50,7 @@ #+s6-portable-utils.7f4db6a16ab09d3822d709aec42170cb1d2c7c752d88f13e3792e747cbd09a28 #+s6-linux-init.39d00512c8a37829a751fbbe1a7cfc37003dc9e3924d0ca13722eb2835830c2b #+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92 -#+system-config-rc.ff049f314a4bff04d4371f1c73b413ef67df4407b6f4c9c7e7112dfd1491cf5f +#+system-config-rc.534d30addfafbf43681e13a3afeecdf32355aba6788fa602025388a3951ca3ad # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.ff049f314a4bff04d4371f1c73b413ef67df4407b6f4c9c7e7112dfd1491cf5f/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.534d30addfafbf43681e13a3afeecdf32355aba6788fa602025388a3951ca3ad/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.93d7de4bc897149bc9fe2cb5f8c369e499a09c48bb679b62d1c313db05dd824d -#+system-config.dbf351f160c91b7a540ac218ff46d329e816255de311d5c0c74b888aef7ffc1a +#+fileset.b77e84b3ef68d6227a712cc399c905b46dd6a4f397cade11f4c310ccd72a8568 +#+system-config.39c55004eacbb8e6bcdf88b24f84fce9a29061383da94f0bc3b41e8eb437d34a # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.dbf351f160c91b7a540ac218ff46d329e816255de311d5c0c74b888aef7ffc1a/config/s6-rc-source +src=/home/ccx/versions/system-config.39c55004eacbb8e6bcdf88b24f84fce9a29061383da94f0bc3b41e8eb437d34a/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 @@ -44,7 +44,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -63,12 +63,12 @@ #+s6-networking.94dc8726d5df99793a6b10063fe0a746fefe8c90b303d70497b2cfaf11329a8e #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a #+pthbs-banginstall.65c793c8181cbdcb92c82c38ab0cb5b8a6cfeb9a25aa3558b0d4cec57ab54ede -#+aat.40bee67e2ee850d6daf8efb69f9ab2acaa6ff33aa057b61805981cb0f9d8ac33 -#+confz.102cb48a694bd45522f8546b5545557d847917ef51dcf7c3d97c811f8eed1512 -#+containers.62851b20fc169d0abe407fe43bab7fb25c2a2cc41f8a3ff43e0bef7cd3f35fd9 -#+fileset.93d7de4bc897149bc9fe2cb5f8c369e499a09c48bb679b62d1c313db05dd824d -#+logincaps.891ca826dd54b242ed33db8b6947faf8d05222b440bf83f59c5f80abaa320223 -#+snaprep.90b6b5c55b76bb584ecd96818ecf079ef9bc72f2551ba4bfabea6340c62715ca +#+aat.3ef2411739892c89763bed7cfdefee155283b6b00ac571a2c8d951b78d8d1985 +#+confz.362302f303f1fcc82afa62acaa8fd052dc9644b2d1d5498841a4d35048c15664 +#+containers.18ff97267c3b6124c376ecd8f417c5c03cc348d5a9038a7442c9b287571b62dd +#+fileset.b77e84b3ef68d6227a712cc399c905b46dd6a4f397cade11f4c310ccd72a8568 +#+logincaps.8acaf4975efcb60181c183ee24bc8889883ae6af682ab6190fa70d5516f8e257 +#+snaprep.7e872b9aada334e5bbd27ced85cf02c2b391e55430e0730ebf985c9007612cde #+curl.6cd80be195a14ec4aec65793a00822f40ca1b1a923c321e3cfae9c085f4a6d89 #+git.d29443166e3f49fbd2c291e34c8cb67deab2e7699502cd70a35745eed68c1fb6 #+xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541fefdd9f3ed6f36055ac diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat @@ -44,7 +44,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz @@ -44,7 +44,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -49,7 +49,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done 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.e85f9fd30f2d9d98d379dd0224794ddf904459def631bd716a396e9f5d888d48 -#+containers.7df93b2bba693bdb08785489965b448229cc271f09c4d156ca43bbdae78d9576 +#+confz.1d99841c7be4f1d364bd2bfb13d1d22234ba6e884f732d5bbe366fcad8731425 +#+containers.95e67c648601bf713f85cad4cc78909e1e35f8b3d3a1fdd0e41c260b8153428c #+xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7ca64bb171 #+zstd.34cc749f8c590e889c6486d4f33b8c57208e3c6e7d36281d84689fac44b9a64c #+apk-tools.61768759a496abcc715d250d77f79791b387de45fa05a9586007a253361f5be5 #+alpine-keys.cf3dceec55832153ba2ec813edf663f098e3b72412def85cb3485ff7fa24ea49 #+getent.7b570642d6e9f3dbabe2ff123493183b0d8c55d8b11a566481714715dfe4a011 -#+fileset.72fd18fe6056e916dbae964013165fb7b2222291f2cb2478b332894eef40fa52 +#+fileset.5017c694432db14cac9d384ce470105e55fa3a23f7fbf2c2d9b20daf41e91db8 #+ccx-utils.28caf3dc807988f01c379b8987708966ad250ea7ed645621164284478bcafe9c #+easyseccomp.4f85d77b24139f6fbffb5d91d791c4bfc5a6ad0a792b7f35f239f8e078947a6a #+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -63,12 +63,12 @@ #+s6-networking.505426256dad7944e9fcef89dd0d277ea92852575e34fe06c63f9ba5b7145904 #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a #+pthbs-banginstall.1d3cbd595225e89f04d4b1667127c19b2bfd99b9db0b6597fd874d019fd9daff -#+aat.f80ee79b586378f602de60ae059ce8e5f7e3893ba6cad0a7159f852912118880 -#+confz.e85f9fd30f2d9d98d379dd0224794ddf904459def631bd716a396e9f5d888d48 -#+containers.7df93b2bba693bdb08785489965b448229cc271f09c4d156ca43bbdae78d9576 -#+fileset.72fd18fe6056e916dbae964013165fb7b2222291f2cb2478b332894eef40fa52 -#+logincaps.d56ff9e585439acf578301671cd074551b40a0bd933388db658bd0bef83ca1fc -#+snaprep.b62175bdfafd0ed4fc8f98aea44f1351c496abad8dd7bb8cdc34e4654099ec24 +#+aat.06eb51839d1e56b6fd780f7c17c5e68886e883a2d0d75bd1a1a598c9c63ca997 +#+confz.1d99841c7be4f1d364bd2bfb13d1d22234ba6e884f732d5bbe366fcad8731425 +#+containers.95e67c648601bf713f85cad4cc78909e1e35f8b3d3a1fdd0e41c260b8153428c +#+fileset.5017c694432db14cac9d384ce470105e55fa3a23f7fbf2c2d9b20daf41e91db8 +#+logincaps.9bdd29b6715eb988d595d10a9a6e545a1c0bb114c141982329268e4dcb428e20 +#+snaprep.834bbf3d435ff159f98ef5f3ad40052ebaa0a4b4e904b1fcbb2ed379a5bf3b25 #+curl.8b29d0d07850c3479c1121b0a82ae5bd23df62dbda486169ba5428bb6de6997e #+git.5da300b219686367e9b33ce0e2a7e008684931ba314c2749bcbc929764fec01a #+xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7ca64bb171 @@ -87,9 +87,9 @@ #+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365 #+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac #+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8 -#+system-config.714deb3815518447c148a16e721c8137ec9ecbead40c94e9668b6c9c210c28e1 -#+system-config-rc.318c8e479a7c0bc1a02a64fecea86e167a8d4fb6a609f98a7d641915518888c7 -#+system-config-scripts.09c79a4400192fee7c72518b0f6d727276bb267974a0b1ef663bf2ff200df3d7 -#+system-config-init.cef81fc080517b4eb9a1303ee23e9a7798a9ea92b2aa8ad339ed4eadfecc4406 +#+system-config.526ff525b613947d8dbc3719b10a50d68443db9e2e9da24ea8fea18ce5709001 +#+system-config-rc.b0ef589ea1a6c4dbc12623f7bf9d17f23ce9a0d2507b9d862e39ccdbe7eaf800 +#+system-config-scripts.64d7fcb365c66a8190affaae93d171ba4b56d3a8b615b192f310d7f2b216030e +#+system-config-init.bb53852e57b2bfec5d7f12394eda6e65ea778902785d323bb585a6d1d2be54be #+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 @@ -44,7 +44,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -62,7 +62,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep @@ -44,7 +44,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done 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.f80ee79b586378f602de60ae059ce8e5f7e3893ba6cad0a7159f852912118880 -#+fileset.72fd18fe6056e916dbae964013165fb7b2222291f2cb2478b332894eef40fa52 +#+aat.06eb51839d1e56b6fd780f7c17c5e68886e883a2d0d75bd1a1a598c9c63ca997 +#+fileset.5017c694432db14cac9d384ce470105e55fa3a23f7fbf2c2d9b20daf41e91db8 #+rsync.1d3890b4a27d4af2ff994e114a66d747cc0890003562ae3cb3b19a09400af323 #+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5 #+kbd.e935a814b7be81a255036a94215521bcff827d7a29f9cfe3ee12b0b87a1a7468 @@ -58,8 +58,8 @@ #+s6.04fb8499c2babe913f53ef934076b087746db184ae4955c04457a325900e11eb #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a #+libcgroup.646aeafcff809ba481494b56a498a45e29d36b36df5693acdf5f14c917e927bd -#+system-config-scripts.09c79a4400192fee7c72518b0f6d727276bb267974a0b1ef663bf2ff200df3d7 -#+logincaps.d56ff9e585439acf578301671cd074551b40a0bd933388db658bd0bef83ca1fc +#+system-config-scripts.64d7fcb365c66a8190affaae93d171ba4b56d3a8b615b192f310d7f2b216030e +#+logincaps.9bdd29b6715eb988d595d10a9a6e545a1c0bb114c141982329268e4dcb428e20 #+busybox-modutils.5f321825e26ecc84ba02a1cd21c040ccb3cb8324b94d5b9492012eb5163a5aa7 #@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config @@ -97,7 +97,7 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.5b0b82b08a39f5e8d956c7881b729dced30535c148c7c8ec8fa12fb808e0c6fa' \ + 'pthbs_path_containers=/versions/env.4dce8151093561509ff8e625e77d1cfe588552924dfda305affebba11c5b2755' \ 'pthbs_path_mdevd=/versions/env.8fac6ee7222788b98a0cead54bd4682cd44c306091ea62e9869f665c78149bbc' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -50,7 +50,7 @@ #+s6-portable-utils.88a5962bf96a590c8844071c1802840557768dc0a96078b815c1d9aa08ebe27c #+s6-linux-init.7a9d91b21cceaf06297ddc4522c7be945b051eb94cd21da564920db0003350e4 #+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5 -#+system-config-rc.318c8e479a7c0bc1a02a64fecea86e167a8d4fb6a609f98a7d641915518888c7 +#+system-config-rc.b0ef589ea1a6c4dbc12623f7bf9d17f23ce9a0d2507b9d862e39ccdbe7eaf800 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.318c8e479a7c0bc1a02a64fecea86e167a8d4fb6a609f98a7d641915518888c7/config/s6-rc-db +s6rcdb=/versions/system-config-rc.b0ef589ea1a6c4dbc12623f7bf9d17f23ce9a0d2507b9d862e39ccdbe7eaf800/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.72fd18fe6056e916dbae964013165fb7b2222291f2cb2478b332894eef40fa52 -#+system-config.714deb3815518447c148a16e721c8137ec9ecbead40c94e9668b6c9c210c28e1 +#+fileset.5017c694432db14cac9d384ce470105e55fa3a23f7fbf2c2d9b20daf41e91db8 +#+system-config.526ff525b613947d8dbc3719b10a50d68443db9e2e9da24ea8fea18ce5709001 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.714deb3815518447c148a16e721c8137ec9ecbead40c94e9668b6c9c210c28e1/config/s6-rc-source +src=/versions/system-config.526ff525b613947d8dbc3719b10a50d68443db9e2e9da24ea8fea18ce5709001/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 @@ -44,7 +44,7 @@ mkdir -p "$dest" for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "${dest}" + pthbs_xtrace=1 pthbs-banginstall "$d"/* "${dest}" fi done diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -63,12 +63,12 @@ #+s6-networking.505426256dad7944e9fcef89dd0d277ea92852575e34fe06c63f9ba5b7145904 #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a #+pthbs-banginstall.1d3cbd595225e89f04d4b1667127c19b2bfd99b9db0b6597fd874d019fd9daff -#+aat.f80ee79b586378f602de60ae059ce8e5f7e3893ba6cad0a7159f852912118880 -#+confz.e85f9fd30f2d9d98d379dd0224794ddf904459def631bd716a396e9f5d888d48 -#+containers.7df93b2bba693bdb08785489965b448229cc271f09c4d156ca43bbdae78d9576 -#+fileset.72fd18fe6056e916dbae964013165fb7b2222291f2cb2478b332894eef40fa52 -#+logincaps.d56ff9e585439acf578301671cd074551b40a0bd933388db658bd0bef83ca1fc -#+snaprep.b62175bdfafd0ed4fc8f98aea44f1351c496abad8dd7bb8cdc34e4654099ec24 +#+aat.06eb51839d1e56b6fd780f7c17c5e68886e883a2d0d75bd1a1a598c9c63ca997 +#+confz.1d99841c7be4f1d364bd2bfb13d1d22234ba6e884f732d5bbe366fcad8731425 +#+containers.95e67c648601bf713f85cad4cc78909e1e35f8b3d3a1fdd0e41c260b8153428c +#+fileset.5017c694432db14cac9d384ce470105e55fa3a23f7fbf2c2d9b20daf41e91db8 +#+logincaps.9bdd29b6715eb988d595d10a9a6e545a1c0bb114c141982329268e4dcb428e20 +#+snaprep.834bbf3d435ff159f98ef5f3ad40052ebaa0a4b4e904b1fcbb2ed379a5bf3b25 #+curl.8b29d0d07850c3479c1121b0a82ae5bd23df62dbda486169ba5428bb6de6997e #+git.5da300b219686367e9b33ce0e2a7e008684931ba314c2749bcbc929764fec01a #+xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7ca64bb171