commit fd33ba1d71d3e6686db4ce562008234aa939f5b0 parent 95d17c159ace8b4d4ce116cc6fca88accfcbac11 Author: Jan Pobrislo <ccx@te2000.cz> Date: Tue, 18 Nov 2025 00:21:36 +0000 update containers, ccx-utils Diffstat:
29 files changed, 324 insertions(+), 54 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1 @@ -361,10 +361,12 @@ fbace046603cd400659ba15e17081339db31c7e8 sources/busybox fbb12ddc6a53ad97ff6bcc7ed9b253c09001ad2f sources/busybox fd0e197d9c746faec8c8854fcfd416964440615d sources/busybox ffe18087faa553747d68ce662e0d4e9e7265fc3f sources/busybox +461a9ec198c1e2b9c39a34e21786747dbb8671b4 sources/ccx-utils fae441e25a1ac266742ba6446b37ae56c8e57076 sources/ccx-utils c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz 41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers 5d2b98a3c54b6f142b80773e4a18dea3749bfea6 sources/containers +9820dbea1cf5060d7d04632f0fed7e91ea608309 sources/containers b2ba08f728a01a5bac734c823016be77035ab687 sources/containers e8dfe8dcb4396ac0f12f0d0017f9836fa113e3a6 sources/containers 94422be00da71ff44c8ad1fe3455587c62ca29d3 sources/easyseccomp diff --git a/templates/pkg/sandbox_root b/templates/pkg/sandbox_root @@ -7,6 +7,7 @@ #+{{pkg_install_name("musl-cross-make:bootstrap-1")}} #+{{pkg_install_name("gnu-make:bootstrap")}} #+{{pkg_install_name("busybox:bootstrap")}} +#+{{pkg_install_name("skalibs:bootstrap")}} #@sha256:{{ files["argv0exec.c"] }}:argv0exec.c {%- endblock package_deps -%} {% block build -%} diff --git a/templates/pkg/skalibs:bootstrap b/templates/pkg/skalibs:bootstrap @@ -0,0 +1,25 @@ +{%- set pkg_source="git" -%} +{% extends "genlinks" %} +{% block package_deps -%} +#@pragma:nosandbox +#+{{pkg_install_name("musl-cross-make:bootstrap-1")}} +#+{{pkg_install_name("gnu-make:bootstrap")}} +#+{{pkg_install_name("busybox:bootstrap")}} +{% endblock package_deps -%} +{% block configure -%} +export CC="$pthbs_build_environment/command/{{triplet}}-gcc" +export CXX="$pthbs_build_environment/command/{{triplet}}-g++" +export LD="$pthbs_build_environment/command/{{triplet}}-ld" +export AR="$pthbs_build_environment/command/{{triplet}}-ar" +export CFLAGS="-O2 -ggdb" + +./configure \ + --prefix="$prefix" \ + --sysdepdir="${prefix}/sysdeps" \ + --binprefix="${prefix}/command" \ + --extbinprefix="${prefix}/command" \ + --dynlibdir="${prefix}/library.so" \ + --libdir="${prefix}/library" \ + --includedir="${prefix}/include" \ + --disable-shared --enable-static +{% endblock %} diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils @@ -30,7 +30,7 @@ #+gnu-make.31d90a55d6506852f9784f6f6febf0d843f8051f63bc18795fd5275baa369f50 #+skalibs.ebd0a1da21779abebd0aa424ddfe643c70538dcb41c49f3b336448085b0222a7 #+s6.d1d04f234dca78ca1cf408af81667ab792e811d5fc06ce22151d4c1a690b3ec6 -#@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils +#@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils # - build script start - diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -48,7 +48,7 @@ #+busybox-login.e92d17445b96532333506a543ff2c538bee3f44a6126d943037b60b7adcb77a5 #+execline.8e0cfd256010e27b02db370a270283eb5db150534197750ea9ebf655a1eaa2a8 #+s6.d1d04f234dca78ca1cf408af81667ab792e811d5fc06ce22151d4c1a690b3ec6 -#+ccx-utils.bec828833ebd48ee829b03b21210015357342488090095146c129391b6005676 +#+ccx-utils.d657de16c137cd112c32fe714960bf486b97d5115a79df88bd3445bd7115b878 #+applyuidgid-caps.ce45d6bf7a456c2cc7d434988f3bea5f696a4c888be3673c19d5ddea01e967bf #+easyseccomp.adb860089609eadf40b55079ac58a9016d2e769e16be0e8b8f69aa9456db0879 #+mlog.7d3be6e75064d57702609cba2a8c095ec54bda6aa6404b9b720cd798e705cd69 diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -32,8 +32,8 @@ #+alpine-keys.a060a07aed20d10e140cb3f279a6d686db1cb9b067ba1715a0d50da28c17d7bb #+apk-tools.c91dba8f4fbd2ac6ef66426fb0e085d2f1daf3e4cf4bcf98d8f9f2ec0369bf1d #+xbps.93d70c15198706a4cedceb47f8693d17c72d940cbfe471d993984893399713f9 -#+container-bin-image.5c1a5670697cb2859d98c5d880853defe9aa55b228078b46474137396d3bc133 -#@git:b2ba08f728a01a5bac734c823016be77035ab687:containers +#+container-bin-image.f22320fc9fa9da0b82d4206ae7834e09862cfbc0c21c74cdc3d4b8365d139294 +#@git:9820dbea1cf5060d7d04632f0fed7e91ea608309:containers # - build script start - @@ -90,9 +90,9 @@ for f in '/home/ccx/versions/xbps.93d70c15198706a4cedceb47f8693d17c72d940cbfe471 ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.5c1a5670697cb2859d98c5d880853defe9aa55b228078b46474137396d3bc133/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.5c1a5670697cb2859d98c5d880853defe9aa55b228078b46474137396d3bc133/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.5c1a5670697cb2859d98c5d880853defe9aa55b228078b46474137396d3bc133/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.f22320fc9fa9da0b82d4206ae7834e09862cfbc0c21c74cdc3d4b8365d139294/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.f22320fc9fa9da0b82d4206ae7834e09862cfbc0c21c74cdc3d4b8365d139294/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.f22320fc9fa9da0b82d4206ae7834e09862cfbc0c21c74cdc3d4b8365d139294/container-bin-image' "${dest}/deps/" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -50,14 +50,14 @@ #+s6-linux-utils.6946cb45307e4fb810d4666dc58a81f148cd054efae605c525903b68793a86de #+zsh.60d18d4b2ab5f2daecf5565d85e5a9a5b6e56bb5057dc30569562e3afde5a39b #+confz.8fb448f1690b133854d5fa3071886f2f2f4f1eb61927d1a042a1629fbb8f4367 -#+containers.4e634de343c5d939be645ffd1e78e49257eb91678ce5fde57b3b10983ea69919 +#+containers.316803c8df95f02be37e244a5d209fa01504927b06b76bd1269efa5187f171ef #+xbps.93d70c15198706a4cedceb47f8693d17c72d940cbfe471d993984893399713f9 #+zstd.6afe77579aa3ef491aed79769e0b1553d04e7fbb584785ada4b8a49791694ae2 #+apk-tools.c91dba8f4fbd2ac6ef66426fb0e085d2f1daf3e4cf4bcf98d8f9f2ec0369bf1d #+alpine-keys.a060a07aed20d10e140cb3f279a6d686db1cb9b067ba1715a0d50da28c17d7bb #+getent.51cb0f8fa1d9fb6bc6d303662da00ad953eddba5e96327dd344b6e52940b1ff8 #+fileset.c61607873526277d234453fa1409576c56f55bfe521d8dd034c8400164c6cb61 -#+ccx-utils.bec828833ebd48ee829b03b21210015357342488090095146c129391b6005676 +#+ccx-utils.d657de16c137cd112c32fe714960bf486b97d5115a79df88bd3445bd7115b878 #+easyseccomp.adb860089609eadf40b55079ac58a9016d2e769e16be0e8b8f69aa9456db0879 #+findutils.d9e7f71704cf89d5bb127931d1c1a27f4fe40879b7733a8f8c71a86a0c31c632 #+nawk.e4d02d09a25319411ab52938892bddcd7f7b715f21da1757ded6b98c56780811 \ No newline at end of file diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -65,9 +65,9 @@ #+pthbs-banginstall.ff97db06497c226bc2d479e489ad723ed15ac0321be10bd8daed2755985b9ddf #+aat.74a1043f5eab4982fa293938b77f0af5a54533dfb69688c304bd626aee7b76d0 #+confz.8fb448f1690b133854d5fa3071886f2f2f4f1eb61927d1a042a1629fbb8f4367 -#+containers.4e634de343c5d939be645ffd1e78e49257eb91678ce5fde57b3b10983ea69919 +#+containers.316803c8df95f02be37e244a5d209fa01504927b06b76bd1269efa5187f171ef #+fileset.c61607873526277d234453fa1409576c56f55bfe521d8dd034c8400164c6cb61 -#+logincaps.4c77473ece2646792cd2de1d9a4471c6f59e84895ca7eb3751de2f040dba0de8 +#+logincaps.7b7cdda0779222e1eae2396b7145192536a5f36794f78f060921832412ea8225 #+snaprep.0cdf03d52d83a346832cc743d15ac9cee20e14b8aa3655b8c40b8cd546c06daa #+curl.2faefe611f09b8c668611b2752c6480608b2f14f4bbdeb8d30cadd33576b00a3 #+git.b51920705f51f05f6cd36017faa417d1f504c9eec0357a40316f582211a29bca @@ -78,7 +78,7 @@ #+iconv.772978e13de2b2ea9cf669a6d360421a071b9ca583fb064af3725c1cfabe3697 #+libcap.1d557de55f2cbeff2a4b219d7da9a7d5d411ad5e5fbf984c48604fcabae671f8 #+applyuidgid-caps.ce45d6bf7a456c2cc7d434988f3bea5f696a4c888be3673c19d5ddea01e967bf -#+ccx-utils.bec828833ebd48ee829b03b21210015357342488090095146c129391b6005676 +#+ccx-utils.d657de16c137cd112c32fe714960bf486b97d5115a79df88bd3445bd7115b878 #+user-env.3d582edbd9b06e8d72c7bc9287428138fd2ddf7dfd07d8a763042615c01b785d #+strace.49049b71b57c61eef64ecec21c30be00aa81bae9d8e7924fc6b3240dc45c8bfc #+mlog.7d3be6e75064d57702609cba2a8c095ec54bda6aa6404b9b720cd798e705cd69 @@ -87,9 +87,9 @@ #+squashfs-tools.dc473cbcc9137cefd0d45d7da5520b8e91a2582a1cc7bd1695418c4d7f4e3fcc #+mandoc.041f7379850d818d1fe3915fb18c57b15c15605d70eb37a50bca8cbb85ce1a34 #+tinyssh.1736963c9442b1092ab87d524d5cffdcbd97b744c30a4d41f28e41c05fdd6aaf -#+system-config.30ae03a96b216cf17a2c63a437c184fcd16bea4b82de6e00e88bd50737d3cb13 -#+system-config-rc.c3b55f453abdcfe9d4f7d7c5f7512755333e9c8fa2eafc5cbe45ec37e7d51630 +#+system-config.4eb4c02bf3444889d6c83c3333a4a25ee542c206d8cdf44c980e9aa4df1e6eff +#+system-config-rc.d2a5da766771e3c81066304cc579dca02dc92530efd1adefd37c0dc858d834b5 #+system-config-scripts.560351526ce133330803cd8653a6bc30e43e31338a794070a0d7ef679fbb9f79 -#+system-config-init.6bdbf4ceae9f2970477f60f1b988cf547e3dad29caf67295dac7391a9d9f70cf +#+system-config-init.b598fda60388f518a784bb2ad7bf2048ecccc9e619c445bf2967f68121728565 #+system-config-zsh.9ce78ba7665f745a6873abfb581528598bf36993beac7bfdba941e4c966c72e1 #+busybox.84219b58772dc51944872fed155b5ca577b69a4703fce1561d211e16bf30117d \ No newline at end of file diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -30,7 +30,7 @@ #+pthbs-banginstall.ff97db06497c226bc2d479e489ad723ed15ac0321be10bd8daed2755985b9ddf #+execline.8e0cfd256010e27b02db370a270283eb5db150534197750ea9ebf655a1eaa2a8 #+musl-cross-make.74cd95cd7bd1db21d28d9a8579d924d588b9cbfd0f9744c0fb890188d71646aa -#+ccx-utils.bec828833ebd48ee829b03b21210015357342488090095146c129391b6005676 +#+ccx-utils.d657de16c137cd112c32fe714960bf486b97d5115a79df88bd3445bd7115b878 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps diff --git a/variants/ccx-x86_64/pthbs_sandbox_ns.environment b/variants/ccx-x86_64/pthbs_sandbox_ns.environment @@ -1,2 +1,2 @@ #!/usr/bin/env pthbs-build -#+sandbox_root.8533ef8dca3fdfec026ae903a55a768377a6aca3edb564e1e86fe6ddebcd11cb- \ No newline at end of file +#+sandbox_root.0653b444e08e04f5f5fd8b2d12f217db681bd560586da378cf0102d44753d5a5+ \ No newline at end of file diff --git a/variants/ccx-x86_64/sandbox_root b/variants/ccx-x86_64/sandbox_root @@ -3,6 +3,7 @@ #+musl-cross-make.513f0acae3d9d88d67a9151a33515f34995d3ff3d69f38b47239070d1b02c731 #+gnu-make.0a6fbda1db6316eb5ed666a1697e7bf0e4604d371ac4cf5d24a5151e76280074 #+busybox.a0af8a5860e7fa278d39404f06a382633b7e2122d85c16bb2e22b1804cdd1654 +#+skalibs.35d1a31b8cc5a1bb13b8f32190e670ff61dc045232e0c9057491967bbc964362 #@sha256:8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9:argv0exec.c # - build script start - diff --git a/variants/ccx-x86_64/skalibs:bootstrap b/variants/ccx-x86_64/skalibs:bootstrap @@ -0,0 +1,120 @@ +#!/usr/bin/env pthbs-build +#+busybox-bzip2.4788e6edf9eeb73c7c665238a23aeed4703f8e25ab101509aee01440865ccdb1 +#+busybox-gzip.4fc908cacf4533192819578a079617c0cbe879b8ebd3e2140d896b067d3a574c +#+busybox-lzop.e6e42a1a8451a4b845355899c9cd49efea2e395a0ef0c6ae7099103213a7bf4f +#+busybox-unzip.93b5e83122059c87a2ddf489cdc7381bb80288630c508c218c2cfbadff524784 +#+busybox-xz.34137cc6ac8d23bf1bf5979b7fd047d4f50b34be07cd6ab636368952a199368d +#+busybox-cpio.de88944ccff44a1f3abe06c42f83492a7e080de89fba27aadf5fe1a40e830cae +#+busybox-dpkg.17e445a8089bc61db749a44c665597ecac3f21c4088daaa024f574412eb4d704 +#+busybox-rpm.669ed61ee218bc72206e069c896f392a025c88772ceb92ecb37b01ab0765baf8 +#+busybox-tar.15f67670238651149114006ae79359f24e1fa3c62be2e229a48f1334747ba413 +#+busybox-ed.78c51627a372c5b2ad3d046d0e77f341ae7c79917c4a16ca8abba284e7472cb7 +#+busybox-sed.8782396ae5c7b6e7d6bc8a93a7cff9912e6427e3d919dd5e5b00d1813ae88caf +#+busybox-vi.e661d8eb052fbeebdd3be36ff6bd27651a7e59c857dad05c8633589790caa38c +#+busybox-xxd.d2dc96e92cfdafae2c91d6fe897f42fdccae2dbc8b2d79f31eccc49d4e3a2d68 +#+busybox-process-extra.993cfd65eae2892ecb3fdfbece44b11e7ff6caa78f73e9f22bc2c97e7cd8a267 +#+busybox-procps.51ea8cb23d5eb1498f9167cc80b97c1a873758a8c1a7293079f50a2365466a71 +#+busybox-psmisc.ff1f9cf00f4c448946acb65d52b3b598e0495822af70b1504720cadf559e2090 +#+busybox-ash.7d10753f118afb2568e9f950c9cffa559b053a9b3ea516d6b46c3c73ebb6f8d8 +#+busybox-bc.c595636f103108c81f0ae55d2bf10d7cbc06ef1455a8353fcf04e42e765780a8 +#+busybox-coreutils.6b8071260ab4297f0e71013e42ac2a1a83fa99d92378d181ba49003fd349134a +#+busybox-coreutils-extra.fc1b0766c881ee461d36c386833909553fcb0c31a547bfb563a7c6a50206bdcd +#+busybox-daemontools.97aad28bbe5f38cff29db16c0f0d21e2fdc931825f683137df9bb57ef3a9b628 +#+busybox-grep.261a809c35cb58acc896143c2a81406a097f5870e02ce9906953181ef6b4c72b +#+busybox-misc.5c2c025f1b74b9243a0128cd3f10dd1577b5ae123f53244d8e6895d4bdbd161d +#+busybox-sh.25a9438d8449ade9c98af61b14af5711990dd002462a046b13b61969634c4d94 +#+busybox-util-linux-unpriv.4ea1c8c8746d7e80d36dea8924c576bc9666905b461dd543ceb5595394406c97 +#+busybox-findutils.052256c5bf9c3e7fef2e69d22f3d402d004f22113ce10b4d2c54ff417bf42622 +#+busybox-awk.f44da758ab8e737f05fb82ca4342acdf29ec44a9c2a9670cded75b04e8208058 +#@pragma:nosandbox +#+musl-cross-make.513f0acae3d9d88d67a9151a33515f34995d3ff3d69f38b47239070d1b02c731 +#+gnu-make.0a6fbda1db6316eb5ed666a1697e7bf0e4604d371ac4cf5d24a5151e76280074 +#+busybox.a0af8a5860e7fa278d39404f06a382633b7e2122d85c16bb2e22b1804cdd1654 +#@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs + + +# - build script start - + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'skalibs' + +export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" +export CXX="$pthbs_build_environment/command/x86_64-linux-musl-g++" +export LD="$pthbs_build_environment/command/x86_64-linux-musl-ld" +export AR="$pthbs_build_environment/command/x86_64-linux-musl-ar" +export CFLAGS="-O2 -ggdb" + +./configure \ + --prefix="$prefix" \ + --sysdepdir="${prefix}/sysdeps" \ + --binprefix="${prefix}/command" \ + --extbinprefix="${prefix}/command" \ + --dynlibdir="${prefix}/library.so" \ + --libdir="${prefix}/library" \ + --includedir="${prefix}/include" \ + --disable-shared --enable-static + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + +make DESTDIR="$pthbs_destdir" install + + + + + +cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN {} + +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 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } +$2 == "command" { link($0); next } +$2 == "bin" { 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|man|doc|icons|terminfo)$/ { link(r1($0)); next } + +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "icons" { link($0); next } +$2 == "terminfo" { 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" } + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + exit 3 + } + } +}' >.install-links.new +mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -58,7 +58,7 @@ #+s6.d1d04f234dca78ca1cf408af81667ab792e811d5fc06ce22151d4c1a690b3ec6 #+zsh.60d18d4b2ab5f2daecf5565d85e5a9a5b6e56bb5057dc30569562e3afde5a39b #+system-config-scripts.560351526ce133330803cd8653a6bc30e43e31338a794070a0d7ef679fbb9f79 -#+logincaps.4c77473ece2646792cd2de1d9a4471c6f59e84895ca7eb3751de2f040dba0de8 +#+logincaps.7b7cdda0779222e1eae2396b7145192536a5f36794f78f060921832412ea8225 #+busybox.84219b58772dc51944872fed155b5ca577b69a4703fce1561d211e16bf30117d #@git:ddb20e067ab184cd18ee8b88d74044dfeeaaad4c:system-config @@ -96,7 +96,7 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/home/ccx/versions/env.9192b5ed2d55a67223b7e1be615ebced7d0c89057d0e4b6536ba97f837a4cd91' \ + 'pthbs_path_containers=/home/ccx/versions/env.6fb4f196fe1fecb765917abfcfc6a35afcf72011bd10c25c50eb1d1fcd0d4419' \ 'pthbs_path_mdevd=/home/ccx/versions/env.4d8244e5bce2aa404dd0d93930111ef42cf9ab543683f4c04f57cf9fe9cb041e' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -50,7 +50,7 @@ #+s6-portable-utils.e7eadf7175d274ea3031a198241ef829fb4b8c3739877f43a69104eaa2e85813 #+s6-linux-init.44615caf8fe0eb0d444e132833bf47f4c34df49630ed62401ed16b60d29c6152 #+execline.8e0cfd256010e27b02db370a270283eb5db150534197750ea9ebf655a1eaa2a8 -#+system-config-rc.c3b55f453abdcfe9d4f7d7c5f7512755333e9c8fa2eafc5cbe45ec37e7d51630 +#+system-config-rc.d2a5da766771e3c81066304cc579dca02dc92530efd1adefd37c0dc858d834b5 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.c3b55f453abdcfe9d4f7d7c5f7512755333e9c8fa2eafc5cbe45ec37e7d51630/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.d2a5da766771e3c81066304cc579dca02dc92530efd1adefd37c0dc858d834b5/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,7 +29,7 @@ #+busybox-diffutils.30a803a8b8dd1d4f18bc5e5952cc4b15aea625caf2af34dd424af233786ba0d0 #+s6-rc.edf43ffe4b6e8ffa61e2bceab12711baa715f6a23a376270fc71acc7fac5141f #+fileset.c61607873526277d234453fa1409576c56f55bfe521d8dd034c8400164c6cb61 -#+system-config.30ae03a96b216cf17a2c63a437c184fcd16bea4b82de6e00e88bd50737d3cb13 +#+system-config.4eb4c02bf3444889d6c83c3333a4a25ee542c206d8cdf44c980e9aa4df1e6eff # - build script start - @@ -39,7 +39,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.30ae03a96b216cf17a2c63a437c184fcd16bea4b82de6e00e88bd50737d3cb13/config/s6-rc-source +src=/home/ccx/versions/system-config.4eb4c02bf3444889d6c83c3333a4a25ee542c206d8cdf44c980e9aa4df1e6eff/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/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -65,9 +65,9 @@ #+pthbs-banginstall.ff97db06497c226bc2d479e489ad723ed15ac0321be10bd8daed2755985b9ddf #+aat.74a1043f5eab4982fa293938b77f0af5a54533dfb69688c304bd626aee7b76d0 #+confz.8fb448f1690b133854d5fa3071886f2f2f4f1eb61927d1a042a1629fbb8f4367 -#+containers.4e634de343c5d939be645ffd1e78e49257eb91678ce5fde57b3b10983ea69919 +#+containers.316803c8df95f02be37e244a5d209fa01504927b06b76bd1269efa5187f171ef #+fileset.c61607873526277d234453fa1409576c56f55bfe521d8dd034c8400164c6cb61 -#+logincaps.4c77473ece2646792cd2de1d9a4471c6f59e84895ca7eb3751de2f040dba0de8 +#+logincaps.7b7cdda0779222e1eae2396b7145192536a5f36794f78f060921832412ea8225 #+snaprep.0cdf03d52d83a346832cc743d15ac9cee20e14b8aa3655b8c40b8cd546c06daa #+curl.2faefe611f09b8c668611b2752c6480608b2f14f4bbdeb8d30cadd33576b00a3 #+git.b51920705f51f05f6cd36017faa417d1f504c9eec0357a40316f582211a29bca @@ -78,7 +78,7 @@ #+iconv.772978e13de2b2ea9cf669a6d360421a071b9ca583fb064af3725c1cfabe3697 #+libcap.1d557de55f2cbeff2a4b219d7da9a7d5d411ad5e5fbf984c48604fcabae671f8 #+applyuidgid-caps.ce45d6bf7a456c2cc7d434988f3bea5f696a4c888be3673c19d5ddea01e967bf -#+ccx-utils.bec828833ebd48ee829b03b21210015357342488090095146c129391b6005676 +#+ccx-utils.d657de16c137cd112c32fe714960bf486b97d5115a79df88bd3445bd7115b878 #+user-env.3d582edbd9b06e8d72c7bc9287428138fd2ddf7dfd07d8a763042615c01b785d #+strace.49049b71b57c61eef64ecec21c30be00aa81bae9d8e7924fc6b3240dc45c8bfc #+mlog.7d3be6e75064d57702609cba2a8c095ec54bda6aa6404b9b720cd798e705cd69 diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils @@ -30,7 +30,7 @@ #+gnu-make.f9c645bf2cec787c1273cfa3ca4f2ad9a50bf2749bc7b290c97880642c6775af #+skalibs.fb12d20e461ff7c753f957b7d26c1ad9179d2ed70d4c060a0a2d9a61a0068133 #+s6.d345c9c0a3001a45a503897dbb676f81dd599d268e397f020fb2a250c6c8fb32 -#@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils +#@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils # - build script start - diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -48,7 +48,7 @@ #+busybox-login.e2a13668d17cf3557742d395bbc5914765a48ebc38227fa549a4450f7e65de85 #+execline.3d599b8858d656c006ad21f504a7d2a23b63e1279708e406a6194d71978db2b7 #+s6.d345c9c0a3001a45a503897dbb676f81dd599d268e397f020fb2a250c6c8fb32 -#+ccx-utils.8f12a4d54e928a8ddfa6ead1aa05e0aa1dc8987def8196a664e52a5b5ddd1650 +#+ccx-utils.839a3b8e3f4ec5c7e3d5902cbfcb576dd1893fd9b95b2a4f4879f7623feaf61e #+applyuidgid-caps.ea806c9e07944988135ad6f1e1fc0df09fcf23f4b1d2f983fc524d962343679e #+easyseccomp.bcb40580e42ecd369c9dea1d6802c2b66c585a8d8901b6c52dfde567a04e65a1 #+mlog.2e491abbb88e427e33b28be7e08ccbadee632e499548073c19c82af63911b087 diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -32,8 +32,8 @@ #+alpine-keys.9bd80534be1ffb38e5ced5bbb504ab1338f7cf4d971d20e5239558c07690ccc1 #+apk-tools.7750610073d0f9d77ce48cd3d13225c7266d9316af5b2293a9e6a660e1d7148f #+xbps.342150459c732c67a21843699cd526526686e596162357a8fedd8ff0646ee85a -#+container-bin-image.7d14586061729e6c745ff7c4a7a3b3680ac44ad8d7332ddad21853a080b291b5 -#@git:b2ba08f728a01a5bac734c823016be77035ab687:containers +#+container-bin-image.3f6052ffb30023f383cfde33fbbddb069f310754638008183b5caa0c67b33d45 +#@git:9820dbea1cf5060d7d04632f0fed7e91ea608309:containers # - build script start - @@ -90,9 +90,9 @@ for f in '/versions/xbps.342150459c732c67a21843699cd526526686e596162357a8fedd8ff ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.7d14586061729e6c745ff7c4a7a3b3680ac44ad8d7332ddad21853a080b291b5/container-bin-image' -test -f '/versions/container-bin-image.7d14586061729e6c745ff7c4a7a3b3680ac44ad8d7332ddad21853a080b291b5/container-bin-image/if' -ln -sf '/versions/container-bin-image.7d14586061729e6c745ff7c4a7a3b3680ac44ad8d7332ddad21853a080b291b5/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.3f6052ffb30023f383cfde33fbbddb069f310754638008183b5caa0c67b33d45/container-bin-image' +test -f '/versions/container-bin-image.3f6052ffb30023f383cfde33fbbddb069f310754638008183b5caa0c67b33d45/container-bin-image/if' +ln -sf '/versions/container-bin-image.3f6052ffb30023f383cfde33fbbddb069f310754638008183b5caa0c67b33d45/container-bin-image' "${dest}/deps/" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -50,14 +50,14 @@ #+s6-linux-utils.484b5b7638b4e8810c3b3db3f053e7799952e80629a943809505ed12ae66c0ee #+zsh.12772d67e6fabc9c15a604709a163047576847157566847b5a0fd3a64f0e5066 #+confz.71219162fcc87bca0ee3da84aebb2d57400e711db81a7fb2066960a4a5d62646 -#+containers.a7b06b404e9ec0e90aec3c481edf741760160bcea4db925cbb4f4cb00396bcbf +#+containers.8b10e7c03e2c97899c1773ebbaf3f28e44e5cace723efe25351d2fb8816c24db #+xbps.342150459c732c67a21843699cd526526686e596162357a8fedd8ff0646ee85a #+zstd.97179ba9bc8225f2c50139f3dd82d27fec48d532893cdf2c596bcb0abc93df17 #+apk-tools.7750610073d0f9d77ce48cd3d13225c7266d9316af5b2293a9e6a660e1d7148f #+alpine-keys.9bd80534be1ffb38e5ced5bbb504ab1338f7cf4d971d20e5239558c07690ccc1 #+getent.3b752f1555130bb10542a0bbbdeec6c8f38e8d11d06f5b1a229e93f3d2e643d9 #+fileset.fcfea6720139be582e3965b24d2108255630885151a828277af411b00bab2ada -#+ccx-utils.8f12a4d54e928a8ddfa6ead1aa05e0aa1dc8987def8196a664e52a5b5ddd1650 +#+ccx-utils.839a3b8e3f4ec5c7e3d5902cbfcb576dd1893fd9b95b2a4f4879f7623feaf61e #+easyseccomp.bcb40580e42ecd369c9dea1d6802c2b66c585a8d8901b6c52dfde567a04e65a1 #+findutils.c5d57b426ce840b3135a17d4dfaf636ce77e54561e672ccdb52768f56410a412 #+nawk.027a855f9a315e50ae9794f569c1009012298e0ca101460ab1189ab1e87a536b \ No newline at end of file diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -65,9 +65,9 @@ #+pthbs-banginstall.19b222e1e513c368cf533bb6d23140770b774891404054c7918df6248283aa68 #+aat.3f29cd1607f2556b48d0b692b27762ec1ab6c2e0cdac8c9de87aa0f4772938cb #+confz.71219162fcc87bca0ee3da84aebb2d57400e711db81a7fb2066960a4a5d62646 -#+containers.a7b06b404e9ec0e90aec3c481edf741760160bcea4db925cbb4f4cb00396bcbf +#+containers.8b10e7c03e2c97899c1773ebbaf3f28e44e5cace723efe25351d2fb8816c24db #+fileset.fcfea6720139be582e3965b24d2108255630885151a828277af411b00bab2ada -#+logincaps.a1e81f6449ada16c57ab617c04fae084d315d3672c7d24866d28a2471ad789b1 +#+logincaps.19202928e5e43c82a6039d6767d9567170e573d2f0cc859455177a39fbc1376e #+snaprep.f41f059833b1a2cec7d9244722aa946369ffdafbd63193c58373b28cc093cca4 #+curl.0a5cb18e2f48797cb2f2a84521b21abcd5ef59d95df69b9b0071fadfacbaabb8 #+git.6fd80b5dd8754a6a3766cf996266abbfb7765ecebf7a0b941bf00482868ca7ad @@ -78,7 +78,7 @@ #+iconv.c391d9ee11dab8fe332587d431b1923c89b12dc3bb5e7f2df9ae75d993913c35 #+libcap.1e601a94669ea476a228360a5cf63a6fcec3177f6278ac306640b75d8ba3b3c3 #+applyuidgid-caps.ea806c9e07944988135ad6f1e1fc0df09fcf23f4b1d2f983fc524d962343679e -#+ccx-utils.8f12a4d54e928a8ddfa6ead1aa05e0aa1dc8987def8196a664e52a5b5ddd1650 +#+ccx-utils.839a3b8e3f4ec5c7e3d5902cbfcb576dd1893fd9b95b2a4f4879f7623feaf61e #+user-env.ed19b3b439b17e63aac65cce2aea66a27140fa2b9abe1cf9f0e7e85d59912197 #+strace.0803e7c883250002b7710c4d4c40ffcbec9c4ede5a99e9aedb1eb604eed1b766 #+mlog.2e491abbb88e427e33b28be7e08ccbadee632e499548073c19c82af63911b087 @@ -87,9 +87,9 @@ #+squashfs-tools.3709841b2a7fb047746b6fba97d121ff5562313dcf931a1cc52127715e3877bc #+mandoc.b4490f63fc1316ad2c3bae4f38bf64fa58945586da6485811f1183a01f2a8e92 #+tinyssh.40e2567a4492d962fffc882eec990eae4b768ec933fd749036719fc294a5b52b -#+system-config.2f0130974f0e967b6a723a20a797aac82a53b9d72a17632c831eea91cece7486 -#+system-config-rc.3683c44183f40a826359d33b59796a6f82a4228706d05943f32b422eae6a5fc7 +#+system-config.6a6c41eeed3ceb9893bd8f6dafacd1d51eb685e343d65bd86cfe9d0fb3b9a05c +#+system-config-rc.4749686b80f95c070a90bd642032374ddfa6e40f9a5e43c20eff9a9dd304fac9 #+system-config-scripts.dcaa5fe77baeda61721cace675f21abcbe0989c31569104aa34ccd6c3cfbc9d3 -#+system-config-init.d2dad41b7afcabdea2f9bf9a312bfd294b611f59c29d91ccc59fc3de2cce6a0c +#+system-config-init.9398b1a298b2ee43d529d180dd0a073176336f490e43db1aa2b95aeeadd09bf5 #+system-config-zsh.608ec26b63e1ac268607a8ba41fbc495966ad45f81f1ced4c4c547267680bb13 #+busybox-modutils.f424154ecd9e763d06daf39d5b6bbcd5055b977c1cfaced5b87bb7731f4a243a \ No newline at end of file diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -30,7 +30,7 @@ #+pthbs-banginstall.19b222e1e513c368cf533bb6d23140770b774891404054c7918df6248283aa68 #+execline.3d599b8858d656c006ad21f504a7d2a23b63e1279708e406a6194d71978db2b7 #+musl-cross-make.4e31ccacab5cc8de22091926201823288206e2471d5991c3fa8db8b8f5c1b22b -#+ccx-utils.8f12a4d54e928a8ddfa6ead1aa05e0aa1dc8987def8196a664e52a5b5ddd1650 +#+ccx-utils.839a3b8e3f4ec5c7e3d5902cbfcb576dd1893fd9b95b2a4f4879f7623feaf61e #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps diff --git a/variants/root-x86_64/pthbs_sandbox_ns.environment b/variants/root-x86_64/pthbs_sandbox_ns.environment @@ -1,2 +1,2 @@ #!/usr/bin/env pthbs-build -#+sandbox_root.3d117ba94e5de43a39ad6d6625b5f06756d4922d2f3e7467d777156124f1fa8f- \ No newline at end of file +#+sandbox_root.11e30923180107179762c3bc40b3979da238f1e4e8bcba05b520f8b4f0b5f7ba+ \ No newline at end of file diff --git a/variants/root-x86_64/sandbox_root b/variants/root-x86_64/sandbox_root @@ -3,6 +3,7 @@ #+musl-cross-make.473310ee8dd6c0b20a1b81598700e61a0e38dcfe0b8503bd5cdbb9bf4f9af4fc #+gnu-make.47af7543e52e6b72ac25e13223e2ce78703c58993166ba25c56cba245e48dbfa #+busybox.73a23c9ea571875b0e9e166a6974b6b314b540c8c247783d9cf96e10a59fcd73 +#+skalibs.3cf9424fa5bdf04e00e158aa007b78115e4b903bdbeab001e93fdc6d6d3e7add #@sha256:8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9:argv0exec.c # - build script start - diff --git a/variants/root-x86_64/skalibs:bootstrap b/variants/root-x86_64/skalibs:bootstrap @@ -0,0 +1,120 @@ +#!/usr/bin/env pthbs-build +#+busybox-bzip2.9d87ac159c5af2abf932204167d7dd79a5e2854ec5603817b258b68b5584c07c +#+busybox-gzip.1c4e6759f305d884692ed4260879ddf1ca5b722a4b2b8995fd7ac2ff244c1318 +#+busybox-lzop.f4feb74da70e7c871444211871d0fc78da65a9e8ebb6b2d09716cda043d9559f +#+busybox-unzip.3525f1554aa628809b2af9b084dd93fe2a37c8f14dbd514faf0e888c25426073 +#+busybox-xz.ead5b695755cbb0c379db6ee22b83de1da44c6d75a5295889ae4536de2a22e58 +#+busybox-cpio.aae9207efa7aa6f41519f502d53ce4eabb45a70d339a22bf65d89f1aaf7a39de +#+busybox-dpkg.4f8487d22d56efdc91cb2d6263149840ae08d3ff07047357b04d4437f0321f2d +#+busybox-rpm.173468d54d79d9e5630360360e4479f04190c411b81fd1b1ad0139f618dd6b49 +#+busybox-tar.794822cecad4eba7d3977210cc3b83b2dc8011cc18c77d9e0ce5205098cffae8 +#+busybox-ed.afab42d8bf2060655b013c6225efcb43715780ef058e718d6a697e25de0dfa16 +#+busybox-sed.13120e3643a859180c04f69bc441a554327a643b8a8301ec412d412d3ae9e263 +#+busybox-vi.76239b7b2102b4489b0e8a0e86f19030f01d6149fa7310d00504580711d0b0f1 +#+busybox-xxd.f3350b2e6c2d9463bc4d0ac5761b2a3ca4d5b811e651c2c705d6143667656c76 +#+busybox-process-extra.4718339ba96e00c8091bf1348aef03c41cb830463fb26a943788db2c07d43509 +#+busybox-procps.d618aac5f7c813d68a26afdddd97c7989c1ccb671cfa2628642e15573944b541 +#+busybox-psmisc.8e915b0be8aa34811699584be98d8d1532c6fe91b44de921e0cbf527402859ad +#+busybox-ash.ec7c45db8ddc5ce15e4890ac76b9058759c93db13f5a7d7af554888e3c5c593f +#+busybox-bc.3e9cce6408b94240c76671a4d11bcade40182fcb5bcc1cfd1828208bef65a085 +#+busybox-coreutils.9bf9b030f85f1e2273dcd70b660827388694be93e5dbd86e8c812031195508cb +#+busybox-coreutils-extra.8eb2d3d7aee3f89bc564e0da7e1dcf67071e7e49c1ea9b9dcbdba00069d4e247 +#+busybox-daemontools.ff774454c0914cb16b18b038863c4a5a8b7c267eb2a308a9c13b740089ea5727 +#+busybox-grep.acdcecd4d05a4d1c250b30ae8925ee38ed1f787276a99b9e3514b9850159d301 +#+busybox-misc.125f4e5526de9635e0e04ddc5b6ba8c98a9a0e9e817c423b55241a0f0571e0d4 +#+busybox-sh.991f989805551e1b6bb35424114e9339163a4e7c90bb03a946ae71b980936e97 +#+busybox-util-linux-unpriv.1f8b2c8640b56685a72666365d8aece78e21f1ebc8a83b4355bb4111536b7caa +#+busybox-findutils.337e3980f5b5d2a07c3850d24ce41c9cbf70e54a3b8d3b4ed7b258756df0014e +#+busybox-awk.9b2a1cd1da22c09390e41d4448e90c4bde9610143c3d9443ca7665d5d8c42153 +#@pragma:nosandbox +#+musl-cross-make.473310ee8dd6c0b20a1b81598700e61a0e38dcfe0b8503bd5cdbb9bf4f9af4fc +#+gnu-make.47af7543e52e6b72ac25e13223e2ce78703c58993166ba25c56cba245e48dbfa +#+busybox.73a23c9ea571875b0e9e166a6974b6b314b540c8c247783d9cf96e10a59fcd73 +#@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs + + +# - build script start - + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'skalibs' + +export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" +export CXX="$pthbs_build_environment/command/x86_64-linux-musl-g++" +export LD="$pthbs_build_environment/command/x86_64-linux-musl-ld" +export AR="$pthbs_build_environment/command/x86_64-linux-musl-ar" +export CFLAGS="-O2 -ggdb" + +./configure \ + --prefix="$prefix" \ + --sysdepdir="${prefix}/sysdeps" \ + --binprefix="${prefix}/command" \ + --extbinprefix="${prefix}/command" \ + --dynlibdir="${prefix}/library.so" \ + --libdir="${prefix}/library" \ + --includedir="${prefix}/include" \ + --disable-shared --enable-static + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + +make DESTDIR="$pthbs_destdir" install + + + + + +cd "$pthbs_destdir/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN {} + +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 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } +$2 == "command" { link($0); next } +$2 == "bin" { 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|man|doc|icons|terminfo)$/ { link(r1($0)); next } + +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "icons" { link($0); next } +$2 == "terminfo" { 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" } + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + exit 3 + } + } +}' >.install-links.new +mv .install-links.new .install-links + diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -58,7 +58,7 @@ #+s6.d345c9c0a3001a45a503897dbb676f81dd599d268e397f020fb2a250c6c8fb32 #+zsh.12772d67e6fabc9c15a604709a163047576847157566847b5a0fd3a64f0e5066 #+system-config-scripts.dcaa5fe77baeda61721cace675f21abcbe0989c31569104aa34ccd6c3cfbc9d3 -#+logincaps.a1e81f6449ada16c57ab617c04fae084d315d3672c7d24866d28a2471ad789b1 +#+logincaps.19202928e5e43c82a6039d6767d9567170e573d2f0cc859455177a39fbc1376e #+busybox-modutils.f424154ecd9e763d06daf39d5b6bbcd5055b977c1cfaced5b87bb7731f4a243a #@git:ddb20e067ab184cd18ee8b88d74044dfeeaaad4c:system-config @@ -96,7 +96,7 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.33289b31a6d8701f7cc310de27cff05cf811685f0153c0a354ed501c4a034682' \ + 'pthbs_path_containers=/versions/env.cd08aaee5f2015b07d0ef7323117f6851065a8af330e6a9299e1b2bb817881ec' \ 'pthbs_path_mdevd=/versions/env.c2194360bfab3b0264df268eac407b86f5b1906a68d0fe0bcc2599d002fe72ee' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -50,7 +50,7 @@ #+s6-portable-utils.1462bc1c5e5e0fc88b57013213cc91993a3365893928ef09136f7243a3a7d3fe #+s6-linux-init.de5dcc645d1fc4a1fb65c9fa35e03487d52fdf02afb87fa530bb46705074af28 #+execline.3d599b8858d656c006ad21f504a7d2a23b63e1279708e406a6194d71978db2b7 -#+system-config-rc.3683c44183f40a826359d33b59796a6f82a4228706d05943f32b422eae6a5fc7 +#+system-config-rc.4749686b80f95c070a90bd642032374ddfa6e40f9a5e43c20eff9a9dd304fac9 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.3683c44183f40a826359d33b59796a6f82a4228706d05943f32b422eae6a5fc7/config/s6-rc-db +s6rcdb=/versions/system-config-rc.4749686b80f95c070a90bd642032374ddfa6e40f9a5e43c20eff9a9dd304fac9/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,7 +29,7 @@ #+busybox-diffutils.9b52fd5ef8d705039558ba31d05f7933c588d7fe6f2a223a2ffece523ae679a3 #+s6-rc.7a62f2fa46fd932d91e483f9efeef01cd92b2e184fdfa434d82f4bbaae1093dc #+fileset.fcfea6720139be582e3965b24d2108255630885151a828277af411b00bab2ada -#+system-config.2f0130974f0e967b6a723a20a797aac82a53b9d72a17632c831eea91cece7486 +#+system-config.6a6c41eeed3ceb9893bd8f6dafacd1d51eb685e343d65bd86cfe9d0fb3b9a05c # - build script start - @@ -39,7 +39,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.2f0130974f0e967b6a723a20a797aac82a53b9d72a17632c831eea91cece7486/config/s6-rc-source +src=/versions/system-config.6a6c41eeed3ceb9893bd8f6dafacd1d51eb685e343d65bd86cfe9d0fb3b9a05c/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/userspace.environment b/variants/root-x86_64/userspace.environment @@ -65,9 +65,9 @@ #+pthbs-banginstall.19b222e1e513c368cf533bb6d23140770b774891404054c7918df6248283aa68 #+aat.3f29cd1607f2556b48d0b692b27762ec1ab6c2e0cdac8c9de87aa0f4772938cb #+confz.71219162fcc87bca0ee3da84aebb2d57400e711db81a7fb2066960a4a5d62646 -#+containers.a7b06b404e9ec0e90aec3c481edf741760160bcea4db925cbb4f4cb00396bcbf +#+containers.8b10e7c03e2c97899c1773ebbaf3f28e44e5cace723efe25351d2fb8816c24db #+fileset.fcfea6720139be582e3965b24d2108255630885151a828277af411b00bab2ada -#+logincaps.a1e81f6449ada16c57ab617c04fae084d315d3672c7d24866d28a2471ad789b1 +#+logincaps.19202928e5e43c82a6039d6767d9567170e573d2f0cc859455177a39fbc1376e #+snaprep.f41f059833b1a2cec7d9244722aa946369ffdafbd63193c58373b28cc093cca4 #+curl.0a5cb18e2f48797cb2f2a84521b21abcd5ef59d95df69b9b0071fadfacbaabb8 #+git.6fd80b5dd8754a6a3766cf996266abbfb7765ecebf7a0b941bf00482868ca7ad @@ -78,7 +78,7 @@ #+iconv.c391d9ee11dab8fe332587d431b1923c89b12dc3bb5e7f2df9ae75d993913c35 #+libcap.1e601a94669ea476a228360a5cf63a6fcec3177f6278ac306640b75d8ba3b3c3 #+applyuidgid-caps.ea806c9e07944988135ad6f1e1fc0df09fcf23f4b1d2f983fc524d962343679e -#+ccx-utils.8f12a4d54e928a8ddfa6ead1aa05e0aa1dc8987def8196a664e52a5b5ddd1650 +#+ccx-utils.839a3b8e3f4ec5c7e3d5902cbfcb576dd1893fd9b95b2a4f4879f7623feaf61e #+user-env.ed19b3b439b17e63aac65cce2aea66a27140fa2b9abe1cf9f0e7e85d59912197 #+strace.0803e7c883250002b7710c4d4c40ffcbec9c4ede5a99e9aedb1eb604eed1b766 #+mlog.2e491abbb88e427e33b28be7e08ccbadee632e499548073c19c82af63911b087