commit 7b0d8defc590dc7190099b44c13eef0be2aed738 parent f0f4c35e40a3626df4d07292056d6d5a9b15590a Author: Jan Pobrislo <ccx@te2000.cz> Date: Sun, 12 Oct 2025 10:53:40 +0000 update dependencies Diffstat:
31 files changed, 74 insertions(+), 54 deletions(-)
diff --git a/templates/linux b/templates/linux @@ -14,6 +14,7 @@ #+{{pkg_install_name("zstd")}} #+{{pkg_install_name("libelf")}} #+{{pkg_install_name("pkgconf-pkg-config")}} +#+{{pkg_install_name("nawk")}} {%- endblock %} {%- block source_deps %} #@untar:-J:sha256:{{ assertion(tarball_shasum) }}:. diff --git a/templates/pkg/container-bin-image b/templates/pkg/container-bin-image @@ -10,6 +10,7 @@ #+{{pkg_install_name("easyseccomp")}} #+{{pkg_install_name("mlog")}} #+{{pkg_install_name("abduco")}} +#+{{pkg_install_name("nawk")}} #@sha256:{{files["default-policy.easyseccomp"]}}:default-policy.easyseccomp img="$pthbs_destdir{{versions}}/$pthbs_package/container-bin-image" diff --git a/templates/pkg/rsync b/templates/pkg/rsync @@ -4,6 +4,10 @@ {%- block template_deps -%} #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("busybox-findutils")}} +#+{{pkg_install_name("busybox-diffutils")}} +#+{{pkg_install_name("musl-cross-make")}} +#+{{pkg_install_name("gnu-make")}} +#+{{pkg_install_name("m4")}} #+{{pkg_install_name("nawk")}} {% endblock %} {% block package_deps -%} diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+linux.0e7019b2429ef8045a3b3ebb895a806f4f4bc411af32a3dd8179def16c94a56d +#+linux.288fbf869e7c0fd0d0b7d3a4f8d9b711702786ca30e63e8baf62e78eba64fd3c #+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 #+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 #+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 @@ -19,7 +19,7 @@ export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" # TODO: indirection via deps directory/symlink cat >>.config <<EOF -CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.0e7019b2429ef8045a3b3ebb895a806f4f4bc411af32a3dd8179def16c94a56d" +CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.288fbf869e7c0fd0d0b7d3a4f8d9b711702786ca30e63e8baf62e78eba64fd3c" EOF make oldconfig cat .config diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -9,6 +9,7 @@ #+easyseccomp.af84beb50c33e6d8b1f23ee4a97d72f0125cbb5e9d13d25e7b58383db704eac0 #+mlog.c0d5e836f8984a8b0585f733803406a55af721d2c6a801c258c12d6f018ff265 #+abduco.26a66d072630a994a1b65b6f04564e4e5fd528f45f904be72100d339e4d4e20c +#+nawk.95266c0a77df6e3d349e21ff3abeeb5fe592e709b68d404d309ae2354f1d88dc #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp img="$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image" diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -8,7 +8,7 @@ #+alpine-keys.58bebde51040883604dce6835fa612726a30edbc1e2316a56978844b4f4ae2b9 #+apk-tools.03fd78fe7f2e530cb1f31747d4312993234a5dee49b774e4dbe8d8b7fca52497 #+xbps.d273af22a950cf03d2a50e6467e154e675d36158048084c9ade06058397769d5 -#+container-bin-image.de3bf52ca80a3817616e6c9e88231db6354a73cb4fea972006f18d345b4a915f +#+container-bin-image.3cabde59ef75c3edb7a0735eaecb70ebba75b5ca7479acfeb64f941e8a8202e9 #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -65,9 +65,9 @@ for f in '/home/ccx/versions/xbps.d273af22a950cf03d2a50e6467e154e675d36158048084 ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.de3bf52ca80a3817616e6c9e88231db6354a73cb4fea972006f18d345b4a915f/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.de3bf52ca80a3817616e6c9e88231db6354a73cb4fea972006f18d345b4a915f/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.de3bf52ca80a3817616e6c9e88231db6354a73cb4fea972006f18d345b4a915f/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.3cabde59ef75c3edb7a0735eaecb70ebba75b5ca7479acfeb64f941e8a8202e9/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.3cabde59ef75c3edb7a0735eaecb70ebba75b5ca7479acfeb64f941e8a8202e9/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.3cabde59ef75c3edb7a0735eaecb70ebba75b5ca7479acfeb64f941e8a8202e9/container-bin-image' "${dest}/deps/" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -7,7 +7,7 @@ #+s6-linux-utils.4a323d35432e0053a85d533ec7287651d09cefdd8a120123f28c033a554c78a4 #+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 #+confz.155a70ee2503a664d69bb4b237d8429774222dc16775acc84ea5384f8af5e9bc -#+containers.e5a9d4f9d431aad394f979a64b488fdc2205f3b1650c18c4583eb35dab17aff1 +#+containers.c7f96184008258b9cceaf47cb26f21d3121148a427fafc65c4a07b7fffa4146f #+xbps.d273af22a950cf03d2a50e6467e154e675d36158048084c9ade06058397769d5 #+zstd.aac484e44794778f679bce88460e328d01fd19c989144210a657574b5e5db32d #+apk-tools.03fd78fe7f2e530cb1f31747d4312993234a5dee49b774e4dbe8d8b7fca52497 diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -6,7 +6,7 @@ #+patch.51de61405f80dd71c74dd66dc7c97833138819e4fdd78bb602d7d6a37e49de0e #+flex.a088c11e6bdc6eb3d56de355f2d5c82cab0e1e791fede489c16d43435c45b227 #+bison.71b7638246cfc2a542d940b5fc0f57bcc2007e69ba1f08e8822c56669a39716b -#+rsync.b168e35afa76fe21eac31306e80565f1d0518b3b24796d1e2117ae17cdc62bc4 +#+rsync.2e238c424d15e48d3ce9d2d0af370f8dab33847437e1612ab265f9f578f48bf5 #+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd #+s6.604b12a6fd49b7ff2919bfaafa8ee6b132ad71343c986e51e4eb08d90fbca77d #+s6-rc.feef6fa41ea7d394f1cf64f84116d4caac4f21e98961bc19271d32b00e6a5e83 @@ -21,7 +21,7 @@ #+pthbs-banginstall.33a2a1540423a89b403d1963cca27c181fcb70e9c37d228c4879db86189d0892 #+aat.b2d63f4c4fc9aa8c9e26d55490a23f4ca0e4b3ddfcb1caac749c11992488987a #+confz.155a70ee2503a664d69bb4b237d8429774222dc16775acc84ea5384f8af5e9bc -#+containers.e5a9d4f9d431aad394f979a64b488fdc2205f3b1650c18c4583eb35dab17aff1 +#+containers.c7f96184008258b9cceaf47cb26f21d3121148a427fafc65c4a07b7fffa4146f #+fileset.8f2bf3aa13d26cdff360771ebf76140ce518eb7fb4df6608779ab62c7ce136a0 #+logincaps.b503228b40715b83d9e660b86afe1232d3f18cdd736cec1a0fc22f0735c0f5ae #+snaprep.8c2e1749125f85d962312a28719227e643c8ead2da1f85f1931906b97ad3be7d @@ -38,8 +38,8 @@ #+user-env.afd6b4b0140d1bd1e26e22bd700c793045818dfdbb25c245e5595ad9fbc415c9 #+strace.009594fb6e828f679dd3ad05928dccf1e8dcb46e84eaa221cc167715f84e8b5c #+mlog.c0d5e836f8984a8b0585f733803406a55af721d2c6a801c258c12d6f018ff265 -#+system-config.2996962cb7a156eed63f8ebdf3f5591fdcc590e07b9d2b26527757cc710b9401 -#+system-config-rc.9c8669a0832f15ebd32b9141abd0ec65b2b2a7f5fead59b9658ebd9695bddf04 +#+system-config.c8ffc5b64c94698a8cd745a64b4740423ae4ed4ab3646a8b2109650cb2db3db6 +#+system-config-rc.9463c34811873b9483799cc641855646d1eeb1e783724139dc07f97209c77b82 #+system-config-scripts.17fd9ae700758b49dbd9bfa9bca824e0ee457b7f2aa919d0c2ab3020510b63c9 -#+system-config-init.2f3eb4c21ad00cc0315f871f6ffaa2cd11c6fb0536a2a615763cd30ae56c5576 +#+system-config-init.46feb8142d8ed04f9deecde4d752d03cd76807cbdf099ea7a4a1350d502821e1 #+system-config-zsh.d8ec2fff713aea297e5f64367a0f15fc534611ecfe04a8d177ac11ab06c395dc \ No newline at end of file diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment @@ -1,3 +1,3 @@ #!/usr/bin/env pthbs-build -#+linux.0e7019b2429ef8045a3b3ebb895a806f4f4bc411af32a3dd8179def16c94a56d -#+busybox.f2a8068f4064b5996add2e0af276abfb1a06b7534a666710c912fb4247ae3682- \ No newline at end of file +#+linux.288fbf869e7c0fd0d0b7d3a4f8d9b711702786ca30e63e8baf62e78eba64fd3c +#+busybox.bddb3b4d750834713312e21156792d5a07b86383539ee3c0d45da80eae2f6e48+ \ No newline at end of file diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux @@ -8,10 +8,11 @@ #+patch.51de61405f80dd71c74dd66dc7c97833138819e4fdd78bb602d7d6a37e49de0e #+flex.a088c11e6bdc6eb3d56de355f2d5c82cab0e1e791fede489c16d43435c45b227 #+bison.71b7638246cfc2a542d940b5fc0f57bcc2007e69ba1f08e8822c56669a39716b -#+rsync.b168e35afa76fe21eac31306e80565f1d0518b3b24796d1e2117ae17cdc62bc4 +#+rsync.2e238c424d15e48d3ce9d2d0af370f8dab33847437e1612ab265f9f578f48bf5 #+zstd.aac484e44794778f679bce88460e328d01fd19c989144210a657574b5e5db32d #+libelf.7e79bec411a1c99de9e57086076af58805b8c952fd53c618d724b156970511b4 #+pkgconf-pkg-config.25de9633be5d2988c4d3c857305fdeab61f86776b8879b8266bca089142001ad +#+nawk.95266c0a77df6e3d349e21ff3abeeb5fe592e709b68d404d309ae2354f1d88dc #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest @@ -8,10 +8,11 @@ #+patch.51de61405f80dd71c74dd66dc7c97833138819e4fdd78bb602d7d6a37e49de0e #+flex.a088c11e6bdc6eb3d56de355f2d5c82cab0e1e791fede489c16d43435c45b227 #+bison.71b7638246cfc2a542d940b5fc0f57bcc2007e69ba1f08e8822c56669a39716b -#+rsync.b168e35afa76fe21eac31306e80565f1d0518b3b24796d1e2117ae17cdc62bc4 +#+rsync.2e238c424d15e48d3ce9d2d0af370f8dab33847437e1612ab265f9f578f48bf5 #+zstd.aac484e44794778f679bce88460e328d01fd19c989144210a657574b5e5db32d #+libelf.7e79bec411a1c99de9e57086076af58805b8c952fd53c618d724b156970511b4 #+pkgconf-pkg-config.25de9633be5d2988c4d3c857305fdeab61f86776b8879b8266bca089142001ad +#+nawk.95266c0a77df6e3d349e21ff3abeeb5fe592e709b68d404d309ae2354f1d88dc #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync @@ -1,6 +1,10 @@ #!/usr/bin/env pthbs-build #+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 #+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b +#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 +#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 +#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 +#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a #+nawk.95266c0a77df6e3d349e21ff3abeeb5fe592e709b68d404d309ae2354f1d88dc #+popt.1e9593ce9879a8ae8a460d9c15e1d1c5326d010db4bf4719b1621ba91ac8c954 #+libressl.4903279cae354038b843858499d622441a5f5d513ef112a433426aabd13d2681 diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -6,7 +6,7 @@ #+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 #+aat.b2d63f4c4fc9aa8c9e26d55490a23f4ca0e4b3ddfcb1caac749c11992488987a #+fileset.8f2bf3aa13d26cdff360771ebf76140ce518eb7fb4df6608779ab62c7ce136a0 -#+rsync.b168e35afa76fe21eac31306e80565f1d0518b3b24796d1e2117ae17cdc62bc4 +#+rsync.2e238c424d15e48d3ce9d2d0af370f8dab33847437e1612ab265f9f578f48bf5 #+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd #+kbd.5f600808cccceeb968817c54462379debe666d0c059f96e5c37db3721232e4b5 #+mdevd.6bbdbe0816713e1d3fd8efa7b0e0feea81f1e0f7fb16094f1d865c1d7ea7f8c9 @@ -51,7 +51,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.03fffb08936a362e3703503c909ac6df38f6927b0ffbc24583549e16be53b2f0' \ + 'pthbs_path_containers=/home/ccx/versions/env.5b9167386d0855572e0e2b3ec92d142dc53ebbcb9bc525e5509a896c7aef39d9' \ 'pthbs_path_mdevd=/home/ccx/versions/env.46c818a59c028a927c18e0b3899e2df04f031e6df49b5fd7989a5edf98ad5b06' \ 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 @@ -7,7 +7,7 @@ #+s6-portable-utils.c4de6cbd4f1c6423c883663e39ecea5379676a6bce756a8e088b2da0eef103ea #+s6-linux-init.de4539871eeacffb12c5e8fbf676d8dba59f1105d40e8626fd096ba532aeb7df #+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd -#+system-config-rc.9c8669a0832f15ebd32b9141abd0ec65b2b2a7f5fead59b9658ebd9695bddf04 +#+system-config-rc.9463c34811873b9483799cc641855646d1eeb1e783724139dc07f97209c77b82 # - build script start - @@ -30,7 +30,7 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/home/ccx/versions/system-config-rc.9c8669a0832f15ebd32b9141abd0ec65b2b2a7f5fead59b9658ebd9695bddf04/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.9463c34811873b9483799cc641855646d1eeb1e783724139dc07f97209c77b82/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 @@ -5,7 +5,7 @@ #+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 #+s6-rc.feef6fa41ea7d394f1cf64f84116d4caac4f21e98961bc19271d32b00e6a5e83 #+fileset.8f2bf3aa13d26cdff360771ebf76140ce518eb7fb4df6608779ab62c7ce136a0 -#+system-config.2996962cb7a156eed63f8ebdf3f5591fdcc590e07b9d2b26527757cc710b9401 +#+system-config.c8ffc5b64c94698a8cd745a64b4740423ae4ed4ab3646a8b2109650cb2db3db6 # - build script start - @@ -14,7 +14,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/home/ccx/versions/system-config.2996962cb7a156eed63f8ebdf3f5591fdcc590e07b9d2b26527757cc710b9401/config/s6-rc-source +src=/home/ccx/versions/system-config.c8ffc5b64c94698a8cd745a64b4740423ae4ed4ab3646a8b2109650cb2db3db6/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 @@ -6,7 +6,7 @@ #+patch.51de61405f80dd71c74dd66dc7c97833138819e4fdd78bb602d7d6a37e49de0e #+flex.a088c11e6bdc6eb3d56de355f2d5c82cab0e1e791fede489c16d43435c45b227 #+bison.71b7638246cfc2a542d940b5fc0f57bcc2007e69ba1f08e8822c56669a39716b -#+rsync.b168e35afa76fe21eac31306e80565f1d0518b3b24796d1e2117ae17cdc62bc4 +#+rsync.2e238c424d15e48d3ce9d2d0af370f8dab33847437e1612ab265f9f578f48bf5 #+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd #+s6.604b12a6fd49b7ff2919bfaafa8ee6b132ad71343c986e51e4eb08d90fbca77d #+s6-rc.feef6fa41ea7d394f1cf64f84116d4caac4f21e98961bc19271d32b00e6a5e83 @@ -21,7 +21,7 @@ #+pthbs-banginstall.33a2a1540423a89b403d1963cca27c181fcb70e9c37d228c4879db86189d0892 #+aat.b2d63f4c4fc9aa8c9e26d55490a23f4ca0e4b3ddfcb1caac749c11992488987a #+confz.155a70ee2503a664d69bb4b237d8429774222dc16775acc84ea5384f8af5e9bc -#+containers.e5a9d4f9d431aad394f979a64b488fdc2205f3b1650c18c4583eb35dab17aff1 +#+containers.c7f96184008258b9cceaf47cb26f21d3121148a427fafc65c4a07b7fffa4146f #+fileset.8f2bf3aa13d26cdff360771ebf76140ce518eb7fb4df6608779ab62c7ce136a0 #+logincaps.b503228b40715b83d9e660b86afe1232d3f18cdd736cec1a0fc22f0735c0f5ae #+snaprep.8c2e1749125f85d962312a28719227e643c8ead2da1f85f1931906b97ad3be7d diff --git a/variants/ccx-x86_64/vm.environment b/variants/ccx-x86_64/vm.environment @@ -1,2 +1,2 @@ #!/usr/bin/env pthbs-build -#+linux-qemu-guest.dd75b740f55938d315106833a213bfe342671fc214c9d5630069a5e23ffcfb8a- \ No newline at end of file +#+linux-qemu-guest.324deec9db10d19cf23d69d0f009f95bd3c0d8b82542e1aa95614ecb48f682f5+ \ No newline at end of file diff --git a/variants/root-x86_64/busybox:modutils b/variants/root-x86_64/busybox:modutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+linux.3650c56093e025b5640a7e7d63a97b83250f1e32b6d6f374eb016770eee27ad7 +#+linux.9b34bb4ddcc3c62a84044d57212a9009834ba5e699b293c68ba9f3150b465b49 #+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f #+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 #+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 @@ -19,7 +19,7 @@ export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" # TODO: indirection via deps directory/symlink cat >>.config <<EOF -CONFIG_DEFAULT_MODULES_DIR="/versions/linux.3650c56093e025b5640a7e7d63a97b83250f1e32b6d6f374eb016770eee27ad7" +CONFIG_DEFAULT_MODULES_DIR="/versions/linux.9b34bb4ddcc3c62a84044d57212a9009834ba5e699b293c68ba9f3150b465b49" EOF make oldconfig cat .config diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -9,6 +9,7 @@ #+easyseccomp.5b93c8d724fe8a50d55bb36ed1e937340493f5c476fe3532d23a1eb72ffc3d1d #+mlog.c48f05cded0201d5691b18c8b0e9aff7519f56fe46f179be9a435b04882b5385 #+abduco.07fe16db834dfa2c6237b919de40137f178af691f0200bd3d2f1627c2985d926 +#+nawk.e1fac420282f395b24353ae0989a34f026c69d207ecf2a2f06cd1c1dec994b0c #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp img="$pthbs_destdir/versions/$pthbs_package/container-bin-image" diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -8,7 +8,7 @@ #+alpine-keys.dd8a17f274c1167c3a382e55053b4d0726754566a6f3a23bbdb759154d37fb19 #+apk-tools.3b13432e779174066e5f021a0f2c1b69ba49ef0c630d73cb3aaae0e7872bc0f3 #+xbps.85431302b073baea8affa1e2db18beef1527085fccf2ea337e992a6ad0add57e -#+container-bin-image.5f1e10cfbda7dff3f60f7a65483f80cc76868440956701fa5e91473deb55c4db +#+container-bin-image.616bee27ca218e742dc8601cb31523b4053b4d856038856e3a3fd3915522a750 #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -65,9 +65,9 @@ for f in '/versions/xbps.85431302b073baea8affa1e2db18beef1527085fccf2ea337e992a6 ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.5f1e10cfbda7dff3f60f7a65483f80cc76868440956701fa5e91473deb55c4db/container-bin-image' -test -f '/versions/container-bin-image.5f1e10cfbda7dff3f60f7a65483f80cc76868440956701fa5e91473deb55c4db/container-bin-image/if' -ln -sf '/versions/container-bin-image.5f1e10cfbda7dff3f60f7a65483f80cc76868440956701fa5e91473deb55c4db/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.616bee27ca218e742dc8601cb31523b4053b4d856038856e3a3fd3915522a750/container-bin-image' +test -f '/versions/container-bin-image.616bee27ca218e742dc8601cb31523b4053b4d856038856e3a3fd3915522a750/container-bin-image/if' +ln -sf '/versions/container-bin-image.616bee27ca218e742dc8601cb31523b4053b4d856038856e3a3fd3915522a750/container-bin-image' "${dest}/deps/" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -7,7 +7,7 @@ #+s6-linux-utils.e4f5091500532a84cf1d68cf4df5be3b704001d361b04e095e2ab84a1f95d5f7 #+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 #+confz.76415f9081e61265f1fbeb9734e2c474f3f8ca8c82cdf61abcbb1914f786e6cb -#+containers.e61ccf0dd6a7d3a93870e28319b7c21603ab6692fe7018c800f2cfd9e5f2c5ab +#+containers.9decf07ad14724d4a176e14bebeba182c776cd55f0ea1432099c4beec34cab3b #+xbps.85431302b073baea8affa1e2db18beef1527085fccf2ea337e992a6ad0add57e #+zstd.e93db0a4cfbbf41f96814ef6d3b312631b3cc387dac4b6fbe7d92510a77464e8 #+apk-tools.3b13432e779174066e5f021a0f2c1b69ba49ef0c630d73cb3aaae0e7872bc0f3 diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -6,7 +6,7 @@ #+patch.25b984e8ff99f7a5947a292dc3e93e47267a22d5fea8fd87625b8490b1716b0d #+flex.08bfdd6921a0b95c720d067c85006daca6cc9ae3bc582399a05d02ccfe0af4bb #+bison.c93caecb278b5de0c40a62b0db11b5d6d8c9f3245dffff8e704b657838988e64 -#+rsync.8e1bca7a71b8186d2d5e333e21add8ea9d4f0cb4a34ff1f5521a28afb4724c4f +#+rsync.80c7d5df6da1dff4a4c76a08a26488117bb589bfe3252863a07459eebdc2df97 #+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 #+s6.306b870f8a592df29be4fb55361fa57aa0ca47f0eae4c7fade76fb3d621d174a #+s6-rc.ecb2d1c093f53f53f75b156f0c35b9c6294af4ab33fee572c9d2acef6f00ebdd @@ -21,7 +21,7 @@ #+pthbs-banginstall.03c21a68212dceab1d32648c357ac5a54dd0f8a32bdbc4096be43f5f83d4e112 #+aat.5a89398ac400dae8001f1dc5a9f6985725031680d80479de3e0c8f0df5e3a8a6 #+confz.76415f9081e61265f1fbeb9734e2c474f3f8ca8c82cdf61abcbb1914f786e6cb -#+containers.e61ccf0dd6a7d3a93870e28319b7c21603ab6692fe7018c800f2cfd9e5f2c5ab +#+containers.9decf07ad14724d4a176e14bebeba182c776cd55f0ea1432099c4beec34cab3b #+fileset.ecc4de9de12b9899c248dfb9489237b78aa7fbc41ef37e17e818fe72af8d5a1e #+logincaps.4d3b3b039757c80c41631ce703bcc807012dc04cd1208df78affb27855094c27 #+snaprep.e917df6685526517ebadb25b973ab11450146219be491a1aa74de59f6da7198c @@ -38,8 +38,8 @@ #+user-env.d9f705e45905a235a71e8b3904a8c6db4f88ad60c6c1be98fdca2630ab67d92e #+strace.b1b6f36c338b219b442b8d8845717028677bb12becac6ffbc785d8cd35770ae6 #+mlog.c48f05cded0201d5691b18c8b0e9aff7519f56fe46f179be9a435b04882b5385 -#+system-config.332586c9c5273b276018d944ad2f0bd7402c48006ec15173a3686e5197a28d98 -#+system-config-rc.4d0a5bb2f9f6ed83871099d06eda919a073dedf5addcfe3ca8c6d2a5ff3548b2 +#+system-config.9a1d8f8163f1eab41a2ff9c62bc32589ca519afbdddd57a4a365343246fe9ef3 +#+system-config-rc.fca674fad7bbd87b264b2bd15306bc1f575295770ccc81c177da82cd68fd1ffe #+system-config-scripts.97f2fd113bc99e2cf0ed333678567c348af9a90b64c1b8ef68a808a57919314f -#+system-config-init.d6533fcc2e57d3246d22fa80e62f99f9ba62541a00ca68801ac197616a119ae3 +#+system-config-init.03c5bea5839ecb984d99dd32f3a9d4a393781a0960da01ddf02160bd7b5328b4 #+system-config-zsh.3f77f2ea795e3b6063cf31610edd4cd3ae7c682a2f329341df6fc910729fa517 \ No newline at end of file diff --git a/variants/root-x86_64/kernel.environment b/variants/root-x86_64/kernel.environment @@ -1,3 +1,3 @@ #!/usr/bin/env pthbs-build -#+linux.3650c56093e025b5640a7e7d63a97b83250f1e32b6d6f374eb016770eee27ad7 -#+busybox.13a04290cdd5bce1607d392d33665c85aef8bd7ebb204c037aeda071284e3c4a- \ No newline at end of file +#+linux.9b34bb4ddcc3c62a84044d57212a9009834ba5e699b293c68ba9f3150b465b49 +#+busybox.c6a2ffb6dccfad438916b8f0f8f28c201b1cca249f557ab3ecb96d3dd18b4f83+ \ No newline at end of file diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux @@ -8,10 +8,11 @@ #+patch.25b984e8ff99f7a5947a292dc3e93e47267a22d5fea8fd87625b8490b1716b0d #+flex.08bfdd6921a0b95c720d067c85006daca6cc9ae3bc582399a05d02ccfe0af4bb #+bison.c93caecb278b5de0c40a62b0db11b5d6d8c9f3245dffff8e704b657838988e64 -#+rsync.8e1bca7a71b8186d2d5e333e21add8ea9d4f0cb4a34ff1f5521a28afb4724c4f +#+rsync.80c7d5df6da1dff4a4c76a08a26488117bb589bfe3252863a07459eebdc2df97 #+zstd.e93db0a4cfbbf41f96814ef6d3b312631b3cc387dac4b6fbe7d92510a77464e8 #+libelf.014dcdeaf3576b2f2555d1be7c3ed1b08cc0f8cac19f8615c135f47b1fe99af2 #+pkgconf-pkg-config.08a039239431e2258a55fb75f79700c49900da61f0a8a85665bfc6831b7ee225 +#+nawk.e1fac420282f395b24353ae0989a34f026c69d207ecf2a2f06cd1c1dec994b0c #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest @@ -8,10 +8,11 @@ #+patch.25b984e8ff99f7a5947a292dc3e93e47267a22d5fea8fd87625b8490b1716b0d #+flex.08bfdd6921a0b95c720d067c85006daca6cc9ae3bc582399a05d02ccfe0af4bb #+bison.c93caecb278b5de0c40a62b0db11b5d6d8c9f3245dffff8e704b657838988e64 -#+rsync.8e1bca7a71b8186d2d5e333e21add8ea9d4f0cb4a34ff1f5521a28afb4724c4f +#+rsync.80c7d5df6da1dff4a4c76a08a26488117bb589bfe3252863a07459eebdc2df97 #+zstd.e93db0a4cfbbf41f96814ef6d3b312631b3cc387dac4b6fbe7d92510a77464e8 #+libelf.014dcdeaf3576b2f2555d1be7c3ed1b08cc0f8cac19f8615c135f47b1fe99af2 #+pkgconf-pkg-config.08a039239431e2258a55fb75f79700c49900da61f0a8a85665bfc6831b7ee225 +#+nawk.e1fac420282f395b24353ae0989a34f026c69d207ecf2a2f06cd1c1dec994b0c #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync @@ -1,6 +1,10 @@ #!/usr/bin/env pthbs-build #+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 #+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 +#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 +#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f +#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 +#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de #+nawk.e1fac420282f395b24353ae0989a34f026c69d207ecf2a2f06cd1c1dec994b0c #+popt.703053a37e8308e67d8491a7a780b3d3f1924dd8653af22f4c38c828fd85e5ef #+libressl.8937d3785f0dcacc7501cbcd3dcee7f402d52e4932a9ed50837f00162a93ae5c diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -6,7 +6,7 @@ #+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 #+aat.5a89398ac400dae8001f1dc5a9f6985725031680d80479de3e0c8f0df5e3a8a6 #+fileset.ecc4de9de12b9899c248dfb9489237b78aa7fbc41ef37e17e818fe72af8d5a1e -#+rsync.8e1bca7a71b8186d2d5e333e21add8ea9d4f0cb4a34ff1f5521a28afb4724c4f +#+rsync.80c7d5df6da1dff4a4c76a08a26488117bb589bfe3252863a07459eebdc2df97 #+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 #+kbd.7398e467f358ea7054216df63b9cdc33113eb2ac6158d581591ba1e38fd99a05 #+mdevd.1bccea6d481d077964a03f9afc681b0bdcd7ed93383de4d5abef9cd0c1e8bb63 @@ -51,7 +51,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.8ad8c8e9c82a4dea0a721689ba09d085788e40a8f29199a53693ddfd103e7563' \ + 'pthbs_path_containers=/versions/env.1ac41d4d874d18bc405c1c1ab1f0b318fac4c416f922cd371f421425bef1eeb1' \ 'pthbs_path_mdevd=/versions/env.88c87b81baa2869c9d908cf0b96e8fbb746f3f101e3b7a5b12a3d548753f0d74' \ 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 @@ -7,7 +7,7 @@ #+s6-portable-utils.4d82247fe3c1350dfe9e4fc89f2f17c7458acc78e2856a10d9554c17c2ce6cd3 #+s6-linux-init.96d69d113f1b0d8549ee3d0a40c96721f5600be1c29f7c4a5baa0eb1c7419baf #+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 -#+system-config-rc.4d0a5bb2f9f6ed83871099d06eda919a073dedf5addcfe3ca8c6d2a5ff3548b2 +#+system-config-rc.fca674fad7bbd87b264b2bd15306bc1f575295770ccc81c177da82cd68fd1ffe # - build script start - @@ -30,7 +30,7 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/versions/system-config-rc.4d0a5bb2f9f6ed83871099d06eda919a073dedf5addcfe3ca8c6d2a5ff3548b2/config/s6-rc-db +s6rcdb=/versions/system-config-rc.fca674fad7bbd87b264b2bd15306bc1f575295770ccc81c177da82cd68fd1ffe/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 @@ -5,7 +5,7 @@ #+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 #+s6-rc.ecb2d1c093f53f53f75b156f0c35b9c6294af4ab33fee572c9d2acef6f00ebdd #+fileset.ecc4de9de12b9899c248dfb9489237b78aa7fbc41ef37e17e818fe72af8d5a1e -#+system-config.332586c9c5273b276018d944ad2f0bd7402c48006ec15173a3686e5197a28d98 +#+system-config.9a1d8f8163f1eab41a2ff9c62bc32589ca519afbdddd57a4a365343246fe9ef3 # - build script start - @@ -14,7 +14,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/versions/system-config.332586c9c5273b276018d944ad2f0bd7402c48006ec15173a3686e5197a28d98/config/s6-rc-source +src=/versions/system-config.9a1d8f8163f1eab41a2ff9c62bc32589ca519afbdddd57a4a365343246fe9ef3/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 @@ -6,7 +6,7 @@ #+patch.25b984e8ff99f7a5947a292dc3e93e47267a22d5fea8fd87625b8490b1716b0d #+flex.08bfdd6921a0b95c720d067c85006daca6cc9ae3bc582399a05d02ccfe0af4bb #+bison.c93caecb278b5de0c40a62b0db11b5d6d8c9f3245dffff8e704b657838988e64 -#+rsync.8e1bca7a71b8186d2d5e333e21add8ea9d4f0cb4a34ff1f5521a28afb4724c4f +#+rsync.80c7d5df6da1dff4a4c76a08a26488117bb589bfe3252863a07459eebdc2df97 #+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 #+s6.306b870f8a592df29be4fb55361fa57aa0ca47f0eae4c7fade76fb3d621d174a #+s6-rc.ecb2d1c093f53f53f75b156f0c35b9c6294af4ab33fee572c9d2acef6f00ebdd @@ -21,7 +21,7 @@ #+pthbs-banginstall.03c21a68212dceab1d32648c357ac5a54dd0f8a32bdbc4096be43f5f83d4e112 #+aat.5a89398ac400dae8001f1dc5a9f6985725031680d80479de3e0c8f0df5e3a8a6 #+confz.76415f9081e61265f1fbeb9734e2c474f3f8ca8c82cdf61abcbb1914f786e6cb -#+containers.e61ccf0dd6a7d3a93870e28319b7c21603ab6692fe7018c800f2cfd9e5f2c5ab +#+containers.9decf07ad14724d4a176e14bebeba182c776cd55f0ea1432099c4beec34cab3b #+fileset.ecc4de9de12b9899c248dfb9489237b78aa7fbc41ef37e17e818fe72af8d5a1e #+logincaps.4d3b3b039757c80c41631ce703bcc807012dc04cd1208df78affb27855094c27 #+snaprep.e917df6685526517ebadb25b973ab11450146219be491a1aa74de59f6da7198c diff --git a/variants/root-x86_64/vm.environment b/variants/root-x86_64/vm.environment @@ -1,2 +1,2 @@ #!/usr/bin/env pthbs-build -#+linux-qemu-guest.99a0a881027dcc55cdc14426403d1f4f65a840a60c635d21d52e94b345e9ec26- \ No newline at end of file +#+linux-qemu-guest.6f8a93fcc1fd1d10225d48d48a515c22b8186b09890a043c37037ff644644bd1+ \ No newline at end of file