commit 25a5ba820ced71df6b6748f02e597124f5fd487f parent 3fd1005e96c050961f22d97a1599f22d6c7c0e64 Author: Jan Pobrislo <ccx@te2000.cz> Date: Fri, 4 Jul 2025 15:15:49 +0000 abduco build script Diffstat:
19 files changed, 98 insertions(+), 123 deletions(-)
diff --git a/templates/pkg/abduco b/templates/pkg/abduco @@ -1,15 +1,32 @@ -{% extends "autotools" %} -{%- block extra_deps %} +{% extends "genlinks" %} +{%- block script %} +#+{{pkg_install_name("musl-cross-make")}} +#+{{pkg_install_name("gnu-make")}} +#+{{pkg_install_name("busybox")}} +#+{{pkg_install_name("busybox-diffutils")}} #@git:{{submodule.current[name]}}:{{name}} -{%- endblock %} -{% block at_script %} -autotools_static abduco CFLAGS="-no-pie -static" +{% include "functions/check_static" %} +{% include "functions/build_env_static" %} +build_env_static +prefix={{versions}}/$pthbs_package +cd abduco +cat >config.mk <<EOF +# Any changes made here will be lost if configure is re-run +SRCDIR = . +PREFIX = $prefix +EXEC_PREFIX = \$(PREFIX) +BINDIR = $prefix/command +MANPREFIX = $prefix/man +CC = cc +CFLAGS = -pipe -Os +LDFLAGS = -static +EOF +make DESTDIR="$pthbs_destdir" install check_static command/abduco {% endblock %} {% block genlinks_begin %} - x["./command/abduco"] + x["./command/abduco"]=1 {%- endblock %} - diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco @@ -3,45 +3,8 @@ #+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc -#+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -autotools_config() { - prefix=/home/ccx/versions/$pthbs_package - ./configure -C \ - --prefix="$prefix" \ - --build="$(${CC:-gcc} -dumpmachine)" \ - --bindir="$prefix/command" \ - --sbindir="$prefix/command" \ - --infodir="$prefix/info" \ - --localedir="$prefix/locale" \ - --mandir="$prefix/man" \ - --libdir="$prefix/library" \ - --docdir="$prefix/doc/abduco" \ - --datadir="$prefix/data" \ - --datarootdir="$prefix/data" \ - --localstatedir='/var/pthbs' \ - "$@" - -} - -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { - build_env_static - autotools "$@" --enable-static --disable-shared -} check_static() { local exe || true exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 @@ -55,18 +18,34 @@ check_static() { exit 1 fi } - - -autotools_static abduco CFLAGS="-no-pie -static" +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +build_env_static +prefix=/home/ccx/versions/$pthbs_package +cd abduco +cat >config.mk <<EOF +# Any changes made here will be lost if configure is re-run +SRCDIR = . +PREFIX = $prefix +EXEC_PREFIX = \$(PREFIX) +BINDIR = $prefix/command +MANPREFIX = $prefix/man +CC = cc +CFLAGS = -pipe -Os +LDFLAGS = -static +EOF +make DESTDIR="$pthbs_destdir" install check_static command/abduco - cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/abduco"]} + x["./command/abduco"]=1} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -8,7 +8,7 @@ #+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514 #+easyseccomp.6631f58c9fe090f2b2becc5ac606901736aba4ad2a0075f6402bec85eaa3df7b #+mlog.a63c78a5967e11f6fcac02b7eced93c023b82172f901e0f3929fad33b591f676 -#+abduco.47522c9a9a3a19bba38efc7af0bd99ca651db52fd088fe7f7401ec553721dd76 +#+abduco.3f5bd6518a1662027552da8d8a2be4bd520386c66a89df49fe895519d3b469ca #@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 @@ -6,7 +6,7 @@ #+alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4 #+apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf #+xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b -#+container-bin-image.1c233cedaca66edfee126fa626a3f1174c1f5adad566227d27f6e4126d79c6a3 +#+container-bin-image.470545f19a616e04c6c83fbbd15af1250045a2d69a83b338c594e5fc96346048 #@git:5d2b98a3c54b6f142b80773e4a18dea3749bfea6:containers : ${JOBS:=1} @@ -58,9 +58,9 @@ for f in '/home/ccx/versions/xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef ln -sf "$f" "$pkgdir/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.1c233cedaca66edfee126fa626a3f1174c1f5adad566227d27f6e4126d79c6a3/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.1c233cedaca66edfee126fa626a3f1174c1f5adad566227d27f6e4126d79c6a3/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.1c233cedaca66edfee126fa626a3f1174c1f5adad566227d27f6e4126d79c6a3/container-bin-image' "$pkgdir/deps/" +test -d '/home/ccx/versions/container-bin-image.470545f19a616e04c6c83fbbd15af1250045a2d69a83b338c594e5fc96346048/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.470545f19a616e04c6c83fbbd15af1250045a2d69a83b338c594e5fc96346048/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.470545f19a616e04c6c83fbbd15af1250045a2d69a83b338c594e5fc96346048/container-bin-image' "$pkgdir/deps/" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -7,7 +7,7 @@ #+s6-linux-utils.1990b55837ff2c28a81500d80292c6d530c8516347eb896007eb5aed2af6c425 #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.895c6c9658a2445a5198d7fe33bd9a0c57275f8b8cf3e174fa1d017fd71d5945 +#+containers.edbbf58db682117c0b3b19c63f7da3f956f5604b72b2530f11a46b4c92135602 #+xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c #+apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -21,7 +21,7 @@ #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.895c6c9658a2445a5198d7fe33bd9a0c57275f8b8cf3e174fa1d017fd71d5945 +#+containers.edbbf58db682117c0b3b19c63f7da3f956f5604b72b2530f11a46b4c92135602 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.96263bd64a359697fe7dc6343af26a7e3d535be97cb52f6010b575e05165dbf5 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 @@ -38,8 +38,8 @@ #+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8 #+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103 #+mlog.a63c78a5967e11f6fcac02b7eced93c023b82172f901e0f3929fad33b591f676 -#+system-config.682e447b8450e29cd9a0f8c8918461e257efc51d2f54cc0426e17827e6f91398 -#+system-config-rc.3f4ed95d863b27add17d96a0165db720b357b754abac72b04e254f5641ff9a4f +#+system-config.f109e7eede1981d08db6d3b9f0447bfa4e8277c1309dadd7239bc0f927b8de6c +#+system-config-rc.f86905eb7c0d2b5e4e3340513de6ce7eaa2d63434d7559264568d5510b9f3228 #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d -#+system-config-init.70fa7dd3e1244c05b37afb155bb492c3e4ed32fef3f248e3927607005a5a9308 +#+system-config-init.78e26a127bb17a6f6b792628de2e93c9f702ee66e1360ebf8f6ed66b8bcffa55 #+system-config-zsh.c909db48540806e61eebed4572b594f9bb32b7c3db277e7c8967b652599bf80c \ No newline at end of file diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -52,7 +52,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.e4fcc756c6c29844ad2645d24a4bab968f8a6113e4110f2bb2adba0dcba9c2e4' \ + 'pthbs_path_containers=/home/ccx/versions/env.b18c04102b9f9f4bae05c2020d82a9a010119f58ea09e7dc20be0d4703e1fab4' \ 'pthbs_path_mdevd=/home/ccx/versions/env.5049027ea8b6b4d373e16aadd3cdc63a940582ff297656e395f2131eef181671' \ 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 @@ -5,9 +5,9 @@ #+s6-portable-utils.1b8fd31be72bfe84afb28c3dfff03b1fc45121d11fc85f79c90f085fe61bc132 #+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f -#+system-config-rc.3f4ed95d863b27add17d96a0165db720b357b754abac72b04e254f5641ff9a4f +#+system-config-rc.f86905eb7c0d2b5e4e3340513de6ce7eaa2d63434d7559264568d5510b9f3228 -s6rcdb=/home/ccx/versions/system-config-rc.3f4ed95d863b27add17d96a0165db720b357b754abac72b04e254f5641ff9a4f/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.f86905eb7c0d2b5e4e3340513de6ce7eaa2d63434d7559264568d5510b9f3228/config/s6-rc-db prefix=/home/ccx/versions/$pthbs_package pkgdir="$pthbs_destdir/$prefix" diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc @@ -3,7 +3,7 @@ #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 -#+system-config.682e447b8450e29cd9a0f8c8918461e257efc51d2f54cc0426e17827e6f91398 +#+system-config.f109e7eede1981d08db6d3b9f0447bfa4e8277c1309dadd7239bc0f927b8de6c def_prefix() { prefix=/home/ccx/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/home/ccx/versions/system-config.682e447b8450e29cd9a0f8c8918461e257efc51d2f54cc0426e17827e6f91398/config/s6-rc-source +src=/home/ccx/versions/system-config.f109e7eede1981d08db6d3b9f0447bfa4e8277c1309dadd7239bc0f927b8de6c/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 @@ -21,7 +21,7 @@ #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.895c6c9658a2445a5198d7fe33bd9a0c57275f8b8cf3e174fa1d017fd71d5945 +#+containers.edbbf58db682117c0b3b19c63f7da3f956f5604b72b2530f11a46b4c92135602 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.96263bd64a359697fe7dc6343af26a7e3d535be97cb52f6010b575e05165dbf5 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco @@ -3,45 +3,8 @@ #+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 -#+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -autotools_config() { - prefix=/versions/$pthbs_package - ./configure -C \ - --prefix="$prefix" \ - --build="$(${CC:-gcc} -dumpmachine)" \ - --bindir="$prefix/command" \ - --sbindir="$prefix/command" \ - --infodir="$prefix/info" \ - --localedir="$prefix/locale" \ - --mandir="$prefix/man" \ - --libdir="$prefix/library" \ - --docdir="$prefix/doc/abduco" \ - --datadir="$prefix/data" \ - --datarootdir="$prefix/data" \ - --localstatedir='/var/pthbs' \ - "$@" - -} - -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { - build_env_static - autotools "$@" --enable-static --disable-shared -} check_static() { local exe || true exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 @@ -55,18 +18,34 @@ check_static() { exit 1 fi } - - -autotools_static abduco CFLAGS="-no-pie -static" +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +build_env_static +prefix=/versions/$pthbs_package +cd abduco +cat >config.mk <<EOF +# Any changes made here will be lost if configure is re-run +SRCDIR = . +PREFIX = $prefix +EXEC_PREFIX = \$(PREFIX) +BINDIR = $prefix/command +MANPREFIX = $prefix/man +CC = cc +CFLAGS = -pipe -Os +LDFLAGS = -static +EOF +make DESTDIR="$pthbs_destdir" install check_static command/abduco - cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/abduco"]} + x["./command/abduco"]=1} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -8,7 +8,7 @@ #+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8 #+easyseccomp.a69f369af91163a534bf0d1bf51c74cd98c971d7eb5f61c2ee29afb6ba7a9344 #+mlog.3a2fb37a92813d4c8700d3f9eb95753b0f2b72d5de13f03ba2f52fc0732ac487 -#+abduco.d72a57e310f0d7bfb2dbb7e2df14df9ea0387e1e6419edf244f7bb9a914fb04a +#+abduco.b5da39d47886165c9c1789ae28d473f6302e29e7295b5891c3dd1dd0d9cca06b #@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 @@ -6,7 +6,7 @@ #+alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1 #+apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa #+xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d -#+container-bin-image.d825b5cc62ccf04eb87e418cac17763af2b3be9f3c168737ebae924d72c22971 +#+container-bin-image.af5bc780d2deba00504f33f55a191ce122b3e629a3c8afaec4d98495432d8b3a #@git:5d2b98a3c54b6f142b80773e4a18dea3749bfea6:containers : ${JOBS:=1} @@ -58,9 +58,9 @@ for f in '/versions/xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9 ln -sf "$f" "$pkgdir/deps/keys/void/" done -test -d '/versions/container-bin-image.d825b5cc62ccf04eb87e418cac17763af2b3be9f3c168737ebae924d72c22971/container-bin-image' -test -f '/versions/container-bin-image.d825b5cc62ccf04eb87e418cac17763af2b3be9f3c168737ebae924d72c22971/container-bin-image/if' -ln -sf '/versions/container-bin-image.d825b5cc62ccf04eb87e418cac17763af2b3be9f3c168737ebae924d72c22971/container-bin-image' "$pkgdir/deps/" +test -d '/versions/container-bin-image.af5bc780d2deba00504f33f55a191ce122b3e629a3c8afaec4d98495432d8b3a/container-bin-image' +test -f '/versions/container-bin-image.af5bc780d2deba00504f33f55a191ce122b3e629a3c8afaec4d98495432d8b3a/container-bin-image/if' +ln -sf '/versions/container-bin-image.af5bc780d2deba00504f33f55a191ce122b3e629a3c8afaec4d98495432d8b3a/container-bin-image' "$pkgdir/deps/" cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -7,7 +7,7 @@ #+s6-linux-utils.f7e0654375f11beedafd731ad1dd66c0de8d03452bb8e38bb647cc51cc3adb2e #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.c6d650101d43b508e5ec429ffd71a72f25b56cf9233b7da2272b674bae9ff878 +#+containers.b27195f55d6e2efeb51a6c990953b2cb7181ac487b72c66847200512794d65ca #+xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 #+apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -21,7 +21,7 @@ #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.c6d650101d43b508e5ec429ffd71a72f25b56cf9233b7da2272b674bae9ff878 +#+containers.b27195f55d6e2efeb51a6c990953b2cb7181ac487b72c66847200512794d65ca #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.81ffbb96fbc3c630eda5e1bb2249d6691f0fba11821f56c08ce3c42cbf186620 #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 @@ -38,8 +38,8 @@ #+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca #+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296 #+mlog.3a2fb37a92813d4c8700d3f9eb95753b0f2b72d5de13f03ba2f52fc0732ac487 -#+system-config.91dbe042cb20185e521e47c46fb9785c47488abf5ec8986adc2d3567bf4a3b01 -#+system-config-rc.31f5d70122c9976eb0d0c00366238ec1f5db3b562e7757d5d728e00a50f7bf79 +#+system-config.39c5f1f5d15541c91d8c7465ee927d1bcf2cbdf0371a5713152b3fb853ca0681 +#+system-config-rc.2eb507de486351a290338ba4e306c40ce101aac9dd7df9aa5f8ac95f36fd98cf #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378 -#+system-config-init.90d235378fc93b8c6eb9769a8e3e7d6fa36e720cfdcfc2f7e2ee492d720d3dd0 +#+system-config-init.71c1e08c53db054510282b7a626da09ec7e1903749edb40baa4951f1e4a5caa4 #+system-config-zsh.ed06489518be3fe07b081034705aaa1c35af0c2604cf52f5ad4c59713352b220 \ No newline at end of file diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -52,7 +52,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.ad14aa3342342038ac32c241b97e1f0fc29ab17060900b6a54b0482c660632b5' \ + 'pthbs_path_containers=/versions/env.e115a7017ee0a5370a83413304d1bbb617e2f6c34471219dca9a8744cdeacbac' \ 'pthbs_path_mdevd=/versions/env.699c310193b7957c8ec17e16d6846443f99c198e3e2ce6425066f4523de2cf1e' \ 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 @@ -5,9 +5,9 @@ #+s6-portable-utils.f6171ad521d6be72875f1d5c1b28f966662ba93cfe5790e1ef010f9e76211bc3 #+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 -#+system-config-rc.31f5d70122c9976eb0d0c00366238ec1f5db3b562e7757d5d728e00a50f7bf79 +#+system-config-rc.2eb507de486351a290338ba4e306c40ce101aac9dd7df9aa5f8ac95f36fd98cf -s6rcdb=/versions/system-config-rc.31f5d70122c9976eb0d0c00366238ec1f5db3b562e7757d5d728e00a50f7bf79/config/s6-rc-db +s6rcdb=/versions/system-config-rc.2eb507de486351a290338ba4e306c40ce101aac9dd7df9aa5f8ac95f36fd98cf/config/s6-rc-db prefix=/versions/$pthbs_package pkgdir="$pthbs_destdir/$prefix" diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc @@ -3,7 +3,7 @@ #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 -#+system-config.91dbe042cb20185e521e47c46fb9785c47488abf5ec8986adc2d3567bf4a3b01 +#+system-config.39c5f1f5d15541c91d8c7465ee927d1bcf2cbdf0371a5713152b3fb853ca0681 def_prefix() { prefix=/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/versions/system-config.91dbe042cb20185e521e47c46fb9785c47488abf5ec8986adc2d3567bf4a3b01/config/s6-rc-source +src=/versions/system-config.39c5f1f5d15541c91d8c7465ee927d1bcf2cbdf0371a5713152b3fb853ca0681/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 @@ -21,7 +21,7 @@ #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.c6d650101d43b508e5ec429ffd71a72f25b56cf9233b7da2272b674bae9ff878 +#+containers.b27195f55d6e2efeb51a6c990953b2cb7181ac487b72c66847200512794d65ca #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.81ffbb96fbc3c630eda5e1bb2249d6691f0fba11821f56c08ce3c42cbf186620 #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5