commit acb96051e52ddd1f1d14dbe405601f8953b835a5 parent 0bc10151df933ac80658b123a7e18a249a3441bc Author: Jan Pobrislo <ccx@te2000.cz> Date: Fri, 12 Dec 2025 02:52:33 +0000 install bsd compat headers before libbsd Diffstat:
45 files changed, 357 insertions(+), 120 deletions(-)
diff --git a/filelist.sha256 b/filelist.sha256 @@ -30,6 +30,7 @@ cf378a58f842c7a06997afc04d614912f2f8068d8a8f74ca4ec636bdf1adeba9 files/busybox. 13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a files/busybox_bootstrap.config-8d7ae80eda7e ccb459010923e1a9b49cb39d45bc93d0fc8749acea6efd7b19cfb00e76a5562e files/busybox_modutils.config a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540 files/c_rehash.c +15b1dd86710a4c5fc0654dbd871965b227474eb7f54531eebafffe8c1061f10e files/cdefs.h 064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7 files/certdata2pem.c 75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3 files/config.sub b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5 files/default-policy.easyseccomp @@ -96,6 +97,7 @@ e91027b085cc83c7724fd6b624641a74256288b16e9f48a37d3ceeab6e498f3f files/nawk-202 98a8ddd1004034aeff4cc6d18e5df23f55d2869d879735c3b571594a44ba1212 files/nlist.h ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417 files/noobjtool.patch 577cbaf04486ebc113d1c0b9dabd9a8eb29506dbfbdb5824d1e0601df4262715 files/pthbs-banginstall +c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b files/queue.h 627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e files/s6_clone3_newpid.patch 2a782825cd870e1fdf77a579c80701c0530bc6d8fa94100cab24bf31f0f457d3 files/s6_clone_newpid.patch c7d3e7ef077d7673567d2f0c34ba2ebd689dab1250286ab482a3064c73ff7d7c files/s6_clone_newpid.patch.old @@ -103,6 +105,7 @@ c7d3e7ef077d7673567d2f0c34ba2ebd689dab1250286ab482a3064c73ff7d7c files/s6_clone df0c24312e4941b1035a6292504fbf569f0f8b81b083835d7df84586decef25c files/sandbox-rootns-python.in b3102e75103977f72729fed6a3123b5140e815b7d966fd4fb41367257b17eda6 files/sandbox-rootns.in 37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4 files/strace-6.5-static.patch +e0ea17940260f9c1fdd2d35f74eec141d21f09844eaea91131993cb950901a16 files/tree.h 07c3c30dab68c905d5608124e729592a30b2c087f24e7b76940f5321786128b1 files/update-links 664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df files/user-env 68140a82582ede938159630bca0fb13a93b4bf1cb2e85b08943c26242cf8f3a6 files/zpipe.c diff --git a/templates/pkg/bsd-compat-headers b/templates/pkg/bsd-compat-headers @@ -0,0 +1,15 @@ +{% extends "genlinks_mini" %} +{% block package_deps -%} +#@sha256:{{files["cdefs.h"]}}:cdefs.h +#@sha256:{{files["queue.h"]}}:queue.h +#@sha256:{{files["tree.h"]}}:tree.h +{% endblock package_deps %} +{% block build_and_install -%} +mkdir -p "$dest"/{{includedir|shesc}} +install -Dm644 -t "$dest"/{{includedir|shesc}}/sys ./*.h +{% endblock build_and_install %} +{% block genlinks_begin %} + x["./{{includedir}}/sys/cdefs.h"]=1 + x["./{{includedir}}/sys/queue.h"]=1 + x["./{{includedir}}/sys/tree.h"]=1 +{% endblock %} diff --git a/templates/pkg/libbsd b/templates/pkg/libbsd @@ -3,6 +3,7 @@ {% extends "autotools_static_mini" %} {% block package_deps -%} #+{{pkg_install_name("libmd")}} +#+{{pkg_install_name("bsd-compat-headers")}} {% endblock package_deps %} {% block configure -%} export CFLAGS="$CFLAGS -std=gnu11" 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.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c -#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 +#+zsh.db2b9d6a744e9af385b48f7ceaa5eaf53ed0f10a7ad64cdbd8ac0ccc1a32d096 +#+pthbs-banginstall.ab0420129a34f126820604844b18065ecdbd0b21cc93297436a922d61e73221a #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/ccx-x86_64/bsd-compat-headers b/variants/ccx-x86_64/bsd-compat-headers @@ -0,0 +1,108 @@ +#!/usr/bin/env pthbs-build +#+busybox.c339e2d3ed5dfd8dd3cd95a46ecf12cbaa4812a60ddf451a7910d8a16a6f127a +#+busybox-bzip2.d26a1b26f55aa0f594124b5d4415aafa199f98d5eec15e0b0ccdd571298de8a5 +#+busybox-gzip.539e14c0c938472f0c1dc2d87f2aafce523e89548d01e21df3e98c05c9e57f85 +#+busybox-lzop.1e0272b51b5f1a3ac4e329da80a7095aa16a8d7454dcdc59cec722a7580afda4 +#+busybox-unzip.67354291667f009f88397ecb250f04e1361d078ba4759b47a537803a3ddf7f3f +#+busybox-xz.471e920f5a04b0fa3aa4b4852ab6c42854a229f371e3a6909183822057d6ac93 +#+busybox-cpio.b157187112b4de343d4839bde1444dc79b45f0c89e81dd010143f6b17ad45eba +#+busybox-dpkg.f2a02ec948d6e6223ac164a9f8db170e0f5e4da08a53a8d08b042479661806ee +#+busybox-rpm.2cf908ebecfd4249e76b74e872f4224b5014420269db4fe4590abdf47f27bf74 +#+busybox-tar.595c980dcc9d71be04c6e4f780a7809e1f24ae78722085767856e5f61bc2d364 +#+busybox-ed.94c3b0ec93dc97db2f96d004e9bd390b58b29445b646198fc1381f13a63f6d51 +#+busybox-sed.d5bffe347d03cbaef656b84866d925a5a440c5de4119486593c1e2596c88d30f +#+busybox-vi.1be0b6ef361b2a4ec8e948566f93e9412b8a58af64293da80b2a3f01b8d32237 +#+busybox-xxd.f04912456f9f939b9a549523b89f4597eb16c2307f372189ea2a79386e5a0862 +#+busybox-process-extra.985f1e4ea833cd714a0d374d41c84f0ba95f1588061788d4fceb41a9deaa5344 +#+busybox-procps.3f0b62897b3544a7703d9dc23d9f8241ad4f09c2433d0b941ac9c5a2bac04dec +#+busybox-psmisc.ebf392c31178004204ee8df2312425020908f521939eeab10d288812d77dc230 +#+busybox-ash.f6aa4bb20084e508fe0a6a7c69c58016240ac267a7622ab21de2fdc16f4e24e5 +#+busybox-bc.8b48053390600bc82d8e1b2b188586ca2cb9c7d5be9f45b59d3b17ad96394ca4 +#+busybox-coreutils.972a7643183ced325da5ba6a141a92ecf7edf7999817c91c6b417131f64cc7d3 +#+busybox-coreutils-extra.8b666b105d912e10af40c3fbdd3c8041198574301889a8a07ffcfd39ea2436eb +#+busybox-daemontools.0d91efcfadb955bbf7cf7da02ffd324ef7f37cf50a958f01e65a50e9a6950289 +#+busybox-grep.80af36e93532d67b2da5f5e6b720acf23a70032a7761367e99e12877bb6f8131 +#+busybox-misc.e19ea9a904450d7203a3d2d84377dc15af5e30a64a5258433affb1d987a7bb9b +#+busybox-sh.38abbae31993720bb870db02bb69fe181a04efc0c2c9a0fb425d4e6d88e13c32 +#+busybox-util-linux-unpriv.d81c93988d8c937f6db60683c693ca3d73916a305223d00a48eb22ca87e65f0e +#+busybox-findutils.84cb8f604afa8735044097ee5d6200c4782093e06873cd36227c9342d30828b2 +#+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c +#@sha256:15b1dd86710a4c5fc0654dbd871965b227474eb7f54531eebafffe8c1061f10e:cdefs.h +#@sha256:c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b:queue.h +#@sha256:e0ea17940260f9c1fdd2d35f74eec141d21f09844eaea91131993cb950901a16:tree.h + + +# - build script start - + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'bsd-compat-headers' + + +mkdir -p "$dest"/'include' +install -Dm644 -t "$dest"/'include'/sys ./*.h + + + +cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./include/sys/cdefs.h"]=1 + x["./include/sys/queue.h"]=1 + x["./include/sys/tree.h"]=1 +} + +function r1(s) { + sub("^[.]/[^/]*", ".", s) + return s +} +function s1(repl, s) { + sub("^[.]/[^/]*", "./"repl, s) + return s +} +function link(src) { + x[$0]=0 + printf "%s\t%s\n", $0, src + printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr" +} +$1!="."{exit 1} +$2 == "env" { link($0); next } +$2 == ".env-template" { link($0); next } + +$2 == "command" { link($0); next } +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } +$2 == "sbin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 == "info" { link(s1("info", r1($0))); next } +$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next } +$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next } + +$2 == "config" { link($0); next } +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "data" { link($0); next } +$2 == "include" { link($0); next } + + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + retcode = 0 + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + retcode = 3 + } + } + exit retcode +}' >.install-links.new +mv .install-links.new .install-links + 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.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c -#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 +#+zsh.db2b9d6a744e9af385b48f7ceaa5eaf53ed0f10a7ad64cdbd8ac0ccc1a32d096 +#+pthbs-banginstall.ab0420129a34f126820604844b18065ecdbd0b21cc93297436a922d61e73221a #@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.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c -#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 +#+zsh.db2b9d6a744e9af385b48f7ceaa5eaf53ed0f10a7ad64cdbd8ac0ccc1a32d096 +#+pthbs-banginstall.ab0420129a34f126820604844b18065ecdbd0b21cc93297436a922d61e73221a #+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.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c -#+confz.ed00bd82d0116e96718de35e3acdd0a7f4fb5e2bec9a854bf7fa4c664eee931f -#+containers.9d562e1a7a89ab89d473050b80f1d2171063e242288727215c55a8eb95d8434b +#+zsh.db2b9d6a744e9af385b48f7ceaa5eaf53ed0f10a7ad64cdbd8ac0ccc1a32d096 +#+confz.a1679cbed816e9c8e4c74fcae22bff9f7fb8bd0d334c1aa75ffb9e2906f649d4 +#+containers.96617c14f70678e42f5b768784acf0f915ce07d390705968b75f7ea9fe35bc29 #+xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71 #+zstd.6784b50e1a6f437617df4f5e504acb4dcedfa6ea695d6f6f00b9b918458340c9 #+apk-tools.26dea3d4656b1c6ea2b40f4e5e448263725788f406996f46e33e7e801e6c14f7 #+alpine-keys.2627cf09b293e5aa76360cd858cdbe7493f766e90063b0db73368eddd7832398 #+getent.4fed010dd9b9ecd66109a04d4816b65dac83ccc7f08166145c278f3848488b65 -#+fileset.177bed923215d80bdfb02296364d86b0ed05e6d5000ad7ea5b3bc0797ae2e3b8 +#+fileset.93e2a71cc83e52b657431c0a48b63a33e10eb4ec90db885c66f4361a4b66a3e6 #+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.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c -#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 -#+aat.73694c799614484785217e7f1710935f923d8f9da69eb110b1c1912475b9f96a -#+confz.ed00bd82d0116e96718de35e3acdd0a7f4fb5e2bec9a854bf7fa4c664eee931f -#+containers.9d562e1a7a89ab89d473050b80f1d2171063e242288727215c55a8eb95d8434b -#+fileset.177bed923215d80bdfb02296364d86b0ed05e6d5000ad7ea5b3bc0797ae2e3b8 -#+logincaps.18129489dd5cdf590f7e0c850b2d73e49a4fce33724c2fb52d75a9242b1d40cb -#+snaprep.e895e39669991fade58aa9b8428c0d19e147036bc60f9673ae8cc25fc60ad7f3 +#+zsh.db2b9d6a744e9af385b48f7ceaa5eaf53ed0f10a7ad64cdbd8ac0ccc1a32d096 +#+pthbs-banginstall.ab0420129a34f126820604844b18065ecdbd0b21cc93297436a922d61e73221a +#+aat.221a90640cf52571f111fcbcc3fc7a07bed02006f110edb64fd8fc57c082b6a0 +#+confz.a1679cbed816e9c8e4c74fcae22bff9f7fb8bd0d334c1aa75ffb9e2906f649d4 +#+containers.96617c14f70678e42f5b768784acf0f915ce07d390705968b75f7ea9fe35bc29 +#+fileset.93e2a71cc83e52b657431c0a48b63a33e10eb4ec90db885c66f4361a4b66a3e6 +#+logincaps.054efbcd981235af093e07dc720bc73363fe1630eb887aa7d94521cb5415f129 +#+snaprep.0397e7c9f42e831f1c9cf726e2ebb30df0f6700652efd88206ef2a19741dba6b #+curl.2b4a1e3b47a33ba89abd7d14e594e8ba29f518d3421457c06154fbb1b40fc1c6 #+git.bdc1a8610da8a605b4a9f8bca567e9cfd56a0b7de1237279a995d5cc328e8986 #+xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71 @@ -79,7 +79,7 @@ #+libcap.1bf91aff7796a4e05d489c08b2e14523f6915af6f857dc9501622c3c3e2a5d12 #+applyuidgid-caps.d3aca8cbc71c7378e98957b903d18430a9edfc056b3c1566397cfb371a3c1c26 #+ccx-utils.d34c50f51608774953113953cb95a6288155fbca5d22b06b306469f9a26bc84f -#+user-env.0b9de1d5eddee0195254c6c5209d38cdc83a41088182b4eb28a39e2e71225d1c +#+user-env.0610c1e8cc2767b9c3d68443616d85af3b2cc6f0581d99da8accb80c14e7e9e7 #+mlog.fa52523ab6e7641662db20e0b60ef8fe6d72b6565415096cd943eae6eddb93fd #+findutils.0e76b947c2f8211a4c6c8c114510e0d1c2c794131f772dab36e42d23b0402720 #+nawk.ccb5a46d65ec3786f5a8115a0b82a75948d61505414855bd820bd4a07228039c @@ -87,9 +87,9 @@ #+squashfs-tools.a2564e381e3e30b8f7c71af71a22f255bd1e3cbda8bf1187d9a4183c6100a01b #+mandoc.1bfad0ae04afa18e99c3a4239934e633bad4512123ffd4d269c8e14caf506c15 #+tinyssh.7d202f58107ebfc6935287dc91e8dae825c6c2ae84b47943110e819c7b76a5bc -#+system-config.991d507b62066e8e15924aa9355797ac5f0055b1a2288161a336bec5e163cace -#+system-config-rc.2526e18b4e36f6e4f77c5aa10e61f0e05a4293469c3c846f2529d243384eef67 -#+system-config-scripts.0cbd30a12e7da759b9143bc08000620a5b816e2fc0e5270b3875d840ffc425fa -#+system-config-init.6c6611f0a28459d15c2f7be4fce729cc0cddebf13d911ab4feed33e19acfd24b -#+system-config-zsh.7cb535a771e3d5022514b2c495ca214f5a2528c06b9288360ed9e025b5b1af7e +#+system-config.404af0d391e1c20c2e32b24f5562e6118664e4bd20175ac0b637008a7600269f +#+system-config-rc.45c8799bf341b54d209c14e412527e2ad4fcdb5e5b435b07c049b45be5f6ce81 +#+system-config-scripts.8efbcdcba57240ff250012c9d287599745f09c92e27b52366717aa8564605585 +#+system-config-init.1e73efe587e298795a99d7420de43901dc7648a5775892fdc9e034c52ebc3ccc +#+system-config-zsh.efaa58d26a4b7fd00fd5aba1b267a5cee0efd02d32a5d9b2d39176cf85dec198 #+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.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c -#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 +#+zsh.db2b9d6a744e9af385b48f7ceaa5eaf53ed0f10a7ad64cdbd8ac0ccc1a32d096 +#+pthbs-banginstall.ab0420129a34f126820604844b18065ecdbd0b21cc93297436a922d61e73221a #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd @@ -32,6 +32,7 @@ #+gnu-make.79469751f2eeb20191719e2153d420f23dba0ddf95f816410a407517bdefb36c #+m4.bae57a2eab833d3fe860930ee498c1643ac11cd10b062b2c1b2a167c12133e68 #+libmd.75b243b0b9c27b226d357cc8669082c9bdcab194e5470c93b26326899de00366 +#+bsd-compat-headers.6d1ba213c83998f4bdc2b8eb04c0cc76bbd35ad28e5e4cd7e7d6dce2ffe84f6c #@untar:-J:sha256:b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014:. 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.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c -#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 +#+zsh.db2b9d6a744e9af385b48f7ceaa5eaf53ed0f10a7ad64cdbd8ac0ccc1a32d096 +#+pthbs-banginstall.ab0420129a34f126820604844b18065ecdbd0b21cc93297436a922d61e73221a #+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.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c -#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 +#+zsh.db2b9d6a744e9af385b48f7ceaa5eaf53ed0f10a7ad64cdbd8ac0ccc1a32d096 +#+pthbs-banginstall.ab0420129a34f126820604844b18065ecdbd0b21cc93297436a922d61e73221a #@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.e5d8019429caf12e807e3b3b70215b5586b50ae9acbf98e9e523010981f90a6f +#+mdev-scripts.19ddc15ff1ff2282898e3571f86ebd2b4cda079acf41dae7e2bd8b542fdc1b28 #+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.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c +#+zsh.db2b9d6a744e9af385b48f7ceaa5eaf53ed0f10a7ad64cdbd8ac0ccc1a32d096 #@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.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c -#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 +#+zsh.db2b9d6a744e9af385b48f7ceaa5eaf53ed0f10a7ad64cdbd8ac0ccc1a32d096 +#+pthbs-banginstall.ab0420129a34f126820604844b18065ecdbd0b21cc93297436a922d61e73221a #@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.73694c799614484785217e7f1710935f923d8f9da69eb110b1c1912475b9f96a -#+fileset.177bed923215d80bdfb02296364d86b0ed05e6d5000ad7ea5b3bc0797ae2e3b8 +#+aat.221a90640cf52571f111fcbcc3fc7a07bed02006f110edb64fd8fc57c082b6a0 +#+fileset.93e2a71cc83e52b657431c0a48b63a33e10eb4ec90db885c66f4361a4b66a3e6 #+rsync.1ed0dac4e36cecf9610798059231f0c482ef336c6cf490c6c78e052b006f3871 #+execline.40353eaff23067fb950e4814076f769ec877500bf0d6a1c78f55317b992a6b57 #+kbd.dc60bfa2da5e4ad82f84754a8b3c7aaae30e19221b7067b781ed62256bc1f590 @@ -56,10 +56,10 @@ #+s6-linux-utils.ee802c9d791b5dd387b43cdcc33ebd6097b5d3fab98ef9ba8afbbe6edc5de00a #+s6-rc.60bdf9c60ff07c507db53ce85860465ec10917b02d04e43e565a41c14abcf47a #+s6.ca0b089204ed030f146486ee302b50994dd14a8ed8d1ba5f2bb377af2c626d01 -#+zsh.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c +#+zsh.db2b9d6a744e9af385b48f7ceaa5eaf53ed0f10a7ad64cdbd8ac0ccc1a32d096 #+libcgroup.e2f7accd1d8b79c1a2f118e047377c67f88892681e85d59c4b86c63b9911bf83 -#+system-config-scripts.0cbd30a12e7da759b9143bc08000620a5b816e2fc0e5270b3875d840ffc425fa -#+logincaps.18129489dd5cdf590f7e0c850b2d73e49a4fce33724c2fb52d75a9242b1d40cb +#+system-config-scripts.8efbcdcba57240ff250012c9d287599745f09c92e27b52366717aa8564605585 +#+logincaps.054efbcd981235af093e07dc720bc73363fe1630eb887aa7d94521cb5415f129 #+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.eee2c5c9053ec35bbf99f2dab8e7ad347bca7a2632c0f6f78a35933802106ab8' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.4a4084ce5a1008bece40ce4bb1ae2292c0ab5ec2aa89fcc4a45281d525a55440' \ + 'pthbs_path_containers=/home/ccx/versions/env.19327094d4ceaa542bddcbf523a11371b63c118303072f71e6256c3e4b3f81a2' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.5d84ee4a15958da22e264a3f8f1dcabd3fc585d0ed04c0dff859b24c3114331c' \ 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.2526e18b4e36f6e4f77c5aa10e61f0e05a4293469c3c846f2529d243384eef67 +#+system-config-rc.45c8799bf341b54d209c14e412527e2ad4fcdb5e5b435b07c049b45be5f6ce81 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.2526e18b4e36f6e4f77c5aa10e61f0e05a4293469c3c846f2529d243384eef67/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.45c8799bf341b54d209c14e412527e2ad4fcdb5e5b435b07c049b45be5f6ce81/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.177bed923215d80bdfb02296364d86b0ed05e6d5000ad7ea5b3bc0797ae2e3b8 -#+system-config.991d507b62066e8e15924aa9355797ac5f0055b1a2288161a336bec5e163cace +#+fileset.93e2a71cc83e52b657431c0a48b63a33e10eb4ec90db885c66f4361a4b66a3e6 +#+system-config.404af0d391e1c20c2e32b24f5562e6118664e4bd20175ac0b637008a7600269f # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.991d507b62066e8e15924aa9355797ac5f0055b1a2288161a336bec5e163cace/config/s6-rc-source +src=/home/ccx/versions/system-config.404af0d391e1c20c2e32b24f5562e6118664e4bd20175ac0b637008a7600269f/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.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c -#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 +#+zsh.db2b9d6a744e9af385b48f7ceaa5eaf53ed0f10a7ad64cdbd8ac0ccc1a32d096 +#+pthbs-banginstall.ab0420129a34f126820604844b18065ecdbd0b21cc93297436a922d61e73221a #@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.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c +#+zsh.db2b9d6a744e9af385b48f7ceaa5eaf53ed0f10a7ad64cdbd8ac0ccc1a32d096 #@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.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 +#+pthbs-banginstall.ab0420129a34f126820604844b18065ecdbd0b21cc93297436a922d61e73221a #@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.793a27b7d888b54e4276c0ef3bb809a98bbf8f12aa04adfd27bace447633010c -#+pthbs-banginstall.3ffe05c81f4a69dda551e374443ef25cbe48b86e397fbe6237f0e59e7e3dcb62 -#+aat.73694c799614484785217e7f1710935f923d8f9da69eb110b1c1912475b9f96a -#+confz.ed00bd82d0116e96718de35e3acdd0a7f4fb5e2bec9a854bf7fa4c664eee931f -#+containers.9d562e1a7a89ab89d473050b80f1d2171063e242288727215c55a8eb95d8434b -#+fileset.177bed923215d80bdfb02296364d86b0ed05e6d5000ad7ea5b3bc0797ae2e3b8 -#+logincaps.18129489dd5cdf590f7e0c850b2d73e49a4fce33724c2fb52d75a9242b1d40cb -#+snaprep.e895e39669991fade58aa9b8428c0d19e147036bc60f9673ae8cc25fc60ad7f3 +#+zsh.db2b9d6a744e9af385b48f7ceaa5eaf53ed0f10a7ad64cdbd8ac0ccc1a32d096 +#+pthbs-banginstall.ab0420129a34f126820604844b18065ecdbd0b21cc93297436a922d61e73221a +#+aat.221a90640cf52571f111fcbcc3fc7a07bed02006f110edb64fd8fc57c082b6a0 +#+confz.a1679cbed816e9c8e4c74fcae22bff9f7fb8bd0d334c1aa75ffb9e2906f649d4 +#+containers.96617c14f70678e42f5b768784acf0f915ce07d390705968b75f7ea9fe35bc29 +#+fileset.93e2a71cc83e52b657431c0a48b63a33e10eb4ec90db885c66f4361a4b66a3e6 +#+logincaps.054efbcd981235af093e07dc720bc73363fe1630eb887aa7d94521cb5415f129 +#+snaprep.0397e7c9f42e831f1c9cf726e2ebb30df0f6700652efd88206ef2a19741dba6b #+curl.2b4a1e3b47a33ba89abd7d14e594e8ba29f518d3421457c06154fbb1b40fc1c6 #+git.bdc1a8610da8a605b4a9f8bca567e9cfd56a0b7de1237279a995d5cc328e8986 #+xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71 @@ -79,7 +79,7 @@ #+libcap.1bf91aff7796a4e05d489c08b2e14523f6915af6f857dc9501622c3c3e2a5d12 #+applyuidgid-caps.d3aca8cbc71c7378e98957b903d18430a9edfc056b3c1566397cfb371a3c1c26 #+ccx-utils.d34c50f51608774953113953cb95a6288155fbca5d22b06b306469f9a26bc84f -#+user-env.0b9de1d5eddee0195254c6c5209d38cdc83a41088182b4eb28a39e2e71225d1c +#+user-env.0610c1e8cc2767b9c3d68443616d85af3b2cc6f0581d99da8accb80c14e7e9e7 #+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.1c020180273715240d28fd12f9277c2466f2ace8630606359522b2ce45bf1bb5 +#+libbsd.5543eaf438a3623164e21bf71bde8970fcca0a8d1dce18423ab22d73c480a4d0 #@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.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba -#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d +#+zsh.ad2c426a0d2aa99c859496cae60c002f60bc1c4038f52ceaf7200bf09dc1579c +#+pthbs-banginstall.d86bac810cb85cab0fe1157d8b44b33ce1c5f2000de05d506b5fa28f4153babf #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/root-x86_64/bsd-compat-headers b/variants/root-x86_64/bsd-compat-headers @@ -0,0 +1,108 @@ +#!/usr/bin/env pthbs-build +#+busybox.80a26827b28323365d856fbfa6be8909b6363b30f5c759ac027750f3f8bdd75b +#+busybox-bzip2.a9180be56c727c8506a48bbbd0d9d5f26db1b5ee3782422c0c4bfe9cf39452ac +#+busybox-gzip.94e232530dcbaf0e9979e67dfe1ed16fd8cb73537db0b9e460b639388265eb5f +#+busybox-lzop.33a6b25f80604982c5d2609a5c86f0917454a1558a6fa50c079e323396fbcd32 +#+busybox-unzip.9e4eee8c4485be97591ecf632adbe8e87e5b5abdd9cae811a5fa4af6d5963fef +#+busybox-xz.d18832af1b02ec6abfd8f24bab5e12585a28ee865878c0eb5b9875a5599f51e3 +#+busybox-cpio.0545c211551a65793502ba8a6ce6f554d05ab2a7721be27118cad93866408959 +#+busybox-dpkg.e81b9225d2880471b45aa946b596d29f9d4814a87cea940ead1a78fa47c5f64f +#+busybox-rpm.379448f21bcd4d501dbc481611d72143221e98ae337ec6797bdf8be11210a889 +#+busybox-tar.b69c8703bc6cd9cbd9c36e119b8a971271f5aa7f927f55f056ea597c4d1bb764 +#+busybox-ed.7303bf75b95cecf00ec4a82bcbb2f8fb314a4fa92733dc2ca16038c8d4b2e2ff +#+busybox-sed.405693b65a76692eb4ec286b272c8e7007d5da9bfc299c7fd10a25ee25b80175 +#+busybox-vi.2284102d4b64632228ec984758d0612558719c8ecfc72dc157295da5fc021d7b +#+busybox-xxd.48636479820ff0c9c14e506b6b1eefe09b30d97dc08774fd09724d73c6163d41 +#+busybox-process-extra.1bf467c93e34be2007c815ca4cb4127cd6af7d6c9e0be04d04ef5acc93668bf6 +#+busybox-procps.dbbc3165e44bf8a9510d551af2e35829a5535bdd70c95d288b0fc6bcdb507859 +#+busybox-psmisc.f5c7cfb16a9681d939f3492ecc1787ccd2f67d8f1ac27014e6cb707922d8e150 +#+busybox-ash.7de3c392c740d6d8429c1cab7a7a8754b557881d19e34f7463e7bbb2b60973e2 +#+busybox-bc.528921c3ad5373344520cac5f830107b7ef3d6caffff1cc036c74c95fbfd9837 +#+busybox-coreutils.6a4f77a1fbb068917bf208bf106e1be56f4bb66611a132b4f5af0fd60e7039c7 +#+busybox-coreutils-extra.8b8eb0c2c4f16bd512e5fd415ac7913623a26d8d59f3e61a4ddb7d3a1f0573c1 +#+busybox-daemontools.1aece6b905a79a64aa1e3017ebfc26b0b94f458bb099abec7ed0ff459998beaf +#+busybox-grep.5be674553f094ea8ff56ee0ecf4ea42cb9707bb5e851a1a7cef1674099e84b1a +#+busybox-misc.ede658bafa6181db68ab82e623e5eb81d6b9837617c1ee56393197611a3a4159 +#+busybox-sh.73ea6dd8f4d55dabb22d536020e9fb9eb4faf2870d8ef013dbeb3c347466594c +#+busybox-util-linux-unpriv.41e5c782e22370e9e5c7edf0f51f970b29392d38fda7e5d0cb485307d00cbeb9 +#+busybox-findutils.2a1d5c566a2629b72fb851261140def63b323ee166cb8525b71a6dfb38a8a498 +#+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e +#@sha256:15b1dd86710a4c5fc0654dbd871965b227474eb7f54531eebafffe8c1061f10e:cdefs.h +#@sha256:c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b:queue.h +#@sha256:e0ea17940260f9c1fdd2d35f74eec141d21f09844eaea91131993cb950901a16:tree.h + + +# - build script start - + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'bsd-compat-headers' + + +mkdir -p "$dest"/'include' +install -Dm644 -t "$dest"/'include'/sys ./*.h + + + +cd "$pthbs_destdir/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./include/sys/cdefs.h"]=1 + x["./include/sys/queue.h"]=1 + x["./include/sys/tree.h"]=1 +} + +function r1(s) { + sub("^[.]/[^/]*", ".", s) + return s +} +function s1(repl, s) { + sub("^[.]/[^/]*", "./"repl, s) + return s +} +function link(src) { + x[$0]=0 + printf "%s\t%s\n", $0, src + printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr" +} +$1!="."{exit 1} +$2 == "env" { link($0); next } +$2 == ".env-template" { link($0); next } + +$2 == "command" { link($0); next } +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } +$2 == "sbin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 == "info" { link(s1("info", r1($0))); next } +$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next } +$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next } + +$2 == "config" { link($0); next } +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "data" { link($0); next } +$2 == "include" { link($0); next } + + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + retcode = 0 + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + retcode = 3 + } + } + exit retcode +}' >.install-links.new +mv .install-links.new .install-links + 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.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba -#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d +#+zsh.ad2c426a0d2aa99c859496cae60c002f60bc1c4038f52ceaf7200bf09dc1579c +#+pthbs-banginstall.d86bac810cb85cab0fe1157d8b44b33ce1c5f2000de05d506b5fa28f4153babf #@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.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba -#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d +#+zsh.ad2c426a0d2aa99c859496cae60c002f60bc1c4038f52ceaf7200bf09dc1579c +#+pthbs-banginstall.d86bac810cb85cab0fe1157d8b44b33ce1c5f2000de05d506b5fa28f4153babf #+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.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba -#+confz.ece16f6e16b428ebf40b7fd3c948484297f8260f37c815bfa7b62de2b189c4ee -#+containers.9ef7a0f8e3b3fcb4295c382ec128145fdf4d87b0dbd0532d6d972df2132ebc33 +#+zsh.ad2c426a0d2aa99c859496cae60c002f60bc1c4038f52ceaf7200bf09dc1579c +#+confz.26dfab0ecde7354ba74e73207e888f7855949f00d92e157a504683c47c46bb65 +#+containers.0d6e51bdad044d36525a837ed175835e7a62156063f19842bfdb025478e4e274 #+xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989 #+zstd.c63a3cabacc7382111033c967c5e11509d80a53e85d1f82f5117c0994ee82058 #+apk-tools.e9e751ea7ddc425811423c10dd7b317f2a13001905424548febd956bc68a19d5 #+alpine-keys.91c778ab606f8627ec57ca0ac12fbc575b11be2c477052ab77a9cf8cb3534416 #+getent.4caaecf2abb7893d1b05b464d8b085ceec41e148787112dd626dcb04ef3b64b6 -#+fileset.e538ccf0f93b0cfdb7ca8126092625cabee0e73da442ac74ae8bb84bb043ff23 +#+fileset.3a7e50ccc95e038b715b534ba32df6b5105d20166ce400e1a01d0f86e516d4ba #+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.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba -#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d -#+aat.041a141f6168b94565f7627ae689bd8f043e7978d808113b1cbaed02d7ed18ef -#+confz.ece16f6e16b428ebf40b7fd3c948484297f8260f37c815bfa7b62de2b189c4ee -#+containers.9ef7a0f8e3b3fcb4295c382ec128145fdf4d87b0dbd0532d6d972df2132ebc33 -#+fileset.e538ccf0f93b0cfdb7ca8126092625cabee0e73da442ac74ae8bb84bb043ff23 -#+logincaps.6d0e31d778ff4d5f016d6066ffeb4c3a8310e282cc26cd29d87039f97ac41fe3 -#+snaprep.9153a7b7f103c07141f09d75d64a3738457de8f358492f42170d6a75dba237d6 +#+zsh.ad2c426a0d2aa99c859496cae60c002f60bc1c4038f52ceaf7200bf09dc1579c +#+pthbs-banginstall.d86bac810cb85cab0fe1157d8b44b33ce1c5f2000de05d506b5fa28f4153babf +#+aat.be3320cc83afe3161b2e71497ce4c1ac27236400db7ff1e3bf7d5113b9eb7693 +#+confz.26dfab0ecde7354ba74e73207e888f7855949f00d92e157a504683c47c46bb65 +#+containers.0d6e51bdad044d36525a837ed175835e7a62156063f19842bfdb025478e4e274 +#+fileset.3a7e50ccc95e038b715b534ba32df6b5105d20166ce400e1a01d0f86e516d4ba +#+logincaps.031601957d279ddd950900af7583f878950ad6e7cf23422beaff6450e3c6b367 +#+snaprep.a80a127be6033066c2b0ae2b43853b302239cb632de9149b4ae5688cc3222864 #+curl.7f5463b5de6d0e17b7b374ef28d43d8dffde44b7901feeba5a6f77e17b76fbed #+git.a611fbad4e4b588d14e616889a929fc76990a99272106cd3dd419b96a05224c9 #+xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989 @@ -79,7 +79,7 @@ #+libcap.a4535114c422033f37933f15758592c0e7a327a66ecee2cc445d9b565c07f2d6 #+applyuidgid-caps.65c2cf78a093f3c442f5f5f69e5b4f49f71bfb303ba93336f0b4913a2387e5c3 #+ccx-utils.76fa3451ead3ef0516d5b7cd5c7c82e33866553e42fedc7359563396beed4e19 -#+user-env.dbf3d531f8524ec45828172f3052cda5ef7ea0d2d33390642fc1bb63c034f5ec +#+user-env.107562c183f13789f18448f49b680021659e2a35237e87a5d526c7bed57829a7 #+mlog.c6bb1056afeb97041aeba1f60e1b0574d21fa98407960995ff5448a4b5dee034 #+findutils.68dbe3ca65da5cbfad495bde6d8c8c997988357f5714b2d92a3b552fdf7c33a6 #+nawk.14d0d29030d09432a35e44c3d3c17acdd7018ca4820299f31bbff3379414091e @@ -87,9 +87,9 @@ #+squashfs-tools.d9b4267c13e4ee7076d8897b9461a00ff7bc2aeb4a166fb28f8d38e46ba67a99 #+mandoc.421dfa1a68724de02d7e94d17a7c515db1908a6b9560f7bcfef9764e01eb9d5c #+tinyssh.ca9956fe0cef56dd575836a9f804bd66df875871ae08d63badb077429ebd240d -#+system-config.fcfcec66084af7d12eb2548580290f9073c0756ee93f5575637ff51bf49634df -#+system-config-rc.4fc682d6689901820ecd665f4de2b804db2a6d557445d31cabcd2a288d2816c0 -#+system-config-scripts.c51df775dc1d34cff68ce8033edf46defc89449ee3e644c3d168766dc48ff9eb -#+system-config-init.84c07495752362ddb92746adf3c66bd197fdc88708801f4be99668194f1c3781 -#+system-config-zsh.5d225c9252e87903df1d82c9d241e6237f34ac8764dbaaedd3aea58f03271b97 +#+system-config.347f3e055cff0bbc7e4c784d4c9089c2edde90519bed79164b9df4015b1d5175 +#+system-config-rc.d4368bf00609dc9d4ab02cb01a10126735168757d20d0a0d241295ea6c15e1fa +#+system-config-scripts.91a3a0c55e4236503e8acff6966c88ee3fea7e4fd933dd79787f84b67afa4da6 +#+system-config-init.493ee72505b74b945e743d8256e2005487d25b303e75e759da28a54fd91f796f +#+system-config-zsh.e5b475ddb1ee65a2df961438a38678aa04e91a7bceda339e3ad8e47911ce1633 #+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.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba -#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d +#+zsh.ad2c426a0d2aa99c859496cae60c002f60bc1c4038f52ceaf7200bf09dc1579c +#+pthbs-banginstall.d86bac810cb85cab0fe1157d8b44b33ce1c5f2000de05d506b5fa28f4153babf #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd @@ -32,6 +32,7 @@ #+gnu-make.bcf1e2219eef8ef6cec2972924978ecd90c3981fb0999b75432e3e9e5873b8a8 #+m4.544b50e189fc3ac5dd818c29b6c2781a0b36808ebb2be12abc5c59a69a9acc91 #+libmd.e27d67aee9fb0db5c8dc25700c708799a49cb1ea932f56db0a4d2dd08ad97c61 +#+bsd-compat-headers.5c9defa453f992998a0fe8db4da065d3072902be0ed9b4262e6c1ad2077907da #@untar:-J:sha256:b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014:. 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.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba -#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d +#+zsh.ad2c426a0d2aa99c859496cae60c002f60bc1c4038f52ceaf7200bf09dc1579c +#+pthbs-banginstall.d86bac810cb85cab0fe1157d8b44b33ce1c5f2000de05d506b5fa28f4153babf #+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.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba -#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d +#+zsh.ad2c426a0d2aa99c859496cae60c002f60bc1c4038f52ceaf7200bf09dc1579c +#+pthbs-banginstall.d86bac810cb85cab0fe1157d8b44b33ce1c5f2000de05d506b5fa28f4153babf #@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.4bbb6d930e350387fab2c0f442ca67f94228a79fcbdbbc64974b5fd89b620690 +#+mdev-scripts.424e21f1a09fccfc54de3726ee1d67f29f23dfbd98071cb7790483e559e541bf #+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.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba +#+zsh.ad2c426a0d2aa99c859496cae60c002f60bc1c4038f52ceaf7200bf09dc1579c #@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.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba -#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d +#+zsh.ad2c426a0d2aa99c859496cae60c002f60bc1c4038f52ceaf7200bf09dc1579c +#+pthbs-banginstall.d86bac810cb85cab0fe1157d8b44b33ce1c5f2000de05d506b5fa28f4153babf #@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.041a141f6168b94565f7627ae689bd8f043e7978d808113b1cbaed02d7ed18ef -#+fileset.e538ccf0f93b0cfdb7ca8126092625cabee0e73da442ac74ae8bb84bb043ff23 +#+aat.be3320cc83afe3161b2e71497ce4c1ac27236400db7ff1e3bf7d5113b9eb7693 +#+fileset.3a7e50ccc95e038b715b534ba32df6b5105d20166ce400e1a01d0f86e516d4ba #+rsync.8d48498b69b6293ebd4e138fde14fa567ecb71d1e5681c5f0e79ea897e4f39ba #+execline.4ce0c41824f822a2121cd43043d321c827b23b2ccef5a3ef0150e9f147d7e90a #+kbd.6f11c0835495c6e93ed0a4d487f3ff4e320edd27c703a128d6bb2e2992a33bae @@ -56,10 +56,10 @@ #+s6-linux-utils.c905cda13791d3634af26d96e1616784a3eab93ee598af58b0f6baf26c5a9f18 #+s6-rc.3c6bebbe7fcf84c87fba0319c4868aba211f2f771d2ab34489c3264f8e157703 #+s6.96c8519cb2a37864d6aa1e18fa138d5789be61ceb96429f1beece1a1c945afc7 -#+zsh.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba +#+zsh.ad2c426a0d2aa99c859496cae60c002f60bc1c4038f52ceaf7200bf09dc1579c #+libcgroup.212438b617126996f9a2547758ba3e504ad3dfe9528c4acad120c7d347c928e4 -#+system-config-scripts.c51df775dc1d34cff68ce8033edf46defc89449ee3e644c3d168766dc48ff9eb -#+logincaps.6d0e31d778ff4d5f016d6066ffeb4c3a8310e282cc26cd29d87039f97ac41fe3 +#+system-config-scripts.91a3a0c55e4236503e8acff6966c88ee3fea7e4fd933dd79787f84b67afa4da6 +#+logincaps.031601957d279ddd950900af7583f878950ad6e7cf23422beaff6450e3c6b367 #+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.29ac5872971095da4d4bcadf15d68b16e54fe1fb271ff18fefd2c6094d75fde1' \ - 'pthbs_path_mdevd=/versions/env.07c8e78ad0ced161c8fd50de2051531881366a70aae1358498951acfb45b85fc' \ + 'pthbs_path_containers=/versions/env.da442412f6217fe37154a5f58564d193182c518cb77b16e3f5a2ee3990accff1' \ + 'pthbs_path_mdevd=/versions/env.15af8f5473a2318c2fbf046b87c99656c4571883ae9f6a402e7b3bdfeeb5de54' \ 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.4fc682d6689901820ecd665f4de2b804db2a6d557445d31cabcd2a288d2816c0 +#+system-config-rc.d4368bf00609dc9d4ab02cb01a10126735168757d20d0a0d241295ea6c15e1fa # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.4fc682d6689901820ecd665f4de2b804db2a6d557445d31cabcd2a288d2816c0/config/s6-rc-db +s6rcdb=/versions/system-config-rc.d4368bf00609dc9d4ab02cb01a10126735168757d20d0a0d241295ea6c15e1fa/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.e538ccf0f93b0cfdb7ca8126092625cabee0e73da442ac74ae8bb84bb043ff23 -#+system-config.fcfcec66084af7d12eb2548580290f9073c0756ee93f5575637ff51bf49634df +#+fileset.3a7e50ccc95e038b715b534ba32df6b5105d20166ce400e1a01d0f86e516d4ba +#+system-config.347f3e055cff0bbc7e4c784d4c9089c2edde90519bed79164b9df4015b1d5175 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.fcfcec66084af7d12eb2548580290f9073c0756ee93f5575637ff51bf49634df/config/s6-rc-source +src=/versions/system-config.347f3e055cff0bbc7e4c784d4c9089c2edde90519bed79164b9df4015b1d5175/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.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba -#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d +#+zsh.ad2c426a0d2aa99c859496cae60c002f60bc1c4038f52ceaf7200bf09dc1579c +#+pthbs-banginstall.d86bac810cb85cab0fe1157d8b44b33ce1c5f2000de05d506b5fa28f4153babf #@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.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba +#+zsh.ad2c426a0d2aa99c859496cae60c002f60bc1c4038f52ceaf7200bf09dc1579c #@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.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d +#+pthbs-banginstall.d86bac810cb85cab0fe1157d8b44b33ce1c5f2000de05d506b5fa28f4153babf #@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.12881a9ea4a8a6eb684aa181b91eb2b89be873212350e88e7bdacbf7181f71ba -#+pthbs-banginstall.05d3a38cfd1da280db7c917251c494741f56caad39bbe282a0a8d3ff885a685d -#+aat.041a141f6168b94565f7627ae689bd8f043e7978d808113b1cbaed02d7ed18ef -#+confz.ece16f6e16b428ebf40b7fd3c948484297f8260f37c815bfa7b62de2b189c4ee -#+containers.9ef7a0f8e3b3fcb4295c382ec128145fdf4d87b0dbd0532d6d972df2132ebc33 -#+fileset.e538ccf0f93b0cfdb7ca8126092625cabee0e73da442ac74ae8bb84bb043ff23 -#+logincaps.6d0e31d778ff4d5f016d6066ffeb4c3a8310e282cc26cd29d87039f97ac41fe3 -#+snaprep.9153a7b7f103c07141f09d75d64a3738457de8f358492f42170d6a75dba237d6 +#+zsh.ad2c426a0d2aa99c859496cae60c002f60bc1c4038f52ceaf7200bf09dc1579c +#+pthbs-banginstall.d86bac810cb85cab0fe1157d8b44b33ce1c5f2000de05d506b5fa28f4153babf +#+aat.be3320cc83afe3161b2e71497ce4c1ac27236400db7ff1e3bf7d5113b9eb7693 +#+confz.26dfab0ecde7354ba74e73207e888f7855949f00d92e157a504683c47c46bb65 +#+containers.0d6e51bdad044d36525a837ed175835e7a62156063f19842bfdb025478e4e274 +#+fileset.3a7e50ccc95e038b715b534ba32df6b5105d20166ce400e1a01d0f86e516d4ba +#+logincaps.031601957d279ddd950900af7583f878950ad6e7cf23422beaff6450e3c6b367 +#+snaprep.a80a127be6033066c2b0ae2b43853b302239cb632de9149b4ae5688cc3222864 #+curl.7f5463b5de6d0e17b7b374ef28d43d8dffde44b7901feeba5a6f77e17b76fbed #+git.a611fbad4e4b588d14e616889a929fc76990a99272106cd3dd419b96a05224c9 #+xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989 @@ -79,7 +79,7 @@ #+libcap.a4535114c422033f37933f15758592c0e7a327a66ecee2cc445d9b565c07f2d6 #+applyuidgid-caps.65c2cf78a093f3c442f5f5f69e5b4f49f71bfb303ba93336f0b4913a2387e5c3 #+ccx-utils.76fa3451ead3ef0516d5b7cd5c7c82e33866553e42fedc7359563396beed4e19 -#+user-env.dbf3d531f8524ec45828172f3052cda5ef7ea0d2d33390642fc1bb63c034f5ec +#+user-env.107562c183f13789f18448f49b680021659e2a35237e87a5d526c7bed57829a7 #+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.f43a48263fb3a0b5b3dec4b7ca40401ef561191747a4814c1cd73c029445b585 +#+libbsd.6583fd9ec81960afb6b73ba1368d0665839f4779fae0e85b6ec04b818874bf58 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.