commit 67e1fffcafc85670001b3d7efc7553af1e09970c parent 2f8136b33832b200949bb7951f25d0e497475152 Author: Jan Pobrislo <ccx@te2000.cz> Date: Wed, 10 Dec 2025 16:28:56 +0000 link acl binaries statically Diffstat:
26 files changed, 53 insertions(+), 43 deletions(-)
diff --git a/templates/package_sets b/templates/package_sets @@ -244,7 +244,7 @@ #+{{pkg_install_name("mlog")}} #+{{pkg_install_name("findutils")}} #+{{pkg_install_name("nawk")}} -{# #+{{pkg_install_name("vis")}} -#} +#+{{pkg_install_name("vis")}} #+{{pkg_install_name("squashfs-tools")}} #+{{pkg_install_name("mandoc")}} #+{{pkg_install_name("tinyssh")}} diff --git a/templates/pkg/acl b/templates/pkg/acl @@ -4,6 +4,10 @@ {%- block package_deps -%} #+{{pkg_install_name("attr")}} {% endblock %} +{% block configure -%} +CFLAGS="-static $CFLAGS" +{{ super() -}} +{% endblock configure %} {% block check -%} check_static command/chacl diff --git a/variants/ccx-x86_64/acl b/variants/ccx-x86_64/acl @@ -85,6 +85,7 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'acl-2.3.2' +CFLAGS="-static $CFLAGS" build_env_static autotools_config_static 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-qemu-guest.8a65aae7e9edce81a3a81c1da80f14620afdf7d32f2d1136a2c103c3d1f8a6e3 +#+linux-qemu-guest.9565055a5a4f9569a0e3b657228c23003f883556c453d5da86e984e205a1c379 #+musl-cross-make.14e02e45cc77fb5c9787349ef554dda78766f71652b100aee3b00e24a3d02cd1 #+gnu-make.4034f4d785c5108ad387088199242aa8aa6920e7aab1f79ce51d1f43e97cb580 #+busybox.56c53c92327b9fadf0d6015842344b63e07c8b93e2a047453128d7575529d5c4 @@ -60,7 +60,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-qemu-guest.8a65aae7e9edce81a3a81c1da80f14620afdf7d32f2d1136a2c103c3d1f8a6e3" +CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.9565055a5a4f9569a0e3b657228c23003f883556c453d5da86e984e205a1c379" EOF make oldconfig cat .config diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -50,7 +50,7 @@ #+patch.2107bae5d78ad951bd28615d44c983d64e686d320b40f74e4f5137fd9bcc2c6a #+flex.d39167f250ee7e10bded88eb7835bc8b7871aa2a3a60dcab340c4b7bc4b6672a #+bison.97ce4714edbb7c38d86cd484acc46fb0f4e07aa2371be0cb93375de8395ef327 -#+rsync.06ec039b8fc41c4a42bc008f8bc2958d9b5373b50478201941eb2148356496a3 +#+rsync.8233ab6530d2847e697c437c998eaa0060d3ed1c0bc5dc9cfcffa824e5ff81eb #+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92 #+s6.0d5d4703e07c3e5a0d4567706c69119aad5a0e9a37c28bf6b05dd12a27dc1eb1 #+s6-rc.b3ba6e214c85c2f5cb10d42dd9d344798a776c86a200911d7eec95bcc955ef48 @@ -83,12 +83,13 @@ #+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5 #+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 +#+vis.0e025485ab59600dae26803c815f5e32720780936d73286c42e82715f27f360c #+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128 #+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc #+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af -#+system-config.6851c6e594b0aae6dd597a8c019d607c8eeefc95d0340373792294dcc3fa6bcf -#+system-config-rc.34f46f3d206620432b5550fc2560163ef98d82a41c33d2d63c11ba9d30fbc0fd +#+system-config.78e472a9a5c6367ffce1b679c3a1a2ef5566ec8ab34cf1a7da84e17a990d200f +#+system-config-rc.8669564a0e5e146e9649bc9f6201fd0e8dcee1a6a35d37e50cb1c4e2f3491d7d #+system-config-scripts.0c081aa66e7b2b7ccfb20f9c75e5dfff8f8d6804d0b4624934a8059354c14d9e -#+system-config-init.67ed5f61a637c8d2ba974441985ea0f65b4af7b81bbef4f557660b2832847e89 +#+system-config-init.757bf25f2caf8871e22e36bff1de066cc046f557ee8eb40849632d421bcb332a #+system-config-zsh.4fbaba9e3faaa13ba5a2d93a2b3dc4a5a94ebb5ed5bb7facfc94308076a14253 -#+busybox.0811794d51290adedc326ae2728609b3a08a6a7e667720496cfb8d935bc742a2- \ No newline at end of file +#+busybox.ad6d63dfb6426df1757e337508608b4855d9c63ab707b104bbc1123fad947a3b+ \ 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-qemu-guest.8a65aae7e9edce81a3a81c1da80f14620afdf7d32f2d1136a2c103c3d1f8a6e3 -#+busybox.0811794d51290adedc326ae2728609b3a08a6a7e667720496cfb8d935bc742a2- \ No newline at end of file +#+linux-qemu-guest.9565055a5a4f9569a0e3b657228c23003f883556c453d5da86e984e205a1c379 +#+busybox.ad6d63dfb6426df1757e337508608b4855d9c63ab707b104bbc1123fad947a3b+ \ No newline at end of file diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux @@ -34,7 +34,7 @@ #+patch.2107bae5d78ad951bd28615d44c983d64e686d320b40f74e4f5137fd9bcc2c6a #+flex.d39167f250ee7e10bded88eb7835bc8b7871aa2a3a60dcab340c4b7bc4b6672a #+bison.97ce4714edbb7c38d86cd484acc46fb0f4e07aa2371be0cb93375de8395ef327 -#+rsync.06ec039b8fc41c4a42bc008f8bc2958d9b5373b50478201941eb2148356496a3 +#+rsync.8233ab6530d2847e697c437c998eaa0060d3ed1c0bc5dc9cfcffa824e5ff81eb #+zstd.07ebc1d049247600d4df20a2640d366674671001d16f9d046fbef08699a688c0 #+libelf.6f65bfeed188b3b55198dafcf752aeda3c1dc514fcc485e7fc87cc53bd88d72c #+pkgconf-pkg-config.d2f1547322d9ba8762a3aa73f0851720b99a3f5e95eb1531b7f8764f5c61c44f diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest @@ -34,7 +34,7 @@ #+patch.2107bae5d78ad951bd28615d44c983d64e686d320b40f74e4f5137fd9bcc2c6a #+flex.d39167f250ee7e10bded88eb7835bc8b7871aa2a3a60dcab340c4b7bc4b6672a #+bison.97ce4714edbb7c38d86cd484acc46fb0f4e07aa2371be0cb93375de8395ef327 -#+rsync.06ec039b8fc41c4a42bc008f8bc2958d9b5373b50478201941eb2148356496a3 +#+rsync.8233ab6530d2847e697c437c998eaa0060d3ed1c0bc5dc9cfcffa824e5ff81eb #+zstd.07ebc1d049247600d4df20a2640d366674671001d16f9d046fbef08699a688c0 #+libelf.6f65bfeed188b3b55198dafcf752aeda3c1dc514fcc485e7fc87cc53bd88d72c #+pkgconf-pkg-config.d2f1547322d9ba8762a3aa73f0851720b99a3f5e95eb1531b7f8764f5c61c44f diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -47,4 +47,4 @@ #+s6.0d5d4703e07c3e5a0d4567706c69119aad5a0e9a37c28bf6b05dd12a27dc1eb1 #+mdev-scripts.2c27264b06d9d8bfd6ae59af0c511706a7891c94b02d6be072b3cdad53740491 #+mdevd.e5729bee65528cd131ac498226925a35a014741d40214d8e4476f8cb0d97fc36 -#+busybox.0811794d51290adedc326ae2728609b3a08a6a7e667720496cfb8d935bc742a2- \ No newline at end of file +#+busybox.ad6d63dfb6426df1757e337508608b4855d9c63ab707b104bbc1123fad947a3b+ \ No newline at end of file diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync @@ -34,7 +34,7 @@ #+popt.8a3fff8adbdde287881e244444a2aa2c51759401ed68cba59ccd23509dc8918b #+libressl.52dc61e1ae2a68ecd33b56ecd5b6fa148bfb124535d2659e3171693a31b2534b #+zstd.07ebc1d049247600d4df20a2640d366674671001d16f9d046fbef08699a688c0 -#+acl.8f23e302050a7df9dbf9a3c387cea864edfd7b584d9d88da11c193fcea30f7ef +#+acl.60c88fc2b07c5a1b2a3136683fc6ef4e741fa835fb9bffc126af8f5a0eff066f #+attr.60faebe40ebec568f0b6695a55f8094a8ea3e6c21049d1e96a54df7b9b8c8045 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -49,7 +49,7 @@ #+gnu-make.4034f4d785c5108ad387088199242aa8aa6920e7aab1f79ce51d1f43e97cb580 #+aat.9e1a8d84c57afc208692dea539729548b5e2c84a062f232d0abb0eabebd845c7 #+fileset.e5a151f626de3d82ae8cbffbe8df007f016ae78c7a795565377da03798048476 -#+rsync.06ec039b8fc41c4a42bc008f8bc2958d9b5373b50478201941eb2148356496a3 +#+rsync.8233ab6530d2847e697c437c998eaa0060d3ed1c0bc5dc9cfcffa824e5ff81eb #+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92 #+kbd.26cc6da4f7c7f5a87f3d7f48b1adfce521ad06d606dfe9a8d5b4886119251feb #+mdevd.e5729bee65528cd131ac498226925a35a014741d40214d8e4476f8cb0d97fc36 @@ -60,7 +60,7 @@ #+libcgroup.61d1f04007de27aabce0c10b9fe33ed92214ca28b9686354ec104a9153b8824b #+system-config-scripts.0c081aa66e7b2b7ccfb20f9c75e5dfff8f8d6804d0b4624934a8059354c14d9e #+logincaps.dff305698371563065d0ae0795204a975129931ea7a3c066701f7fc21dfbda4c -#+busybox.0811794d51290adedc326ae2728609b3a08a6a7e667720496cfb8d935bc742a2 +#+busybox.ad6d63dfb6426df1757e337508608b4855d9c63ab707b104bbc1123fad947a3b #@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config @@ -98,7 +98,7 @@ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ 'pthbs_path_containers=/home/ccx/versions/env.e504354206aeddd729f5a90232fdc070ef864da352cff6c014c5ec7553fb2e27' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.7f97dbbec544bb3389df1424a5800f42187de72997b1765119a513d562ed0333' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.f09401174d07f55da31aeef9d5d49468dd52d7d7eed29996de553610ac889186' \ 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.7f4db6a16ab09d3822d709aec42170cb1d2c7c752d88f13e3792e747cbd09a28 #+s6-linux-init.39d00512c8a37829a751fbbe1a7cfc37003dc9e3924d0ca13722eb2835830c2b #+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92 -#+system-config-rc.34f46f3d206620432b5550fc2560163ef98d82a41c33d2d63c11ba9d30fbc0fd +#+system-config-rc.8669564a0e5e146e9649bc9f6201fd0e8dcee1a6a35d37e50cb1c4e2f3491d7d # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.34f46f3d206620432b5550fc2560163ef98d82a41c33d2d63c11ba9d30fbc0fd/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.8669564a0e5e146e9649bc9f6201fd0e8dcee1a6a35d37e50cb1c4e2f3491d7d/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 @@ -30,7 +30,7 @@ #+busybox-diffutils.59467ff733b5e802f382c98960aae2c6ecfc7b82fa42db3df679593dc1ec8036 #+s6-rc.b3ba6e214c85c2f5cb10d42dd9d344798a776c86a200911d7eec95bcc955ef48 #+fileset.e5a151f626de3d82ae8cbffbe8df007f016ae78c7a795565377da03798048476 -#+system-config.6851c6e594b0aae6dd597a8c019d607c8eeefc95d0340373792294dcc3fa6bcf +#+system-config.78e472a9a5c6367ffce1b679c3a1a2ef5566ec8ab34cf1a7da84e17a990d200f # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.6851c6e594b0aae6dd597a8c019d607c8eeefc95d0340373792294dcc3fa6bcf/config/s6-rc-source +src=/home/ccx/versions/system-config.78e472a9a5c6367ffce1b679c3a1a2ef5566ec8ab34cf1a7da84e17a990d200f/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 @@ -50,7 +50,7 @@ #+patch.2107bae5d78ad951bd28615d44c983d64e686d320b40f74e4f5137fd9bcc2c6a #+flex.d39167f250ee7e10bded88eb7835bc8b7871aa2a3a60dcab340c4b7bc4b6672a #+bison.97ce4714edbb7c38d86cd484acc46fb0f4e07aa2371be0cb93375de8395ef327 -#+rsync.06ec039b8fc41c4a42bc008f8bc2958d9b5373b50478201941eb2148356496a3 +#+rsync.8233ab6530d2847e697c437c998eaa0060d3ed1c0bc5dc9cfcffa824e5ff81eb #+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92 #+s6.0d5d4703e07c3e5a0d4567706c69119aad5a0e9a37c28bf6b05dd12a27dc1eb1 #+s6-rc.b3ba6e214c85c2f5cb10d42dd9d344798a776c86a200911d7eec95bcc955ef48 @@ -83,6 +83,7 @@ #+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5 #+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007 +#+vis.0e025485ab59600dae26803c815f5e32720780936d73286c42e82715f27f360c #+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128 #+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc #+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af \ No newline at end of file diff --git a/variants/ccx-x86_64/vis b/variants/ccx-x86_64/vis @@ -30,7 +30,7 @@ #+musl-cross-make.14e02e45cc77fb5c9787349ef554dda78766f71652b100aee3b00e24a3d02cd1 #+gnu-make.4034f4d785c5108ad387088199242aa8aa6920e7aab1f79ce51d1f43e97cb580 #+netbsd-curses.62fbfa6e36ad4c26813723d03cbfe75c3e7d20f081b985904d933a07a84a541e -#+acl.8f23e302050a7df9dbf9a3c387cea864edfd7b584d9d88da11c193fcea30f7ef +#+acl.60c88fc2b07c5a1b2a3136683fc6ef4e741fa835fb9bffc126af8f5a0eff066f #@git:6c519e91c684838bebcc6d49d894af956f6815b4:vis 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.8a65aae7e9edce81a3a81c1da80f14620afdf7d32f2d1136a2c103c3d1f8a6e3- \ No newline at end of file +#+linux-qemu-guest.9565055a5a4f9569a0e3b657228c23003f883556c453d5da86e984e205a1c379+ \ No newline at end of file diff --git a/variants/root-x86_64/acl b/variants/root-x86_64/acl @@ -85,6 +85,7 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'acl-2.3.2' +CFLAGS="-static $CFLAGS" build_env_static autotools_config_static diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -50,7 +50,7 @@ #+patch.05e92009b5904e5104c194a4a2b66427c75b14619e0bdd0f541954e8b13d30f4 #+flex.36fbb09f9cf5f124e60da5ee47b9c4e4196523a4052d1dab8d438d404f4bca49 #+bison.86ffd0e657b2d4079934f7e40bf5c395a865b753f53a23e3a42bdc9841d2fe8b -#+rsync.8762109b164a0d0427bcd82552d1804f5ecaeaa75df7a9bae189b6cf70a0be2b +#+rsync.c63eeb59c8fd8218d44b7ccbd75756f0d228d81e01032c3f556f0042acc0580e #+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5 #+s6.04fb8499c2babe913f53ef934076b087746db184ae4955c04457a325900e11eb #+s6-rc.bc50208569d8e23862ac3fcf169ea24354b3a9693c961a7139ed0fbaeb05ce86 @@ -83,12 +83,13 @@ #+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2 #+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d +#+vis.07922f3a117fbe3af62c64faab7d6b52111a497d27990cbbf8f7caa92213118b #+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365 #+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac #+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8 -#+system-config.d693a148cb08bdcbf4926d9c7d609cecab3a5dcc80a6cf01b22aa115facfa8c2 -#+system-config-rc.4c6ab7518e87a1a3920502971e753279122dab09e21a9e99763e487a5e0f0a59 +#+system-config.60c052db5cf771fb2b690fa4f931e9131a3978031bc2951ef103e5597ebf082b +#+system-config-rc.12c0113933d7e4013b0aba496eca1dec6a6bbfd8c386731274e273208bb17746 #+system-config-scripts.ac2a449afef9d2c804ccca9869bdb1eaf89223a1b687c8e154f4a46216566b11 -#+system-config-init.e23fb9ba79b4e282867e005660d03c6d8210b9b74d9f2482667665db0157255b +#+system-config-init.74565df4159d627ab3606c8e6da358bba61191b14b65ffa2be60d60ae4d2b352 #+system-config-zsh.cbbd0ea2d203a601fb2497946adaba74910fd150b071dacffb1d82dd8c4fb33f #+busybox-modutils.5f321825e26ecc84ba02a1cd21c040ccb3cb8324b94d5b9492012eb5163a5aa7 \ No newline at end of file diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest @@ -34,7 +34,7 @@ #+patch.05e92009b5904e5104c194a4a2b66427c75b14619e0bdd0f541954e8b13d30f4 #+flex.36fbb09f9cf5f124e60da5ee47b9c4e4196523a4052d1dab8d438d404f4bca49 #+bison.86ffd0e657b2d4079934f7e40bf5c395a865b753f53a23e3a42bdc9841d2fe8b -#+rsync.8762109b164a0d0427bcd82552d1804f5ecaeaa75df7a9bae189b6cf70a0be2b +#+rsync.c63eeb59c8fd8218d44b7ccbd75756f0d228d81e01032c3f556f0042acc0580e #+zstd.34cc749f8c590e889c6486d4f33b8c57208e3c6e7d36281d84689fac44b9a64c #+libelf.087731999bf3f2f82946ab397f6971bef889dc742a5757654d5079e95829cf50 #+pkgconf-pkg-config.c3d31ede6d00be8bbefb3513e3836d725a51781409722f7ab58d0a856a2a9738 diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync @@ -34,7 +34,7 @@ #+popt.9fa422183430f243de036fa8c9d953928d2ace4539a65849b5e387d5b748c202 #+libressl.d21c86e599c742080e4e8fc933081a93048448f55fa5d5c0f91335a107827204 #+zstd.34cc749f8c590e889c6486d4f33b8c57208e3c6e7d36281d84689fac44b9a64c -#+acl.89957bd14ebdbe24118af9cbd161ba577dfeb12a666c45f7b21fef9b62ad18f1 +#+acl.94a55ba38ec196d6a8d15d139ea7ad50912768d73245a942594af68006058e21 #+attr.1367ffd510ba4e1a1a51922ea1aec38b8d4e314ef2c1782a072f10173790a63e #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -49,7 +49,7 @@ #+gnu-make.98dc2bc139672e6347bc2b2220304949f81b1851d2dc14778379568a0734db59 #+aat.e3e638e18b98d6c6fd82d1f1eba60082f4cfcd2e196c975cfd621f88f00e40f0 #+fileset.f310a9481c4fdb71269bb232f4ae4c004a62c44ee2a053a3b1500d67813a91d3 -#+rsync.8762109b164a0d0427bcd82552d1804f5ecaeaa75df7a9bae189b6cf70a0be2b +#+rsync.c63eeb59c8fd8218d44b7ccbd75756f0d228d81e01032c3f556f0042acc0580e #+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5 #+kbd.e935a814b7be81a255036a94215521bcff827d7a29f9cfe3ee12b0b87a1a7468 #+mdevd.a65dac1bcbf3e45bf56ac219108fe15537401737aaabef2aa060f24682fa3a68 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.88a5962bf96a590c8844071c1802840557768dc0a96078b815c1d9aa08ebe27c #+s6-linux-init.7a9d91b21cceaf06297ddc4522c7be945b051eb94cd21da564920db0003350e4 #+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5 -#+system-config-rc.4c6ab7518e87a1a3920502971e753279122dab09e21a9e99763e487a5e0f0a59 +#+system-config-rc.12c0113933d7e4013b0aba496eca1dec6a6bbfd8c386731274e273208bb17746 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.4c6ab7518e87a1a3920502971e753279122dab09e21a9e99763e487a5e0f0a59/config/s6-rc-db +s6rcdb=/versions/system-config-rc.12c0113933d7e4013b0aba496eca1dec6a6bbfd8c386731274e273208bb17746/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 @@ -30,7 +30,7 @@ #+busybox-diffutils.7297c795754c245870d8ba99b3907f9ec3932726a5af6b8d15980adcbf6c0059 #+s6-rc.bc50208569d8e23862ac3fcf169ea24354b3a9693c961a7139ed0fbaeb05ce86 #+fileset.f310a9481c4fdb71269bb232f4ae4c004a62c44ee2a053a3b1500d67813a91d3 -#+system-config.d693a148cb08bdcbf4926d9c7d609cecab3a5dcc80a6cf01b22aa115facfa8c2 +#+system-config.60c052db5cf771fb2b690fa4f931e9131a3978031bc2951ef103e5597ebf082b # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.d693a148cb08bdcbf4926d9c7d609cecab3a5dcc80a6cf01b22aa115facfa8c2/config/s6-rc-source +src=/versions/system-config.60c052db5cf771fb2b690fa4f931e9131a3978031bc2951ef103e5597ebf082b/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 @@ -50,7 +50,7 @@ #+patch.05e92009b5904e5104c194a4a2b66427c75b14619e0bdd0f541954e8b13d30f4 #+flex.36fbb09f9cf5f124e60da5ee47b9c4e4196523a4052d1dab8d438d404f4bca49 #+bison.86ffd0e657b2d4079934f7e40bf5c395a865b753f53a23e3a42bdc9841d2fe8b -#+rsync.8762109b164a0d0427bcd82552d1804f5ecaeaa75df7a9bae189b6cf70a0be2b +#+rsync.c63eeb59c8fd8218d44b7ccbd75756f0d228d81e01032c3f556f0042acc0580e #+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5 #+s6.04fb8499c2babe913f53ef934076b087746db184ae4955c04457a325900e11eb #+s6-rc.bc50208569d8e23862ac3fcf169ea24354b3a9693c961a7139ed0fbaeb05ce86 @@ -83,6 +83,7 @@ #+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2 #+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d +#+vis.07922f3a117fbe3af62c64faab7d6b52111a497d27990cbbf8f7caa92213118b #+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365 #+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac #+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8 \ No newline at end of file diff --git a/variants/root-x86_64/vis b/variants/root-x86_64/vis @@ -30,7 +30,7 @@ #+musl-cross-make.581e6f7496a630a91679f40945ae85b1c9a3f1f5afd725bb7608ad60c058d8f9 #+gnu-make.98dc2bc139672e6347bc2b2220304949f81b1851d2dc14778379568a0734db59 #+netbsd-curses.d3d7d0cf449972d5ce479a15d7298bad50ba445982cca9b12dc99d950330ce2c -#+acl.89957bd14ebdbe24118af9cbd161ba577dfeb12a666c45f7b21fef9b62ad18f1 +#+acl.94a55ba38ec196d6a8d15d139ea7ad50912768d73245a942594af68006058e21 #@git:6c519e91c684838bebcc6d49d894af956f6815b4:vis 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.e35b3886b092ab96b5dcd972350a9ad0022ddf2301c81fda3eb00add57b54afa- \ No newline at end of file +#+linux-qemu-guest.18781f48841b29963194b331c15a26c0ed16e053019ab22cec26ea4128d31085+ \ No newline at end of file