commit 8c4c5d41cc77b42ad7b72a11a740a8d4c69c97ce parent ccf9778d7030b50b34144a96fccda1297cd0e36c Author: Jan Pobrislo <ccx@te2000.cz> Date: Fri, 12 Dec 2025 03:24:30 +0000 no CPATH for libbsd Diffstat:
41 files changed, 123 insertions(+), 123 deletions(-)
diff --git a/templates/pkg/libbsd b/templates/pkg/libbsd @@ -7,7 +7,7 @@ {% endblock package_deps %} {% block configure -%} export CFLAGS="$CFLAGS -std=gnu11" -export CPATH=$PWD/include/bsd:$pthbs_build_environment/{{includedir|shesc}} +unset CPATH {{- super() -}} {% endblock configure %} {% block configure_args -%} --verbose --disable-silent-rules --enable-year2038 {%- endblock %} diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.d81c93988d8c937f6db60683c693ca3d73916a305223d00a48eb22ca87e65f0e #+busybox-findutils.84cb8f604afa8735044097ee5d6200c4782093e06873cd36227c9342d30828b2 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c -#+zsh.86a0d702ed7dc56355270d4c4160145ea6666dcb3991c3dfe0011621fe9f2317 -#+pthbs-banginstall.d4346633b05d51d587b83ff5ecaf629613806814c00b11aa1ea39b7e988db09a +#+zsh.83297b3ecdf2d2bdd00c4e315fe7c7c51a869b3d5af1ee15cc01bd3211cbf118 +#+pthbs-banginstall.e4fd59466c517f183302057e284b3de2c72825e75cc42f0811d84914592e71d7 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.d81c93988d8c937f6db60683c693ca3d73916a305223d00a48eb22ca87e65f0e #+busybox-findutils.84cb8f604afa8735044097ee5d6200c4782093e06873cd36227c9342d30828b2 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c -#+zsh.86a0d702ed7dc56355270d4c4160145ea6666dcb3991c3dfe0011621fe9f2317 -#+pthbs-banginstall.d4346633b05d51d587b83ff5ecaf629613806814c00b11aa1ea39b7e988db09a +#+zsh.83297b3ecdf2d2bdd00c4e315fe7c7c51a869b3d5af1ee15cc01bd3211cbf118 +#+pthbs-banginstall.e4fd59466c517f183302057e284b3de2c72825e75cc42f0811d84914592e71d7 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.d81c93988d8c937f6db60683c693ca3d73916a305223d00a48eb22ca87e65f0e #+busybox-findutils.84cb8f604afa8735044097ee5d6200c4782093e06873cd36227c9342d30828b2 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c -#+zsh.86a0d702ed7dc56355270d4c4160145ea6666dcb3991c3dfe0011621fe9f2317 -#+pthbs-banginstall.d4346633b05d51d587b83ff5ecaf629613806814c00b11aa1ea39b7e988db09a +#+zsh.83297b3ecdf2d2bdd00c4e315fe7c7c51a869b3d5af1ee15cc01bd3211cbf118 +#+pthbs-banginstall.e4fd59466c517f183302057e284b3de2c72825e75cc42f0811d84914592e71d7 #+execline.40353eaff23067fb950e4814076f769ec877500bf0d6a1c78f55317b992a6b57 #+alpine-keys.2627cf09b293e5aa76360cd858cdbe7493f766e90063b0db73368eddd7832398 #+apk-tools.26dea3d4656b1c6ea2b40f4e5e448263725788f406996f46e33e7e801e6c14f7 diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -48,15 +48,15 @@ #+s6.ca0b089204ed030f146486ee302b50994dd14a8ed8d1ba5f2bb377af2c626d01 #+s6-portable-utils.680fe5c007becce6f4aa9dacc7659541fe06feb1ce885218592feb36766f80e9 #+s6-linux-utils.ee802c9d791b5dd387b43cdcc33ebd6097b5d3fab98ef9ba8afbbe6edc5de00a -#+zsh.86a0d702ed7dc56355270d4c4160145ea6666dcb3991c3dfe0011621fe9f2317 -#+confz.e0f7f6bda82d1b31d794a31f739d08edb9b80aca4eccc2f76c7e156de41e817c -#+containers.476f6a0585c8895fd166fbcbb2525c319639fbe7c09ca5c9bb000a0b9e86b608 +#+zsh.83297b3ecdf2d2bdd00c4e315fe7c7c51a869b3d5af1ee15cc01bd3211cbf118 +#+confz.c8ae2f57110d6b9c2e11b4e0173da73ffc95b9e73c2520254ca8b869d767237c +#+containers.abec8c6604b1a1006a9b296d3ec5ccb028b9fee28a6f796127a39f730b2bc37c #+xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71 #+zstd.6784b50e1a6f437617df4f5e504acb4dcedfa6ea695d6f6f00b9b918458340c9 #+apk-tools.26dea3d4656b1c6ea2b40f4e5e448263725788f406996f46e33e7e801e6c14f7 #+alpine-keys.2627cf09b293e5aa76360cd858cdbe7493f766e90063b0db73368eddd7832398 #+getent.4fed010dd9b9ecd66109a04d4816b65dac83ccc7f08166145c278f3848488b65 -#+fileset.50b7dcdc106933a9d36d54c20cd29405a51038da5f1c48d32c74bd0fe41bf57b +#+fileset.eef37c0e8dae9776d69488adb0931a876920fb9ae9ea72e3b5ae3e592ecfb14e #+ccx-utils.d34c50f51608774953113953cb95a6288155fbca5d22b06b306469f9a26bc84f #+easyseccomp.866204993d4ace22c0c79806fd21eee5ddf8e76497edb41c136d009b463d451f #+findutils.0e76b947c2f8211a4c6c8c114510e0d1c2c794131f772dab36e42d23b0402720 diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -61,14 +61,14 @@ #+s6-dns.90b3e235f2284f85bd366a8eeb77e43b2f0e1ce4c4901bf8499bae1fa3f8a2c8 #+libressl.01dd8d3631fef3979b1bc6671f534b68045c8978591c113f55bc866df8f2dab1 #+s6-networking.5f3eed36105daf3325bf34bf7f0fc113d081d9b8355829a568ce262466b1e4d6 -#+zsh.86a0d702ed7dc56355270d4c4160145ea6666dcb3991c3dfe0011621fe9f2317 -#+pthbs-banginstall.d4346633b05d51d587b83ff5ecaf629613806814c00b11aa1ea39b7e988db09a -#+aat.a1db12700c81db7c66f05df651fd673eed16a2e69df3b969e4e36ef4a3d2c1ea -#+confz.e0f7f6bda82d1b31d794a31f739d08edb9b80aca4eccc2f76c7e156de41e817c -#+containers.476f6a0585c8895fd166fbcbb2525c319639fbe7c09ca5c9bb000a0b9e86b608 -#+fileset.50b7dcdc106933a9d36d54c20cd29405a51038da5f1c48d32c74bd0fe41bf57b -#+logincaps.f9e65de5f002f710c4553883dc8db0a96e00565603b828d40db83a633d1663b4 -#+snaprep.cfa821d35690ed93e851b06798dfb0151ad85ae9a3617f0b6183bdd1b3e56732 +#+zsh.83297b3ecdf2d2bdd00c4e315fe7c7c51a869b3d5af1ee15cc01bd3211cbf118 +#+pthbs-banginstall.e4fd59466c517f183302057e284b3de2c72825e75cc42f0811d84914592e71d7 +#+aat.df5ae4db100736a3b167980bd0be9192dcdc2d1028cc91cff690538b5520b941 +#+confz.c8ae2f57110d6b9c2e11b4e0173da73ffc95b9e73c2520254ca8b869d767237c +#+containers.abec8c6604b1a1006a9b296d3ec5ccb028b9fee28a6f796127a39f730b2bc37c +#+fileset.eef37c0e8dae9776d69488adb0931a876920fb9ae9ea72e3b5ae3e592ecfb14e +#+logincaps.204a2a6506ebfe1230a404714b88f83f8b36d88b97347d763c638e467c29f705 +#+snaprep.790e72b7e207cd0e120df7865276fa9886f70e3865000a9544c7649f3722b03d #+curl.2b4a1e3b47a33ba89abd7d14e594e8ba29f518d3421457c06154fbb1b40fc1c6 #+git.bdc1a8610da8a605b4a9f8bca567e9cfd56a0b7de1237279a995d5cc328e8986 #+xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71 @@ -79,7 +79,7 @@ #+libcap.1bf91aff7796a4e05d489c08b2e14523f6915af6f857dc9501622c3c3e2a5d12 #+applyuidgid-caps.d3aca8cbc71c7378e98957b903d18430a9edfc056b3c1566397cfb371a3c1c26 #+ccx-utils.d34c50f51608774953113953cb95a6288155fbca5d22b06b306469f9a26bc84f -#+user-env.febb5095521bde469edc9bef0fa3ae3e5a8eac890a366891ea5b9546c3b26101 +#+user-env.c37c2255a72a7638e3eff347ea786feb366e8a9fcba42e1aba6351addc65406c #+mlog.fa52523ab6e7641662db20e0b60ef8fe6d72b6565415096cd943eae6eddb93fd #+findutils.0e76b947c2f8211a4c6c8c114510e0d1c2c794131f772dab36e42d23b0402720 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c @@ -87,9 +87,9 @@ #+squashfs-tools.a2564e381e3e30b8f7c71af71a22f255bd1e3cbda8bf1187d9a4183c6100a01b #+mandoc.1bfad0ae04afa18e99c3a4239934e633bad4512123ffd4d269c8e14caf506c15 #+tinyssh.7d202f58107ebfc6935287dc91e8dae825c6c2ae84b47943110e819c7b76a5bc -#+system-config.341d1d6bd4061066eb7fe8f8dfd36b1f74cd81704cce1d7be3320872694b94ba -#+system-config-rc.3541d070e56d32dd289afda753111b7d93099fb22ba18f0a06fb44dafb594784 -#+system-config-scripts.6d83bd813fafa7a44d8909b398c5c33edd385fa1a5494b11ba963b0c35493063 -#+system-config-init.8689330f26943e9b06945db217c4970b8155f3753fc0746bb314c8a9b92316fd -#+system-config-zsh.00cb3216b7ed6e50a970b51ccc223e6046ea403332ff951dff3687b09b24e39b +#+system-config.c67d447a4c147655e70c076077903d5473c1b496fd5c2f87331ac5eb123567bd +#+system-config-rc.c1bf8ac29de689c33faaa06e1965ffe0796f5b1f4bba2c8dd41aa9b727a8edf6 +#+system-config-scripts.81d98eaeeb48f45b67f2e5d0c4dc6bc9537ff90340335d2fc2bc941c33986907 +#+system-config-init.874dffdd899c41ac4902bfa4d3b7b97ae62729da4e927e3fdf48115f2575c193 +#+system-config-zsh.3751c528fe368c0827e708b2f6072768822686e375624d8b1f35347dada1a80e #+busybox.0bfb0ebb4dfd7d4c1bcff5d3c3dc3d357d861a5b3f7232449d237d56a69f84f3 \ No newline at end of file diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.d81c93988d8c937f6db60683c693ca3d73916a305223d00a48eb22ca87e65f0e #+busybox-findutils.84cb8f604afa8735044097ee5d6200c4782093e06873cd36227c9342d30828b2 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c -#+zsh.86a0d702ed7dc56355270d4c4160145ea6666dcb3991c3dfe0011621fe9f2317 -#+pthbs-banginstall.d4346633b05d51d587b83ff5ecaf629613806814c00b11aa1ea39b7e988db09a +#+zsh.83297b3ecdf2d2bdd00c4e315fe7c7c51a869b3d5af1ee15cc01bd3211cbf118 +#+pthbs-banginstall.e4fd59466c517f183302057e284b3de2c72825e75cc42f0811d84914592e71d7 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd @@ -87,7 +87,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'libbsd-0.12.2' export CFLAGS="$CFLAGS -std=gnu11" -export CPATH=$PWD/include/bsd:$pthbs_build_environment/'include' +unset CPATH build_env_static autotools_config_static --verbose --disable-silent-rules --enable-year2038 diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.d81c93988d8c937f6db60683c693ca3d73916a305223d00a48eb22ca87e65f0e #+busybox-findutils.84cb8f604afa8735044097ee5d6200c4782093e06873cd36227c9342d30828b2 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c -#+zsh.86a0d702ed7dc56355270d4c4160145ea6666dcb3991c3dfe0011621fe9f2317 -#+pthbs-banginstall.d4346633b05d51d587b83ff5ecaf629613806814c00b11aa1ea39b7e988db09a +#+zsh.83297b3ecdf2d2bdd00c4e315fe7c7c51a869b3d5af1ee15cc01bd3211cbf118 +#+pthbs-banginstall.e4fd59466c517f183302057e284b3de2c72825e75cc42f0811d84914592e71d7 #+execline.40353eaff23067fb950e4814076f769ec877500bf0d6a1c78f55317b992a6b57 #+musl-cross-make.473b68ddd085348bd6321e604becb5a293e154ad4c6d61d518149f53a4ffea4b #+ccx-utils.d34c50f51608774953113953cb95a6288155fbca5d22b06b306469f9a26bc84f diff --git a/variants/ccx-x86_64/mdev-scripts b/variants/ccx-x86_64/mdev-scripts @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.d81c93988d8c937f6db60683c693ca3d73916a305223d00a48eb22ca87e65f0e #+busybox-findutils.84cb8f604afa8735044097ee5d6200c4782093e06873cd36227c9342d30828b2 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c -#+zsh.86a0d702ed7dc56355270d4c4160145ea6666dcb3991c3dfe0011621fe9f2317 -#+pthbs-banginstall.d4346633b05d51d587b83ff5ecaf629613806814c00b11aa1ea39b7e988db09a +#+zsh.83297b3ecdf2d2bdd00c4e315fe7c7c51a869b3d5af1ee15cc01bd3211cbf118 +#+pthbs-banginstall.e4fd59466c517f183302057e284b3de2c72825e75cc42f0811d84914592e71d7 #@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.7376272763d14702d64a8a8c43a9f7a1fcf2d2075f8d53a4a04edfcbea302723 #+execline.40353eaff23067fb950e4814076f769ec877500bf0d6a1c78f55317b992a6b57 #+s6.ca0b089204ed030f146486ee302b50994dd14a8ed8d1ba5f2bb377af2c626d01 -#+mdev-scripts.d02fca5affc54a4c1b5bb26907fc12f343e88a0bc267cadd9912ebb885706f62 +#+mdev-scripts.73a328c9a03d6cb28969c3a4c6edcab27fa019c9912dd308dea60dac77a10773 #+mdevd.bfe3896eca5a7ee6ffbdecb990f25360a2c8af15c76d2138ba898a54362637d6 #+busybox.0bfb0ebb4dfd7d4c1bcff5d3c3dc3d357d861a5b3f7232449d237d56a69f84f3 \ No newline at end of file diff --git a/variants/ccx-x86_64/pthbs-banginstall b/variants/ccx-x86_64/pthbs-banginstall @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.d81c93988d8c937f6db60683c693ca3d73916a305223d00a48eb22ca87e65f0e #+busybox-findutils.84cb8f604afa8735044097ee5d6200c4782093e06873cd36227c9342d30828b2 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c -#+zsh.86a0d702ed7dc56355270d4c4160145ea6666dcb3991c3dfe0011621fe9f2317 +#+zsh.83297b3ecdf2d2bdd00c4e315fe7c7c51a869b3d5af1ee15cc01bd3211cbf118 #@sha256:577cbaf04486ebc113d1c0b9dabd9a8eb29506dbfbdb5824d1e0601df4262715:pthbs-banginstall diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.d81c93988d8c937f6db60683c693ca3d73916a305223d00a48eb22ca87e65f0e #+busybox-findutils.84cb8f604afa8735044097ee5d6200c4782093e06873cd36227c9342d30828b2 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c -#+zsh.86a0d702ed7dc56355270d4c4160145ea6666dcb3991c3dfe0011621fe9f2317 -#+pthbs-banginstall.d4346633b05d51d587b83ff5ecaf629613806814c00b11aa1ea39b7e988db09a +#+zsh.83297b3ecdf2d2bdd00c4e315fe7c7c51a869b3d5af1ee15cc01bd3211cbf118 +#+pthbs-banginstall.e4fd59466c517f183302057e284b3de2c72825e75cc42f0811d84914592e71d7 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -47,8 +47,8 @@ #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c #+diffutils.204515cc8ca45943d81b2ee629f1360443f886d80ad316e669784be25648f203 #+gnu-make.79469751f2eeb20191719e2153d420f23dba0ddf95f816410a407517bdefb36c -#+aat.a1db12700c81db7c66f05df651fd673eed16a2e69df3b969e4e36ef4a3d2c1ea -#+fileset.50b7dcdc106933a9d36d54c20cd29405a51038da5f1c48d32c74bd0fe41bf57b +#+aat.df5ae4db100736a3b167980bd0be9192dcdc2d1028cc91cff690538b5520b941 +#+fileset.eef37c0e8dae9776d69488adb0931a876920fb9ae9ea72e3b5ae3e592ecfb14e #+rsync.ee03d11c8ae1e589be9ef54d532028aa124c2512d8567fdaaa9546ae6900aca8 #+execline.40353eaff23067fb950e4814076f769ec877500bf0d6a1c78f55317b992a6b57 #+kbd.dc60bfa2da5e4ad82f84754a8b3c7aaae30e19221b7067b781ed62256bc1f590 @@ -56,10 +56,10 @@ #+s6-linux-utils.ee802c9d791b5dd387b43cdcc33ebd6097b5d3fab98ef9ba8afbbe6edc5de00a #+s6-rc.60bdf9c60ff07c507db53ce85860465ec10917b02d04e43e565a41c14abcf47a #+s6.ca0b089204ed030f146486ee302b50994dd14a8ed8d1ba5f2bb377af2c626d01 -#+zsh.86a0d702ed7dc56355270d4c4160145ea6666dcb3991c3dfe0011621fe9f2317 +#+zsh.83297b3ecdf2d2bdd00c4e315fe7c7c51a869b3d5af1ee15cc01bd3211cbf118 #+libcgroup.e2f7accd1d8b79c1a2f118e047377c67f88892681e85d59c4b86c63b9911bf83 -#+system-config-scripts.6d83bd813fafa7a44d8909b398c5c33edd385fa1a5494b11ba963b0c35493063 -#+logincaps.f9e65de5f002f710c4553883dc8db0a96e00565603b828d40db83a633d1663b4 +#+system-config-scripts.81d98eaeeb48f45b67f2e5d0c4dc6bc9537ff90340335d2fc2bc941c33986907 +#+logincaps.204a2a6506ebfe1230a404714b88f83f8b36d88b97347d763c638e467c29f705 #+busybox.0bfb0ebb4dfd7d4c1bcff5d3c3dc3d357d861a5b3f7232449d237d56a69f84f3 #@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.458a3f4e2a3a4346df211f1c201187bccb4f113838917a76eb4a29b9d22fec86' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.512998940deb7f246d24edf9af80b9f70648c402ad3d465f166a2935343846b7' \ + 'pthbs_path_containers=/home/ccx/versions/env.d11de1ef825a0f7825b4346c60551508a039254098ba5933008beb47d7873038' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.92b80bd75aa62ab875b82d461f184c4416b16fb26e4acbc4124f66dbea9f532a' \ 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.680fe5c007becce6f4aa9dacc7659541fe06feb1ce885218592feb36766f80e9 #+s6-linux-init.b378a8f5bea7ab34868489c092499b7c1186f2f88f39da0c577040665fa98dfe #+execline.40353eaff23067fb950e4814076f769ec877500bf0d6a1c78f55317b992a6b57 -#+system-config-rc.3541d070e56d32dd289afda753111b7d93099fb22ba18f0a06fb44dafb594784 +#+system-config-rc.c1bf8ac29de689c33faaa06e1965ffe0796f5b1f4bba2c8dd41aa9b727a8edf6 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.3541d070e56d32dd289afda753111b7d93099fb22ba18f0a06fb44dafb594784/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.c1bf8ac29de689c33faaa06e1965ffe0796f5b1f4bba2c8dd41aa9b727a8edf6/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.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c #+busybox-diffutils.8325b9881e7e36ec91579f74ab1c4450891fe7501654c9b7e63f4d469b95bdb2 #+s6-rc.60bdf9c60ff07c507db53ce85860465ec10917b02d04e43e565a41c14abcf47a -#+fileset.50b7dcdc106933a9d36d54c20cd29405a51038da5f1c48d32c74bd0fe41bf57b -#+system-config.341d1d6bd4061066eb7fe8f8dfd36b1f74cd81704cce1d7be3320872694b94ba +#+fileset.eef37c0e8dae9776d69488adb0931a876920fb9ae9ea72e3b5ae3e592ecfb14e +#+system-config.c67d447a4c147655e70c076077903d5473c1b496fd5c2f87331ac5eb123567bd # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.341d1d6bd4061066eb7fe8f8dfd36b1f74cd81704cce1d7be3320872694b94ba/config/s6-rc-source +src=/home/ccx/versions/system-config.c67d447a4c147655e70c076077903d5473c1b496fd5c2f87331ac5eb123567bd/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" diff --git a/variants/ccx-x86_64/system-config-scripts b/variants/ccx-x86_64/system-config-scripts @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.d81c93988d8c937f6db60683c693ca3d73916a305223d00a48eb22ca87e65f0e #+busybox-findutils.84cb8f604afa8735044097ee5d6200c4782093e06873cd36227c9342d30828b2 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c -#+zsh.86a0d702ed7dc56355270d4c4160145ea6666dcb3991c3dfe0011621fe9f2317 -#+pthbs-banginstall.d4346633b05d51d587b83ff5ecaf629613806814c00b11aa1ea39b7e988db09a +#+zsh.83297b3ecdf2d2bdd00c4e315fe7c7c51a869b3d5af1ee15cc01bd3211cbf118 +#+pthbs-banginstall.e4fd59466c517f183302057e284b3de2c72825e75cc42f0811d84914592e71d7 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts diff --git a/variants/ccx-x86_64/system-config-zsh b/variants/ccx-x86_64/system-config-zsh @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.d81c93988d8c937f6db60683c693ca3d73916a305223d00a48eb22ca87e65f0e #+busybox-findutils.84cb8f604afa8735044097ee5d6200c4782093e06873cd36227c9342d30828b2 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c -#+zsh.86a0d702ed7dc56355270d4c4160145ea6666dcb3991c3dfe0011621fe9f2317 +#+zsh.83297b3ecdf2d2bdd00c4e315fe7c7c51a869b3d5af1ee15cc01bd3211cbf118 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env @@ -28,7 +28,7 @@ #+busybox-findutils.84cb8f604afa8735044097ee5d6200c4782093e06873cd36227c9342d30828b2 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c #+execline.40353eaff23067fb950e4814076f769ec877500bf0d6a1c78f55317b992a6b57 -#+pthbs-banginstall.d4346633b05d51d587b83ff5ecaf629613806814c00b11aa1ea39b7e988db09a +#+pthbs-banginstall.e4fd59466c517f183302057e284b3de2c72825e75cc42f0811d84914592e71d7 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -61,14 +61,14 @@ #+s6-dns.90b3e235f2284f85bd366a8eeb77e43b2f0e1ce4c4901bf8499bae1fa3f8a2c8 #+libressl.01dd8d3631fef3979b1bc6671f534b68045c8978591c113f55bc866df8f2dab1 #+s6-networking.5f3eed36105daf3325bf34bf7f0fc113d081d9b8355829a568ce262466b1e4d6 -#+zsh.86a0d702ed7dc56355270d4c4160145ea6666dcb3991c3dfe0011621fe9f2317 -#+pthbs-banginstall.d4346633b05d51d587b83ff5ecaf629613806814c00b11aa1ea39b7e988db09a -#+aat.a1db12700c81db7c66f05df651fd673eed16a2e69df3b969e4e36ef4a3d2c1ea -#+confz.e0f7f6bda82d1b31d794a31f739d08edb9b80aca4eccc2f76c7e156de41e817c -#+containers.476f6a0585c8895fd166fbcbb2525c319639fbe7c09ca5c9bb000a0b9e86b608 -#+fileset.50b7dcdc106933a9d36d54c20cd29405a51038da5f1c48d32c74bd0fe41bf57b -#+logincaps.f9e65de5f002f710c4553883dc8db0a96e00565603b828d40db83a633d1663b4 -#+snaprep.cfa821d35690ed93e851b06798dfb0151ad85ae9a3617f0b6183bdd1b3e56732 +#+zsh.83297b3ecdf2d2bdd00c4e315fe7c7c51a869b3d5af1ee15cc01bd3211cbf118 +#+pthbs-banginstall.e4fd59466c517f183302057e284b3de2c72825e75cc42f0811d84914592e71d7 +#+aat.df5ae4db100736a3b167980bd0be9192dcdc2d1028cc91cff690538b5520b941 +#+confz.c8ae2f57110d6b9c2e11b4e0173da73ffc95b9e73c2520254ca8b869d767237c +#+containers.abec8c6604b1a1006a9b296d3ec5ccb028b9fee28a6f796127a39f730b2bc37c +#+fileset.eef37c0e8dae9776d69488adb0931a876920fb9ae9ea72e3b5ae3e592ecfb14e +#+logincaps.204a2a6506ebfe1230a404714b88f83f8b36d88b97347d763c638e467c29f705 +#+snaprep.790e72b7e207cd0e120df7865276fa9886f70e3865000a9544c7649f3722b03d #+curl.2b4a1e3b47a33ba89abd7d14e594e8ba29f518d3421457c06154fbb1b40fc1c6 #+git.bdc1a8610da8a605b4a9f8bca567e9cfd56a0b7de1237279a995d5cc328e8986 #+xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71 @@ -79,7 +79,7 @@ #+libcap.1bf91aff7796a4e05d489c08b2e14523f6915af6f857dc9501622c3c3e2a5d12 #+applyuidgid-caps.d3aca8cbc71c7378e98957b903d18430a9edfc056b3c1566397cfb371a3c1c26 #+ccx-utils.d34c50f51608774953113953cb95a6288155fbca5d22b06b306469f9a26bc84f -#+user-env.febb5095521bde469edc9bef0fa3ae3e5a8eac890a366891ea5b9546c3b26101 +#+user-env.c37c2255a72a7638e3eff347ea786feb366e8a9fcba42e1aba6351addc65406c #+mlog.fa52523ab6e7641662db20e0b60ef8fe6d72b6565415096cd943eae6eddb93fd #+findutils.0e76b947c2f8211a4c6c8c114510e0d1c2c794131f772dab36e42d23b0402720 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh @@ -32,7 +32,7 @@ #+gnu-make.79469751f2eeb20191719e2153d420f23dba0ddf95f816410a407517bdefb36c #+m4.bae57a2eab833d3fe860930ee498c1643ac11cd10b062b2c1b2a167c12133e68 #+netbsd-curses.11ab15dabc07753d7f02d7545d293537a7aac14993291594398178f1f658c935 -#+libbsd.54ff740367a62120e6670f453e3dd5bca52d2c6f8db8cf1eea4abf19a620be89 +#+libbsd.2df54d99fddd16ca359b75bd1ffba492c4bb2760481e84cf0ec8538c3037c7d0 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.41e5c782e22370e9e5c7edf0f51f970b29392d38fda7e5d0cb485307d00cbeb9 #+busybox-findutils.2a1d5c566a2629b72fb851261140def63b323ee166cb8525b71a6dfb38a8a498 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e -#+zsh.86537beba95e5cf3fb4ec5f82060defcf4fdc0e94c3d5d5ef0f1688772e43db9 -#+pthbs-banginstall.bd1734cb53670c454aaa688e0b9cb84b32c41d387d9cc02bffcc09b2676ba448 +#+zsh.b6e1ce543a0c93d11b432f40cb4c8aadf3133f41ef28bb0d46992442564c47c0 +#+pthbs-banginstall.b0138a474c857c32bcbfba8480746198b2469b350a5b395bbea3fdab23604edf #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.41e5c782e22370e9e5c7edf0f51f970b29392d38fda7e5d0cb485307d00cbeb9 #+busybox-findutils.2a1d5c566a2629b72fb851261140def63b323ee166cb8525b71a6dfb38a8a498 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e -#+zsh.86537beba95e5cf3fb4ec5f82060defcf4fdc0e94c3d5d5ef0f1688772e43db9 -#+pthbs-banginstall.bd1734cb53670c454aaa688e0b9cb84b32c41d387d9cc02bffcc09b2676ba448 +#+zsh.b6e1ce543a0c93d11b432f40cb4c8aadf3133f41ef28bb0d46992442564c47c0 +#+pthbs-banginstall.b0138a474c857c32bcbfba8480746198b2469b350a5b395bbea3fdab23604edf #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.41e5c782e22370e9e5c7edf0f51f970b29392d38fda7e5d0cb485307d00cbeb9 #+busybox-findutils.2a1d5c566a2629b72fb851261140def63b323ee166cb8525b71a6dfb38a8a498 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e -#+zsh.86537beba95e5cf3fb4ec5f82060defcf4fdc0e94c3d5d5ef0f1688772e43db9 -#+pthbs-banginstall.bd1734cb53670c454aaa688e0b9cb84b32c41d387d9cc02bffcc09b2676ba448 +#+zsh.b6e1ce543a0c93d11b432f40cb4c8aadf3133f41ef28bb0d46992442564c47c0 +#+pthbs-banginstall.b0138a474c857c32bcbfba8480746198b2469b350a5b395bbea3fdab23604edf #+execline.4ce0c41824f822a2121cd43043d321c827b23b2ccef5a3ef0150e9f147d7e90a #+alpine-keys.91c778ab606f8627ec57ca0ac12fbc575b11be2c477052ab77a9cf8cb3534416 #+apk-tools.e9e751ea7ddc425811423c10dd7b317f2a13001905424548febd956bc68a19d5 diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -48,15 +48,15 @@ #+s6.96c8519cb2a37864d6aa1e18fa138d5789be61ceb96429f1beece1a1c945afc7 #+s6-portable-utils.ad7a9fd81c7d4fc1c1f9f9b0e422452dd95e02f15c7e04a1421727fe278cb219 #+s6-linux-utils.c905cda13791d3634af26d96e1616784a3eab93ee598af58b0f6baf26c5a9f18 -#+zsh.86537beba95e5cf3fb4ec5f82060defcf4fdc0e94c3d5d5ef0f1688772e43db9 -#+confz.87c267f0aa587911a6f078a7b7b71f979c79ad0bcbe19a0ba9fe31a380e2785c -#+containers.1cfb11771a7cbb97c36b903e89f7f497bf4e512fb9be21347b3e4a9054f288bf +#+zsh.b6e1ce543a0c93d11b432f40cb4c8aadf3133f41ef28bb0d46992442564c47c0 +#+confz.e4b7a487ed4f76851c6052319eb374ab7455aec72f7a387ce072a4d1e86a6551 +#+containers.03fa81851e74ee294ffaee20b7b1fd76bac6ad47a48b4db36b7c81383955a26b #+xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989 #+zstd.c63a3cabacc7382111033c967c5e11509d80a53e85d1f82f5117c0994ee82058 #+apk-tools.e9e751ea7ddc425811423c10dd7b317f2a13001905424548febd956bc68a19d5 #+alpine-keys.91c778ab606f8627ec57ca0ac12fbc575b11be2c477052ab77a9cf8cb3534416 #+getent.4caaecf2abb7893d1b05b464d8b085ceec41e148787112dd626dcb04ef3b64b6 -#+fileset.216cb5029207c19e5dffc1444390cf839f5dc44b2661454d703c2dcf3e71ac80 +#+fileset.1f5c70aabf72726def3bf99b482509943550cf925b44b59c1ce1d90a6eabfd4f #+ccx-utils.76fa3451ead3ef0516d5b7cd5c7c82e33866553e42fedc7359563396beed4e19 #+easyseccomp.f243e4bc2f690ed78c99d2e845586fcbd6c317aee6656ee9faa96916d1fe09d9 #+findutils.68dbe3ca65da5cbfad495bde6d8c8c997988357f5714b2d92a3b552fdf7c33a6 diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -61,14 +61,14 @@ #+s6-dns.e0eeac2667995a9c0ec71e110b7107da45767f24acef7f95270c16ba512fac47 #+libressl.b519454b508240b59d35f2885174ec37ffe947424e66a5deedbb81f01172b078 #+s6-networking.b997c7ce11d3e3b6ddabe1b38ea75fd3130bd2b31ae6f3d2b2e5d5b224ae4202 -#+zsh.86537beba95e5cf3fb4ec5f82060defcf4fdc0e94c3d5d5ef0f1688772e43db9 -#+pthbs-banginstall.bd1734cb53670c454aaa688e0b9cb84b32c41d387d9cc02bffcc09b2676ba448 -#+aat.d6002d6fe20e103a691933b5710ffcf0288485d56b5e4e2a87aa1c230f857b3a -#+confz.87c267f0aa587911a6f078a7b7b71f979c79ad0bcbe19a0ba9fe31a380e2785c -#+containers.1cfb11771a7cbb97c36b903e89f7f497bf4e512fb9be21347b3e4a9054f288bf -#+fileset.216cb5029207c19e5dffc1444390cf839f5dc44b2661454d703c2dcf3e71ac80 -#+logincaps.a682384e5a08b3af8240e5b5a376e670407faa9ce4a96cb93a0960bd9639cb89 -#+snaprep.868f9382fa9e7473a3862cf250195cc14b1b2d90add3469250ea7a5bf87ab2fb +#+zsh.b6e1ce543a0c93d11b432f40cb4c8aadf3133f41ef28bb0d46992442564c47c0 +#+pthbs-banginstall.b0138a474c857c32bcbfba8480746198b2469b350a5b395bbea3fdab23604edf +#+aat.9eff7f83056acfa66d5a3c9d0dac35a10fffc414eb9a5db22e65cb3c2911bc80 +#+confz.e4b7a487ed4f76851c6052319eb374ab7455aec72f7a387ce072a4d1e86a6551 +#+containers.03fa81851e74ee294ffaee20b7b1fd76bac6ad47a48b4db36b7c81383955a26b +#+fileset.1f5c70aabf72726def3bf99b482509943550cf925b44b59c1ce1d90a6eabfd4f +#+logincaps.86388cffced68b8f1d489148ea958f2bf349f0ae568149dac454661982c14c5f +#+snaprep.8552c7c411e3a092b1a535c272db7655faad813f36f36126aa3bafd2134b9a6b #+curl.7f5463b5de6d0e17b7b374ef28d43d8dffde44b7901feeba5a6f77e17b76fbed #+git.a611fbad4e4b588d14e616889a929fc76990a99272106cd3dd419b96a05224c9 #+xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989 @@ -79,7 +79,7 @@ #+libcap.a4535114c422033f37933f15758592c0e7a327a66ecee2cc445d9b565c07f2d6 #+applyuidgid-caps.65c2cf78a093f3c442f5f5f69e5b4f49f71bfb303ba93336f0b4913a2387e5c3 #+ccx-utils.76fa3451ead3ef0516d5b7cd5c7c82e33866553e42fedc7359563396beed4e19 -#+user-env.129336c20e71d14e99ce63c705e3a02374c92c9e370939fafaee39ad8146b46b +#+user-env.e32520688305b257aec278dc3452cff8ca0a22387d0594a445468d183ec40730 #+mlog.c6bb1056afeb97041aeba1f60e1b0574d21fa98407960995ff5448a4b5dee034 #+findutils.68dbe3ca65da5cbfad495bde6d8c8c997988357f5714b2d92a3b552fdf7c33a6 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e @@ -87,9 +87,9 @@ #+squashfs-tools.d9b4267c13e4ee7076d8897b9461a00ff7bc2aeb4a166fb28f8d38e46ba67a99 #+mandoc.421dfa1a68724de02d7e94d17a7c515db1908a6b9560f7bcfef9764e01eb9d5c #+tinyssh.ca9956fe0cef56dd575836a9f804bd66df875871ae08d63badb077429ebd240d -#+system-config.fd7857d758880ddb59fc5a7dffa068164eeda1eea0014c6e9f01117706a47d59 -#+system-config-rc.1f1d38b8e7681fae84815106237d846ab7d5f11d23dc7fc6465d062cb598426d -#+system-config-scripts.eee406186e8287f084789657e851e671b0a304b56e278b606dcdc410fbd0b06e -#+system-config-init.e0323a628d636717bb81753430a319339a432891294768c973b99f4c77f4dbf2 -#+system-config-zsh.2e86d212ed832b85c49efb6e89430eaf42bf540cf843d4bda002d9d297d80ed9 +#+system-config.734de08b417cfb85b864a314877293a905998e4e67070d56662cfcbee12d5754 +#+system-config-rc.50067b849b1961ef1d4431670da622b788a288b41714e2d0402036388ea4fcbb +#+system-config-scripts.b5e26d432dae19a158560c3b9d295ee0b86b394637a9261915c78f352c7f4448 +#+system-config-init.5e10938ef5cfaa97d14e6899bf931de677e9b2be1c84706c459d575297da4751 +#+system-config-zsh.bc1a21c8a827a132261115ceaba55205713a5f76a6378348b34b4bfa5b466475 #+busybox-modutils.0692501ecfd7ea655126eb922eb0143df8b6570eb2382700c13eef0bf9ccb006 \ No newline at end of file diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.41e5c782e22370e9e5c7edf0f51f970b29392d38fda7e5d0cb485307d00cbeb9 #+busybox-findutils.2a1d5c566a2629b72fb851261140def63b323ee166cb8525b71a6dfb38a8a498 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e -#+zsh.86537beba95e5cf3fb4ec5f82060defcf4fdc0e94c3d5d5ef0f1688772e43db9 -#+pthbs-banginstall.bd1734cb53670c454aaa688e0b9cb84b32c41d387d9cc02bffcc09b2676ba448 +#+zsh.b6e1ce543a0c93d11b432f40cb4c8aadf3133f41ef28bb0d46992442564c47c0 +#+pthbs-banginstall.b0138a474c857c32bcbfba8480746198b2469b350a5b395bbea3fdab23604edf #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd @@ -87,7 +87,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'libbsd-0.12.2' export CFLAGS="$CFLAGS -std=gnu11" -export CPATH=$PWD/include/bsd:$pthbs_build_environment/'include' +unset CPATH build_env_static autotools_config_static --verbose --disable-silent-rules --enable-year2038 diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.41e5c782e22370e9e5c7edf0f51f970b29392d38fda7e5d0cb485307d00cbeb9 #+busybox-findutils.2a1d5c566a2629b72fb851261140def63b323ee166cb8525b71a6dfb38a8a498 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e -#+zsh.86537beba95e5cf3fb4ec5f82060defcf4fdc0e94c3d5d5ef0f1688772e43db9 -#+pthbs-banginstall.bd1734cb53670c454aaa688e0b9cb84b32c41d387d9cc02bffcc09b2676ba448 +#+zsh.b6e1ce543a0c93d11b432f40cb4c8aadf3133f41ef28bb0d46992442564c47c0 +#+pthbs-banginstall.b0138a474c857c32bcbfba8480746198b2469b350a5b395bbea3fdab23604edf #+execline.4ce0c41824f822a2121cd43043d321c827b23b2ccef5a3ef0150e9f147d7e90a #+musl-cross-make.a626ec7d74e578120d5e61fc16872531b8b947de906a252906853c2bc50167bb #+ccx-utils.76fa3451ead3ef0516d5b7cd5c7c82e33866553e42fedc7359563396beed4e19 diff --git a/variants/root-x86_64/mdev-scripts b/variants/root-x86_64/mdev-scripts @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.41e5c782e22370e9e5c7edf0f51f970b29392d38fda7e5d0cb485307d00cbeb9 #+busybox-findutils.2a1d5c566a2629b72fb851261140def63b323ee166cb8525b71a6dfb38a8a498 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e -#+zsh.86537beba95e5cf3fb4ec5f82060defcf4fdc0e94c3d5d5ef0f1688772e43db9 -#+pthbs-banginstall.bd1734cb53670c454aaa688e0b9cb84b32c41d387d9cc02bffcc09b2676ba448 +#+zsh.b6e1ce543a0c93d11b432f40cb4c8aadf3133f41ef28bb0d46992442564c47c0 +#+pthbs-banginstall.b0138a474c857c32bcbfba8480746198b2469b350a5b395bbea3fdab23604edf #@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.e19dc6c4fe5b059160587c0188681166bc8dcd934fc17dea98c7059dda5d1947 #+execline.4ce0c41824f822a2121cd43043d321c827b23b2ccef5a3ef0150e9f147d7e90a #+s6.96c8519cb2a37864d6aa1e18fa138d5789be61ceb96429f1beece1a1c945afc7 -#+mdev-scripts.2043ac0c21da1b2abfb6d6591587e815aa46059e97b6fa88c8bf4eb0e25d0062 +#+mdev-scripts.ef95d886f6a984c3268250378f97a4bfe7551a43ad78c9376464d789d3b83533 #+mdevd.d76f0b5e853fd7ca5a6e552162cc722040a1fe476483d92a1f76e46e78bc7e9a #+busybox-modutils.0692501ecfd7ea655126eb922eb0143df8b6570eb2382700c13eef0bf9ccb006 \ No newline at end of file diff --git a/variants/root-x86_64/pthbs-banginstall b/variants/root-x86_64/pthbs-banginstall @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.41e5c782e22370e9e5c7edf0f51f970b29392d38fda7e5d0cb485307d00cbeb9 #+busybox-findutils.2a1d5c566a2629b72fb851261140def63b323ee166cb8525b71a6dfb38a8a498 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e -#+zsh.86537beba95e5cf3fb4ec5f82060defcf4fdc0e94c3d5d5ef0f1688772e43db9 +#+zsh.b6e1ce543a0c93d11b432f40cb4c8aadf3133f41ef28bb0d46992442564c47c0 #@sha256:577cbaf04486ebc113d1c0b9dabd9a8eb29506dbfbdb5824d1e0601df4262715:pthbs-banginstall diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.41e5c782e22370e9e5c7edf0f51f970b29392d38fda7e5d0cb485307d00cbeb9 #+busybox-findutils.2a1d5c566a2629b72fb851261140def63b323ee166cb8525b71a6dfb38a8a498 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e -#+zsh.86537beba95e5cf3fb4ec5f82060defcf4fdc0e94c3d5d5ef0f1688772e43db9 -#+pthbs-banginstall.bd1734cb53670c454aaa688e0b9cb84b32c41d387d9cc02bffcc09b2676ba448 +#+zsh.b6e1ce543a0c93d11b432f40cb4c8aadf3133f41ef28bb0d46992442564c47c0 +#+pthbs-banginstall.b0138a474c857c32bcbfba8480746198b2469b350a5b395bbea3fdab23604edf #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -47,8 +47,8 @@ #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e #+diffutils.7e05a7a6026b27fbfc7c3942013bd816ba0def123f906e2d14e960d85ada4f78 #+gnu-make.bcf1e2219eef8ef6cec2972924978ecd90c3981fb0999b75432e3e9e5873b8a8 -#+aat.d6002d6fe20e103a691933b5710ffcf0288485d56b5e4e2a87aa1c230f857b3a -#+fileset.216cb5029207c19e5dffc1444390cf839f5dc44b2661454d703c2dcf3e71ac80 +#+aat.9eff7f83056acfa66d5a3c9d0dac35a10fffc414eb9a5db22e65cb3c2911bc80 +#+fileset.1f5c70aabf72726def3bf99b482509943550cf925b44b59c1ce1d90a6eabfd4f #+rsync.0f2699cb54baf8267ca1ed69711ad4854520b37751dadff4714d60625a7ddba2 #+execline.4ce0c41824f822a2121cd43043d321c827b23b2ccef5a3ef0150e9f147d7e90a #+kbd.6f11c0835495c6e93ed0a4d487f3ff4e320edd27c703a128d6bb2e2992a33bae @@ -56,10 +56,10 @@ #+s6-linux-utils.c905cda13791d3634af26d96e1616784a3eab93ee598af58b0f6baf26c5a9f18 #+s6-rc.3c6bebbe7fcf84c87fba0319c4868aba211f2f771d2ab34489c3264f8e157703 #+s6.96c8519cb2a37864d6aa1e18fa138d5789be61ceb96429f1beece1a1c945afc7 -#+zsh.86537beba95e5cf3fb4ec5f82060defcf4fdc0e94c3d5d5ef0f1688772e43db9 +#+zsh.b6e1ce543a0c93d11b432f40cb4c8aadf3133f41ef28bb0d46992442564c47c0 #+libcgroup.212438b617126996f9a2547758ba3e504ad3dfe9528c4acad120c7d347c928e4 -#+system-config-scripts.eee406186e8287f084789657e851e671b0a304b56e278b606dcdc410fbd0b06e -#+logincaps.a682384e5a08b3af8240e5b5a376e670407faa9ce4a96cb93a0960bd9639cb89 +#+system-config-scripts.b5e26d432dae19a158560c3b9d295ee0b86b394637a9261915c78f352c7f4448 +#+logincaps.86388cffced68b8f1d489148ea958f2bf349f0ae568149dac454661982c14c5f #+busybox-modutils.0692501ecfd7ea655126eb922eb0143df8b6570eb2382700c13eef0bf9ccb006 #@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.1d197b70005bf4bb4d5271c4e02e6817560d677432370b48428045d202af205b' \ - 'pthbs_path_mdevd=/versions/env.5c00e76b7d5e90a88afa91d1f4c6faffa4e829d38c56f57541107a77a0c93a4c' \ + 'pthbs_path_containers=/versions/env.bb1b38acf448f634638753724815f3c4a6cecde65d8f7824737d40557384c21d' \ + 'pthbs_path_mdevd=/versions/env.54bebb7c3069fe5a7cf148401ae730882ba7ccec7c5527281cbf665df7ab00e6' \ 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.ad7a9fd81c7d4fc1c1f9f9b0e422452dd95e02f15c7e04a1421727fe278cb219 #+s6-linux-init.10203af75c4a3c8b1933c7173f1ee2f6f11b0126fa697fc3a097f2bedfd89bc7 #+execline.4ce0c41824f822a2121cd43043d321c827b23b2ccef5a3ef0150e9f147d7e90a -#+system-config-rc.1f1d38b8e7681fae84815106237d846ab7d5f11d23dc7fc6465d062cb598426d +#+system-config-rc.50067b849b1961ef1d4431670da622b788a288b41714e2d0402036388ea4fcbb # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.1f1d38b8e7681fae84815106237d846ab7d5f11d23dc7fc6465d062cb598426d/config/s6-rc-db +s6rcdb=/versions/system-config-rc.50067b849b1961ef1d4431670da622b788a288b41714e2d0402036388ea4fcbb/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.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e #+busybox-diffutils.93ec375b0382feb4651fa15a7b034fad65a67471e2375fd514485a802899625b #+s6-rc.3c6bebbe7fcf84c87fba0319c4868aba211f2f771d2ab34489c3264f8e157703 -#+fileset.216cb5029207c19e5dffc1444390cf839f5dc44b2661454d703c2dcf3e71ac80 -#+system-config.fd7857d758880ddb59fc5a7dffa068164eeda1eea0014c6e9f01117706a47d59 +#+fileset.1f5c70aabf72726def3bf99b482509943550cf925b44b59c1ce1d90a6eabfd4f +#+system-config.734de08b417cfb85b864a314877293a905998e4e67070d56662cfcbee12d5754 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.fd7857d758880ddb59fc5a7dffa068164eeda1eea0014c6e9f01117706a47d59/config/s6-rc-source +src=/versions/system-config.734de08b417cfb85b864a314877293a905998e4e67070d56662cfcbee12d5754/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" diff --git a/variants/root-x86_64/system-config-scripts b/variants/root-x86_64/system-config-scripts @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.41e5c782e22370e9e5c7edf0f51f970b29392d38fda7e5d0cb485307d00cbeb9 #+busybox-findutils.2a1d5c566a2629b72fb851261140def63b323ee166cb8525b71a6dfb38a8a498 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e -#+zsh.86537beba95e5cf3fb4ec5f82060defcf4fdc0e94c3d5d5ef0f1688772e43db9 -#+pthbs-banginstall.bd1734cb53670c454aaa688e0b9cb84b32c41d387d9cc02bffcc09b2676ba448 +#+zsh.b6e1ce543a0c93d11b432f40cb4c8aadf3133f41ef28bb0d46992442564c47c0 +#+pthbs-banginstall.b0138a474c857c32bcbfba8480746198b2469b350a5b395bbea3fdab23604edf #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts diff --git a/variants/root-x86_64/system-config-zsh b/variants/root-x86_64/system-config-zsh @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.41e5c782e22370e9e5c7edf0f51f970b29392d38fda7e5d0cb485307d00cbeb9 #+busybox-findutils.2a1d5c566a2629b72fb851261140def63b323ee166cb8525b71a6dfb38a8a498 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e -#+zsh.86537beba95e5cf3fb4ec5f82060defcf4fdc0e94c3d5d5ef0f1688772e43db9 +#+zsh.b6e1ce543a0c93d11b432f40cb4c8aadf3133f41ef28bb0d46992442564c47c0 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env @@ -28,7 +28,7 @@ #+busybox-findutils.2a1d5c566a2629b72fb851261140def63b323ee166cb8525b71a6dfb38a8a498 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e #+execline.4ce0c41824f822a2121cd43043d321c827b23b2ccef5a3ef0150e9f147d7e90a -#+pthbs-banginstall.bd1734cb53670c454aaa688e0b9cb84b32c41d387d9cc02bffcc09b2676ba448 +#+pthbs-banginstall.b0138a474c857c32bcbfba8480746198b2469b350a5b395bbea3fdab23604edf #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -61,14 +61,14 @@ #+s6-dns.e0eeac2667995a9c0ec71e110b7107da45767f24acef7f95270c16ba512fac47 #+libressl.b519454b508240b59d35f2885174ec37ffe947424e66a5deedbb81f01172b078 #+s6-networking.b997c7ce11d3e3b6ddabe1b38ea75fd3130bd2b31ae6f3d2b2e5d5b224ae4202 -#+zsh.86537beba95e5cf3fb4ec5f82060defcf4fdc0e94c3d5d5ef0f1688772e43db9 -#+pthbs-banginstall.bd1734cb53670c454aaa688e0b9cb84b32c41d387d9cc02bffcc09b2676ba448 -#+aat.d6002d6fe20e103a691933b5710ffcf0288485d56b5e4e2a87aa1c230f857b3a -#+confz.87c267f0aa587911a6f078a7b7b71f979c79ad0bcbe19a0ba9fe31a380e2785c -#+containers.1cfb11771a7cbb97c36b903e89f7f497bf4e512fb9be21347b3e4a9054f288bf -#+fileset.216cb5029207c19e5dffc1444390cf839f5dc44b2661454d703c2dcf3e71ac80 -#+logincaps.a682384e5a08b3af8240e5b5a376e670407faa9ce4a96cb93a0960bd9639cb89 -#+snaprep.868f9382fa9e7473a3862cf250195cc14b1b2d90add3469250ea7a5bf87ab2fb +#+zsh.b6e1ce543a0c93d11b432f40cb4c8aadf3133f41ef28bb0d46992442564c47c0 +#+pthbs-banginstall.b0138a474c857c32bcbfba8480746198b2469b350a5b395bbea3fdab23604edf +#+aat.9eff7f83056acfa66d5a3c9d0dac35a10fffc414eb9a5db22e65cb3c2911bc80 +#+confz.e4b7a487ed4f76851c6052319eb374ab7455aec72f7a387ce072a4d1e86a6551 +#+containers.03fa81851e74ee294ffaee20b7b1fd76bac6ad47a48b4db36b7c81383955a26b +#+fileset.1f5c70aabf72726def3bf99b482509943550cf925b44b59c1ce1d90a6eabfd4f +#+logincaps.86388cffced68b8f1d489148ea958f2bf349f0ae568149dac454661982c14c5f +#+snaprep.8552c7c411e3a092b1a535c272db7655faad813f36f36126aa3bafd2134b9a6b #+curl.7f5463b5de6d0e17b7b374ef28d43d8dffde44b7901feeba5a6f77e17b76fbed #+git.a611fbad4e4b588d14e616889a929fc76990a99272106cd3dd419b96a05224c9 #+xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989 @@ -79,7 +79,7 @@ #+libcap.a4535114c422033f37933f15758592c0e7a327a66ecee2cc445d9b565c07f2d6 #+applyuidgid-caps.65c2cf78a093f3c442f5f5f69e5b4f49f71bfb303ba93336f0b4913a2387e5c3 #+ccx-utils.76fa3451ead3ef0516d5b7cd5c7c82e33866553e42fedc7359563396beed4e19 -#+user-env.129336c20e71d14e99ce63c705e3a02374c92c9e370939fafaee39ad8146b46b +#+user-env.e32520688305b257aec278dc3452cff8ca0a22387d0594a445468d183ec40730 #+mlog.c6bb1056afeb97041aeba1f60e1b0574d21fa98407960995ff5448a4b5dee034 #+findutils.68dbe3ca65da5cbfad495bde6d8c8c997988357f5714b2d92a3b552fdf7c33a6 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh @@ -32,7 +32,7 @@ #+gnu-make.bcf1e2219eef8ef6cec2972924978ecd90c3981fb0999b75432e3e9e5873b8a8 #+m4.544b50e189fc3ac5dd818c29b6c2781a0b36808ebb2be12abc5c59a69a9acc91 #+netbsd-curses.752f6231f3ba4ef61e112c15cc580cec8a274414a25d89df4cc7e12036de4576 -#+libbsd.dd2274a255b1ad75fd5088f4869a939d669a7902f6f90c932bf38706cf9621f1 +#+libbsd.fdf42fec29b7fc6b329114c585a86344ea683153cad8aa8f7ce19166cf46a065 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.