commit 0bc10151df933ac80658b123a7e18a249a3441bc parent ad1decde0e802cf1b06e245294fe063449d85c36 Author: Jan Pobrislo <ccx@te2000.cz> Date: Fri, 12 Dec 2025 02:37:24 +0000 libbsd: Set CFLAGS earlier Diffstat:
41 files changed, 123 insertions(+), 125 deletions(-)
diff --git a/templates/pkg/libbsd b/templates/pkg/libbsd @@ -5,8 +5,8 @@ #+{{pkg_install_name("libmd")}} {% endblock package_deps %} {% block configure -%} -{{- super() -}} export CFLAGS="$CFLAGS -std=gnu11" +{{- super() -}} {% endblock configure %} {% block genlinks_begin %} x["./{{libdir}}/libbsd.a"]=1 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.d8a406642d45197f91653f064c64108be59824a5ebca982a43400e410d1a6562 -#+pthbs-banginstall.f348c0bfc398656e003e71f7b212db0d7bf69a00e2b6c4716af9e83412555540 +#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c +#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 #@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.d8a406642d45197f91653f064c64108be59824a5ebca982a43400e410d1a6562 -#+pthbs-banginstall.f348c0bfc398656e003e71f7b212db0d7bf69a00e2b6c4716af9e83412555540 +#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c +#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 #@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.d8a406642d45197f91653f064c64108be59824a5ebca982a43400e410d1a6562 -#+pthbs-banginstall.f348c0bfc398656e003e71f7b212db0d7bf69a00e2b6c4716af9e83412555540 +#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c +#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 #+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.d8a406642d45197f91653f064c64108be59824a5ebca982a43400e410d1a6562 -#+confz.364610c74adb7c4b3a61fc4789415956b5307109c518d91c306baeb62342c9a0 -#+containers.cdd1b69ac960a3c5e5265fcfe7c86a9325e8ea91c351712d9071f03627fe170d +#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c +#+confz.ed00bd82d0116e96718de35e3acdd0a7f4fb5e2bec9a854bf7fa4c664eee931f +#+containers.9d562e1a7a89ab89d473050b80f1d2171063e242288727215c55a8eb95d8434b #+xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71 #+zstd.6784b50e1a6f437617df4f5e504acb4dcedfa6ea695d6f6f00b9b918458340c9 #+apk-tools.26dea3d4656b1c6ea2b40f4e5e448263725788f406996f46e33e7e801e6c14f7 #+alpine-keys.2627cf09b293e5aa76360cd858cdbe7493f766e90063b0db73368eddd7832398 #+getent.4fed010dd9b9ecd66109a04d4816b65dac83ccc7f08166145c278f3848488b65 -#+fileset.4637f0df12b53506f4b5ba20fb3d4a3d2a48ea8446247f7ac24422e35770512d +#+fileset.177bed923215d80bdfb02296364d86b0ed05e6d5000ad7ea5b3bc0797ae2e3b8 #+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.d8a406642d45197f91653f064c64108be59824a5ebca982a43400e410d1a6562 -#+pthbs-banginstall.f348c0bfc398656e003e71f7b212db0d7bf69a00e2b6c4716af9e83412555540 -#+aat.28c178b6a7d4753f535d8c650c859a510fbea62207523b3f0a7aeba56d2a39cd -#+confz.364610c74adb7c4b3a61fc4789415956b5307109c518d91c306baeb62342c9a0 -#+containers.cdd1b69ac960a3c5e5265fcfe7c86a9325e8ea91c351712d9071f03627fe170d -#+fileset.4637f0df12b53506f4b5ba20fb3d4a3d2a48ea8446247f7ac24422e35770512d -#+logincaps.2ae3ae35e6445443c76ee8b811bfa9615169e7d24ae703eb9a5f9b761fd0cff4 -#+snaprep.4f0c473293c221b778bc2be28053eb7bd89e621a984b6a6222947e6215c25ad2 +#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c +#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 +#+aat.73694c799614484785217e7f1710935f923d8f9da69eb110b1c1912475b9f96a +#+confz.ed00bd82d0116e96718de35e3acdd0a7f4fb5e2bec9a854bf7fa4c664eee931f +#+containers.9d562e1a7a89ab89d473050b80f1d2171063e242288727215c55a8eb95d8434b +#+fileset.177bed923215d80bdfb02296364d86b0ed05e6d5000ad7ea5b3bc0797ae2e3b8 +#+logincaps.18129489dd5cdf590f7e0c850b2d73e49a4fce33724c2fb52d75a9242b1d40cb +#+snaprep.e895e39669991fade58aa9b8428c0d19e147036bc60f9673ae8cc25fc60ad7f3 #+curl.2b4a1e3b47a33ba89abd7d14e594e8ba29f518d3421457c06154fbb1b40fc1c6 #+git.bdc1a8610da8a605b4a9f8bca567e9cfd56a0b7de1237279a995d5cc328e8986 #+xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71 @@ -79,7 +79,7 @@ #+libcap.1bf91aff7796a4e05d489c08b2e14523f6915af6f857dc9501622c3c3e2a5d12 #+applyuidgid-caps.d3aca8cbc71c7378e98957b903d18430a9edfc056b3c1566397cfb371a3c1c26 #+ccx-utils.d34c50f51608774953113953cb95a6288155fbca5d22b06b306469f9a26bc84f -#+user-env.199873647dd55124148d503931bcb1a0e4c39975b8b52741462a78cae214985e +#+user-env.0b9de1d5eddee0195254c6c5209d38cdc83a41088182b4eb28a39e2e71225d1c #+mlog.fa52523ab6e7641662db20e0b60ef8fe6d72b6565415096cd943eae6eddb93fd #+findutils.0e76b947c2f8211a4c6c8c114510e0d1c2c794131f772dab36e42d23b0402720 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c @@ -87,9 +87,9 @@ #+squashfs-tools.a2564e381e3e30b8f7c71af71a22f255bd1e3cbda8bf1187d9a4183c6100a01b #+mandoc.1bfad0ae04afa18e99c3a4239934e633bad4512123ffd4d269c8e14caf506c15 #+tinyssh.7d202f58107ebfc6935287dc91e8dae825c6c2ae84b47943110e819c7b76a5bc -#+system-config.ea467e2097225ae2c23f78ec48541ea5c816cbeb92d3aae676fc83e077e25d87 -#+system-config-rc.fe3f6367a776d2085e340440ef978ba94a5de431ca32ddf0cba2e09cac0b15af -#+system-config-scripts.be6811879aa370aa77d5dafb0e0a0491c0831e905d923291344b70d539ea4d9a -#+system-config-init.e7cd4da999892c1fcc6a7cdb890c3201ca4fec0bc2ec66c326709afce13f22de -#+system-config-zsh.5aa4b8b989d02c02273a716254df769735440e1a9001f85239a61c8a34dbfdbe +#+system-config.991d507b62066e8e15924aa9355797ac5f0055b1a2288161a336bec5e163cace +#+system-config-rc.2526e18b4e36f6e4f77c5aa10e61f0e05a4293469c3c846f2529d243384eef67 +#+system-config-scripts.0cbd30a12e7da759b9143bc08000620a5b816e2fc0e5270b3875d840ffc425fa +#+system-config-init.6c6611f0a28459d15c2f7be4fce729cc0cddebf13d911ab4feed33e19acfd24b +#+system-config-zsh.7cb535a771e3d5022514b2c495ca214f5a2528c06b9288360ed9e025b5b1af7e #+busybox.aaa04ed503361de2bc3be024ea4a9ba5284794bbbceae500df8b93a3d8b049d6 \ 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.d8a406642d45197f91653f064c64108be59824a5ebca982a43400e410d1a6562 -#+pthbs-banginstall.f348c0bfc398656e003e71f7b212db0d7bf69a00e2b6c4716af9e83412555540 +#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c +#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd @@ -85,11 +85,10 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libbsd-0.12.2' - +export CFLAGS="$CFLAGS -std=gnu11" build_env_static autotools_config_static -export CFLAGS="$CFLAGS -std=gnu11" make -j${JOBS:-1} -l$((1+${JOBS:-1})) 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.d8a406642d45197f91653f064c64108be59824a5ebca982a43400e410d1a6562 -#+pthbs-banginstall.f348c0bfc398656e003e71f7b212db0d7bf69a00e2b6c4716af9e83412555540 +#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c +#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 #+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.d8a406642d45197f91653f064c64108be59824a5ebca982a43400e410d1a6562 -#+pthbs-banginstall.f348c0bfc398656e003e71f7b212db0d7bf69a00e2b6c4716af9e83412555540 +#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c +#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 #@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.493b00d4d14ac20b9df52b656a1da22ed8e1dac5b4d2cf3f65c2b3b22b5b946c +#+mdev-scripts.e5d8019429caf12e807e3b3b70215b5586b50ae9acbf98e9e523010981f90a6f #+mdevd.bfe3896eca5a7ee6ffbdecb990f25360a2c8af15c76d2138ba898a54362637d6 #+busybox.aaa04ed503361de2bc3be024ea4a9ba5284794bbbceae500df8b93a3d8b049d6 \ 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.d8a406642d45197f91653f064c64108be59824a5ebca982a43400e410d1a6562 +#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c #@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.d8a406642d45197f91653f064c64108be59824a5ebca982a43400e410d1a6562 -#+pthbs-banginstall.f348c0bfc398656e003e71f7b212db0d7bf69a00e2b6c4716af9e83412555540 +#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c +#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 #@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.28c178b6a7d4753f535d8c650c859a510fbea62207523b3f0a7aeba56d2a39cd -#+fileset.4637f0df12b53506f4b5ba20fb3d4a3d2a48ea8446247f7ac24422e35770512d +#+aat.73694c799614484785217e7f1710935f923d8f9da69eb110b1c1912475b9f96a +#+fileset.177bed923215d80bdfb02296364d86b0ed05e6d5000ad7ea5b3bc0797ae2e3b8 #+rsync.1ed0dac4e36cecf9610798059231f0c482ef336c6cf490c6c78e052b006f3871 #+execline.40353eaff23067fb950e4814076f769ec877500bf0d6a1c78f55317b992a6b57 #+kbd.dc60bfa2da5e4ad82f84754a8b3c7aaae30e19221b7067b781ed62256bc1f590 @@ -56,10 +56,10 @@ #+s6-linux-utils.ee802c9d791b5dd387b43cdcc33ebd6097b5d3fab98ef9ba8afbbe6edc5de00a #+s6-rc.60bdf9c60ff07c507db53ce85860465ec10917b02d04e43e565a41c14abcf47a #+s6.ca0b089204ed030f146486ee302b50994dd14a8ed8d1ba5f2bb377af2c626d01 -#+zsh.d8a406642d45197f91653f064c64108be59824a5ebca982a43400e410d1a6562 +#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c #+libcgroup.e2f7accd1d8b79c1a2f118e047377c67f88892681e85d59c4b86c63b9911bf83 -#+system-config-scripts.be6811879aa370aa77d5dafb0e0a0491c0831e905d923291344b70d539ea4d9a -#+logincaps.2ae3ae35e6445443c76ee8b811bfa9615169e7d24ae703eb9a5f9b761fd0cff4 +#+system-config-scripts.0cbd30a12e7da759b9143bc08000620a5b816e2fc0e5270b3875d840ffc425fa +#+logincaps.18129489dd5cdf590f7e0c850b2d73e49a4fce33724c2fb52d75a9242b1d40cb #+busybox.aaa04ed503361de2bc3be024ea4a9ba5284794bbbceae500df8b93a3d8b049d6 #@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.d6f424c7914cdd134e79bfc805658e65cb73d10660a0fecb95dc8cf5da1bcf30' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.86a670553c8108e662c78ad8b837488893af76e336615c8f1bcc40ede79aee4c' \ + 'pthbs_path_containers=/home/ccx/versions/env.eee2c5c9053ec35bbf99f2dab8e7ad347bca7a2632c0f6f78a35933802106ab8' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.4a4084ce5a1008bece40ce4bb1ae2292c0ab5ec2aa89fcc4a45281d525a55440' \ 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.fe3f6367a776d2085e340440ef978ba94a5de431ca32ddf0cba2e09cac0b15af +#+system-config-rc.2526e18b4e36f6e4f77c5aa10e61f0e05a4293469c3c846f2529d243384eef67 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.fe3f6367a776d2085e340440ef978ba94a5de431ca32ddf0cba2e09cac0b15af/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.2526e18b4e36f6e4f77c5aa10e61f0e05a4293469c3c846f2529d243384eef67/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.4637f0df12b53506f4b5ba20fb3d4a3d2a48ea8446247f7ac24422e35770512d -#+system-config.ea467e2097225ae2c23f78ec48541ea5c816cbeb92d3aae676fc83e077e25d87 +#+fileset.177bed923215d80bdfb02296364d86b0ed05e6d5000ad7ea5b3bc0797ae2e3b8 +#+system-config.991d507b62066e8e15924aa9355797ac5f0055b1a2288161a336bec5e163cace # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.ea467e2097225ae2c23f78ec48541ea5c816cbeb92d3aae676fc83e077e25d87/config/s6-rc-source +src=/home/ccx/versions/system-config.991d507b62066e8e15924aa9355797ac5f0055b1a2288161a336bec5e163cace/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.d8a406642d45197f91653f064c64108be59824a5ebca982a43400e410d1a6562 -#+pthbs-banginstall.f348c0bfc398656e003e71f7b212db0d7bf69a00e2b6c4716af9e83412555540 +#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c +#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 #@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.d8a406642d45197f91653f064c64108be59824a5ebca982a43400e410d1a6562 +#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c #@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.f348c0bfc398656e003e71f7b212db0d7bf69a00e2b6c4716af9e83412555540 +#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 #@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.d8a406642d45197f91653f064c64108be59824a5ebca982a43400e410d1a6562 -#+pthbs-banginstall.f348c0bfc398656e003e71f7b212db0d7bf69a00e2b6c4716af9e83412555540 -#+aat.28c178b6a7d4753f535d8c650c859a510fbea62207523b3f0a7aeba56d2a39cd -#+confz.364610c74adb7c4b3a61fc4789415956b5307109c518d91c306baeb62342c9a0 -#+containers.cdd1b69ac960a3c5e5265fcfe7c86a9325e8ea91c351712d9071f03627fe170d -#+fileset.4637f0df12b53506f4b5ba20fb3d4a3d2a48ea8446247f7ac24422e35770512d -#+logincaps.2ae3ae35e6445443c76ee8b811bfa9615169e7d24ae703eb9a5f9b761fd0cff4 -#+snaprep.4f0c473293c221b778bc2be28053eb7bd89e621a984b6a6222947e6215c25ad2 +#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c +#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 +#+aat.73694c799614484785217e7f1710935f923d8f9da69eb110b1c1912475b9f96a +#+confz.ed00bd82d0116e96718de35e3acdd0a7f4fb5e2bec9a854bf7fa4c664eee931f +#+containers.9d562e1a7a89ab89d473050b80f1d2171063e242288727215c55a8eb95d8434b +#+fileset.177bed923215d80bdfb02296364d86b0ed05e6d5000ad7ea5b3bc0797ae2e3b8 +#+logincaps.18129489dd5cdf590f7e0c850b2d73e49a4fce33724c2fb52d75a9242b1d40cb +#+snaprep.e895e39669991fade58aa9b8428c0d19e147036bc60f9673ae8cc25fc60ad7f3 #+curl.2b4a1e3b47a33ba89abd7d14e594e8ba29f518d3421457c06154fbb1b40fc1c6 #+git.bdc1a8610da8a605b4a9f8bca567e9cfd56a0b7de1237279a995d5cc328e8986 #+xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71 @@ -79,7 +79,7 @@ #+libcap.1bf91aff7796a4e05d489c08b2e14523f6915af6f857dc9501622c3c3e2a5d12 #+applyuidgid-caps.d3aca8cbc71c7378e98957b903d18430a9edfc056b3c1566397cfb371a3c1c26 #+ccx-utils.d34c50f51608774953113953cb95a6288155fbca5d22b06b306469f9a26bc84f -#+user-env.199873647dd55124148d503931bcb1a0e4c39975b8b52741462a78cae214985e +#+user-env.0b9de1d5eddee0195254c6c5209d38cdc83a41088182b4eb28a39e2e71225d1c #+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.acf3ffba32354201b41af206f9d9c3969ec84c823ff26e77554d36ada420c68c +#+libbsd.1c020180273715240d28fd12f9277c2466f2ace8630606359522b2ce45bf1bb5 #@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.9086027a15e60af03fb82847a185b5a6549a89a51f9563707033983ff01f5ca8 -#+pthbs-banginstall.530776e30577f752302515f84113d8f9fd72538bfa76e851b92dedfda6eee33b +#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba +#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d #@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.9086027a15e60af03fb82847a185b5a6549a89a51f9563707033983ff01f5ca8 -#+pthbs-banginstall.530776e30577f752302515f84113d8f9fd72538bfa76e851b92dedfda6eee33b +#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba +#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d #@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.9086027a15e60af03fb82847a185b5a6549a89a51f9563707033983ff01f5ca8 -#+pthbs-banginstall.530776e30577f752302515f84113d8f9fd72538bfa76e851b92dedfda6eee33b +#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba +#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d #+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.9086027a15e60af03fb82847a185b5a6549a89a51f9563707033983ff01f5ca8 -#+confz.7bb5e76bb718c9c5ac97df21c8ee908c58dd4cfe30e4b9857cd29ff69540e026 -#+containers.a996f2bdddfbc2cc13c0b3d8619bcbe2c16e5eee531fbd654e249e113762e116 +#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba +#+confz.ece16f6e16b428ebf40b7fd3c948484297f8260f37c815bfa7b62de2b189c4ee +#+containers.9ef7a0f8e3b3fcb4295c382ec128145fdf4d87b0dbd0532d6d972df2132ebc33 #+xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989 #+zstd.c63a3cabacc7382111033c967c5e11509d80a53e85d1f82f5117c0994ee82058 #+apk-tools.e9e751ea7ddc425811423c10dd7b317f2a13001905424548febd956bc68a19d5 #+alpine-keys.91c778ab606f8627ec57ca0ac12fbc575b11be2c477052ab77a9cf8cb3534416 #+getent.4caaecf2abb7893d1b05b464d8b085ceec41e148787112dd626dcb04ef3b64b6 -#+fileset.40476ed19ad50970f5255db7f130944496c331bb439a64a0f6a24ec65415dc79 +#+fileset.e538ccf0f93b0cfdb7ca8126092625cabee0e73da442ac74ae8bb84bb043ff23 #+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.9086027a15e60af03fb82847a185b5a6549a89a51f9563707033983ff01f5ca8 -#+pthbs-banginstall.530776e30577f752302515f84113d8f9fd72538bfa76e851b92dedfda6eee33b -#+aat.3c089744972fc58b149fac85e9a8977750fc9af1726f28aa4296718492b78a4b -#+confz.7bb5e76bb718c9c5ac97df21c8ee908c58dd4cfe30e4b9857cd29ff69540e026 -#+containers.a996f2bdddfbc2cc13c0b3d8619bcbe2c16e5eee531fbd654e249e113762e116 -#+fileset.40476ed19ad50970f5255db7f130944496c331bb439a64a0f6a24ec65415dc79 -#+logincaps.6c07358dcc6ff8a3ae5570c5f24640abfbe52d29810487a856d33197c11406c4 -#+snaprep.4bbf67dfac4938c5728d2d666c6eb4fba7408cff2755ab736f1ebf01905b78ff +#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba +#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d +#+aat.041a141f6168b94565f7627ae689bd8f043e7978d808113b1cbaed02d7ed18ef +#+confz.ece16f6e16b428ebf40b7fd3c948484297f8260f37c815bfa7b62de2b189c4ee +#+containers.9ef7a0f8e3b3fcb4295c382ec128145fdf4d87b0dbd0532d6d972df2132ebc33 +#+fileset.e538ccf0f93b0cfdb7ca8126092625cabee0e73da442ac74ae8bb84bb043ff23 +#+logincaps.6d0e31d778ff4d5f016d6066ffeb4c3a8310e282cc26cd29d87039f97ac41fe3 +#+snaprep.9153a7b7f103c07141f09d75d64a3738457de8f358492f42170d6a75dba237d6 #+curl.7f5463b5de6d0e17b7b374ef28d43d8dffde44b7901feeba5a6f77e17b76fbed #+git.a611fbad4e4b588d14e616889a929fc76990a99272106cd3dd419b96a05224c9 #+xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989 @@ -79,7 +79,7 @@ #+libcap.a4535114c422033f37933f15758592c0e7a327a66ecee2cc445d9b565c07f2d6 #+applyuidgid-caps.65c2cf78a093f3c442f5f5f69e5b4f49f71bfb303ba93336f0b4913a2387e5c3 #+ccx-utils.76fa3451ead3ef0516d5b7cd5c7c82e33866553e42fedc7359563396beed4e19 -#+user-env.ca3efdcfbe38aa3270f486c2209a1fbdb18a287f2142ff15c7fc7e6e52606f0c +#+user-env.dbf3d531f8524ec45828172f3052cda5ef7ea0d2d33390642fc1bb63c034f5ec #+mlog.c6bb1056afeb97041aeba1f60e1b0574d21fa98407960995ff5448a4b5dee034 #+findutils.68dbe3ca65da5cbfad495bde6d8c8c997988357f5714b2d92a3b552fdf7c33a6 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e @@ -87,9 +87,9 @@ #+squashfs-tools.d9b4267c13e4ee7076d8897b9461a00ff7bc2aeb4a166fb28f8d38e46ba67a99 #+mandoc.421dfa1a68724de02d7e94d17a7c515db1908a6b9560f7bcfef9764e01eb9d5c #+tinyssh.ca9956fe0cef56dd575836a9f804bd66df875871ae08d63badb077429ebd240d -#+system-config.aa17a952242573c87e95bf3d345333dc48118bf804281dfac4628697b6ee8e71 -#+system-config-rc.81839b47f5941c7e40020c86852aaef52d9df784cf9b2705c882f2c6880be286 -#+system-config-scripts.3fefbfcbb34c1fdd3de57b95ead5636291607e037bf0352798e57d973259dd66 -#+system-config-init.064375a9efd84b1051fef22305edff5da6543e883ac56df7f2e9e4f93e8f7a6b -#+system-config-zsh.1c7994dab817a3ab0a05425f665a3f76d680c4f4858a7cbe5a4021e5ae14e16e +#+system-config.fcfcec66084af7d12eb2548580290f9073c0756ee93f5575637ff51bf49634df +#+system-config-rc.4fc682d6689901820ecd665f4de2b804db2a6d557445d31cabcd2a288d2816c0 +#+system-config-scripts.c51df775dc1d34cff68ce8033edf46defc89449ee3e644c3d168766dc48ff9eb +#+system-config-init.84c07495752362ddb92746adf3c66bd197fdc88708801f4be99668194f1c3781 +#+system-config-zsh.5d225c9252e87903df1d82c9d241e6237f34ac8764dbaaedd3aea58f03271b97 #+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.9086027a15e60af03fb82847a185b5a6549a89a51f9563707033983ff01f5ca8 -#+pthbs-banginstall.530776e30577f752302515f84113d8f9fd72538bfa76e851b92dedfda6eee33b +#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba +#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd @@ -85,11 +85,10 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libbsd-0.12.2' - +export CFLAGS="$CFLAGS -std=gnu11" build_env_static autotools_config_static -export CFLAGS="$CFLAGS -std=gnu11" make -j${JOBS:-1} -l$((1+${JOBS:-1})) 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.9086027a15e60af03fb82847a185b5a6549a89a51f9563707033983ff01f5ca8 -#+pthbs-banginstall.530776e30577f752302515f84113d8f9fd72538bfa76e851b92dedfda6eee33b +#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba +#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d #+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.9086027a15e60af03fb82847a185b5a6549a89a51f9563707033983ff01f5ca8 -#+pthbs-banginstall.530776e30577f752302515f84113d8f9fd72538bfa76e851b92dedfda6eee33b +#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba +#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d #@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.fd42e92783a01947de70d769f30148652b8dec08e48e88dd45e0badf847e5672 +#+mdev-scripts.4bbb6d930e350387fab2c0f442ca67f94228a79fcbdbbc64974b5fd89b620690 #+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.9086027a15e60af03fb82847a185b5a6549a89a51f9563707033983ff01f5ca8 +#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba #@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.9086027a15e60af03fb82847a185b5a6549a89a51f9563707033983ff01f5ca8 -#+pthbs-banginstall.530776e30577f752302515f84113d8f9fd72538bfa76e851b92dedfda6eee33b +#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba +#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d #@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.3c089744972fc58b149fac85e9a8977750fc9af1726f28aa4296718492b78a4b -#+fileset.40476ed19ad50970f5255db7f130944496c331bb439a64a0f6a24ec65415dc79 +#+aat.041a141f6168b94565f7627ae689bd8f043e7978d808113b1cbaed02d7ed18ef +#+fileset.e538ccf0f93b0cfdb7ca8126092625cabee0e73da442ac74ae8bb84bb043ff23 #+rsync.8d48498b69b6293ebd4e138fde14fa567ecb71d1e5681c5f0e79ea897e4f39ba #+execline.4ce0c41824f822a2121cd43043d321c827b23b2ccef5a3ef0150e9f147d7e90a #+kbd.6f11c0835495c6e93ed0a4d487f3ff4e320edd27c703a128d6bb2e2992a33bae @@ -56,10 +56,10 @@ #+s6-linux-utils.c905cda13791d3634af26d96e1616784a3eab93ee598af58b0f6baf26c5a9f18 #+s6-rc.3c6bebbe7fcf84c87fba0319c4868aba211f2f771d2ab34489c3264f8e157703 #+s6.96c8519cb2a37864d6aa1e18fa138d5789be61ceb96429f1beece1a1c945afc7 -#+zsh.9086027a15e60af03fb82847a185b5a6549a89a51f9563707033983ff01f5ca8 +#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba #+libcgroup.212438b617126996f9a2547758ba3e504ad3dfe9528c4acad120c7d347c928e4 -#+system-config-scripts.3fefbfcbb34c1fdd3de57b95ead5636291607e037bf0352798e57d973259dd66 -#+logincaps.6c07358dcc6ff8a3ae5570c5f24640abfbe52d29810487a856d33197c11406c4 +#+system-config-scripts.c51df775dc1d34cff68ce8033edf46defc89449ee3e644c3d168766dc48ff9eb +#+logincaps.6d0e31d778ff4d5f016d6066ffeb4c3a8310e282cc26cd29d87039f97ac41fe3 #+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.bc02876efe6922b1968fad9d65b4954d22c2dc7753361ed2fa9b82e6d51bf94a' \ - 'pthbs_path_mdevd=/versions/env.e22419a0b3db08f1bb78935238201926fb3c68b7f78ffa8e2a49b9da0941fdd5' \ + 'pthbs_path_containers=/versions/env.29ac5872971095da4d4bcadf15d68b16e54fe1fb271ff18fefd2c6094d75fde1' \ + 'pthbs_path_mdevd=/versions/env.07c8e78ad0ced161c8fd50de2051531881366a70aae1358498951acfb45b85fc' \ 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.81839b47f5941c7e40020c86852aaef52d9df784cf9b2705c882f2c6880be286 +#+system-config-rc.4fc682d6689901820ecd665f4de2b804db2a6d557445d31cabcd2a288d2816c0 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.81839b47f5941c7e40020c86852aaef52d9df784cf9b2705c882f2c6880be286/config/s6-rc-db +s6rcdb=/versions/system-config-rc.4fc682d6689901820ecd665f4de2b804db2a6d557445d31cabcd2a288d2816c0/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.40476ed19ad50970f5255db7f130944496c331bb439a64a0f6a24ec65415dc79 -#+system-config.aa17a952242573c87e95bf3d345333dc48118bf804281dfac4628697b6ee8e71 +#+fileset.e538ccf0f93b0cfdb7ca8126092625cabee0e73da442ac74ae8bb84bb043ff23 +#+system-config.fcfcec66084af7d12eb2548580290f9073c0756ee93f5575637ff51bf49634df # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.aa17a952242573c87e95bf3d345333dc48118bf804281dfac4628697b6ee8e71/config/s6-rc-source +src=/versions/system-config.fcfcec66084af7d12eb2548580290f9073c0756ee93f5575637ff51bf49634df/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.9086027a15e60af03fb82847a185b5a6549a89a51f9563707033983ff01f5ca8 -#+pthbs-banginstall.530776e30577f752302515f84113d8f9fd72538bfa76e851b92dedfda6eee33b +#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba +#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d #@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.9086027a15e60af03fb82847a185b5a6549a89a51f9563707033983ff01f5ca8 +#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba #@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.530776e30577f752302515f84113d8f9fd72538bfa76e851b92dedfda6eee33b +#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d #@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.9086027a15e60af03fb82847a185b5a6549a89a51f9563707033983ff01f5ca8 -#+pthbs-banginstall.530776e30577f752302515f84113d8f9fd72538bfa76e851b92dedfda6eee33b -#+aat.3c089744972fc58b149fac85e9a8977750fc9af1726f28aa4296718492b78a4b -#+confz.7bb5e76bb718c9c5ac97df21c8ee908c58dd4cfe30e4b9857cd29ff69540e026 -#+containers.a996f2bdddfbc2cc13c0b3d8619bcbe2c16e5eee531fbd654e249e113762e116 -#+fileset.40476ed19ad50970f5255db7f130944496c331bb439a64a0f6a24ec65415dc79 -#+logincaps.6c07358dcc6ff8a3ae5570c5f24640abfbe52d29810487a856d33197c11406c4 -#+snaprep.4bbf67dfac4938c5728d2d666c6eb4fba7408cff2755ab736f1ebf01905b78ff +#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba +#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d +#+aat.041a141f6168b94565f7627ae689bd8f043e7978d808113b1cbaed02d7ed18ef +#+confz.ece16f6e16b428ebf40b7fd3c948484297f8260f37c815bfa7b62de2b189c4ee +#+containers.9ef7a0f8e3b3fcb4295c382ec128145fdf4d87b0dbd0532d6d972df2132ebc33 +#+fileset.e538ccf0f93b0cfdb7ca8126092625cabee0e73da442ac74ae8bb84bb043ff23 +#+logincaps.6d0e31d778ff4d5f016d6066ffeb4c3a8310e282cc26cd29d87039f97ac41fe3 +#+snaprep.9153a7b7f103c07141f09d75d64a3738457de8f358492f42170d6a75dba237d6 #+curl.7f5463b5de6d0e17b7b374ef28d43d8dffde44b7901feeba5a6f77e17b76fbed #+git.a611fbad4e4b588d14e616889a929fc76990a99272106cd3dd419b96a05224c9 #+xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989 @@ -79,7 +79,7 @@ #+libcap.a4535114c422033f37933f15758592c0e7a327a66ecee2cc445d9b565c07f2d6 #+applyuidgid-caps.65c2cf78a093f3c442f5f5f69e5b4f49f71bfb303ba93336f0b4913a2387e5c3 #+ccx-utils.76fa3451ead3ef0516d5b7cd5c7c82e33866553e42fedc7359563396beed4e19 -#+user-env.ca3efdcfbe38aa3270f486c2209a1fbdb18a287f2142ff15c7fc7e6e52606f0c +#+user-env.dbf3d531f8524ec45828172f3052cda5ef7ea0d2d33390642fc1bb63c034f5ec #+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.ac88c21b992cb63c6ea57221ae542ffa52f2412ffd3fdbdd3073f042f3204b92 +#+libbsd.f43a48263fb3a0b5b3dec4b7ca40401ef561191747a4814c1cd73c029445b585 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.