commit efc874ba0dcfb6bbaac7ac6083a6c3601561e45d parent 5cf143fcb037539f64a8ab89d97b22137a59ea14 Author: Jan Pobrislo <ccx@te2000.cz> Date: Sat, 11 Oct 2025 15:08:59 +0000 source directory location fixes Diffstat:
24 files changed, 57 insertions(+), 61 deletions(-)
diff --git a/templates/pkg/ccx-utils b/templates/pkg/ccx-utils @@ -12,7 +12,7 @@ build_env_static ./link.configure $LDFLAGS - +cd src for name in \ argv0exec \ nosuid \ diff --git a/templates/pkg/git b/templates/pkg/git @@ -9,8 +9,8 @@ #+{{pkg_install_name("libressl")}} #+{{pkg_install_name("curl")}} {% endblock %} -{% block build -%} -{{make}} -C ./git-2.43.2 \ +{% block build_and_install -%} +{{make}} \ LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so" \ CPATH="$pthbs_build_environment/include" \ LDFLAGS="-static --static -L$pthbs_build_environment/library" \ @@ -28,8 +28,6 @@ V=1 all install {% endblock %} -{% block install -%} -{% endblock %} {% block check -%} {% include "functions/check_static" %} check_static command/git diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils @@ -35,7 +35,7 @@ build_env_static() { build_env_static ./link.configure $LDFLAGS - +cd src for name in \ argv0exec \ nosuid \ diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -4,7 +4,7 @@ #+busybox-login.82fa928ef483410756c24879960de20bdaf03d821b37ba4d27ce5fc6f387667c #+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a #+s6.f852407c0b0743b39e769f67ffcaaabeb17233500699e2219937aed7b9774cc6 -#+ccx-utils.5d4a03d8fac908bceccbb03c49ab3e893b2cf08384226b326a9f6a062b8693fd +#+ccx-utils.67bb6667e56f5ca30c6f1a02cfe4307b8bdc1c4fe7fd6373d3e53f6cc0d6e59c #+applyuidgid-caps.6dc8f41171814dbb75b716a5d748812c48d6eef5ed7520db9172cf6dd6016936 #+easyseccomp.65e87db56977d92995485e50a784eee3d3daa3a8d9aedd369f56978c704e4903 #+mlog.a882a51752c5081bd671d7d564ea8b5c4502b93c0951cb77a20aa0238c66bc82 diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -7,7 +7,7 @@ #+alpine-keys.7c89c54f343b451790623504c04092bfe77b9c3462ded5a4a8739f0250a22cb9 #+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a #+xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c -#+container-bin-image.2f965fe45d35b189724cdcb41f2dd0acaa1e70b956412520ceac61588dfa1272 +#+container-bin-image.c7e7742dfb0dda83d725518f35add88245f503ce7ac0a3462215466fca9acad6 #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -64,9 +64,9 @@ for f in '/home/ccx/versions/xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.2f965fe45d35b189724cdcb41f2dd0acaa1e70b956412520ceac61588dfa1272/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.2f965fe45d35b189724cdcb41f2dd0acaa1e70b956412520ceac61588dfa1272/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.2f965fe45d35b189724cdcb41f2dd0acaa1e70b956412520ceac61588dfa1272/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.c7e7742dfb0dda83d725518f35add88245f503ce7ac0a3462215466fca9acad6/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.c7e7742dfb0dda83d725518f35add88245f503ce7ac0a3462215466fca9acad6/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.c7e7742dfb0dda83d725518f35add88245f503ce7ac0a3462215466fca9acad6/container-bin-image' "${dest}/deps/" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -7,12 +7,12 @@ #+s6-linux-utils.84f2d6d918b74fffc508df6cee48ed0f25124bd6c09f12558626d27992174226 #+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 #+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db -#+containers.6ff2e4c45afa5afc4493cfabdacd8a47a738451d89680bce5d81d576c3f26eda +#+containers.6f6039ec445abc7ab78e4c449a7a3d671e339696caa460f0fe1b17696ad93635 #+xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c #+zstd.31469429bdd997f0a7a7eeb7dc4aa44b1e88d15227b1711943b136dc14cf753f #+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a #+alpine-keys.7c89c54f343b451790623504c04092bfe77b9c3462ded5a4a8739f0250a22cb9 #+getent.08248f0ec8ff20bd1279b61e637208961f5959b2b8bb33caee7720289dad2b5c #+fileset.30305918fa6fa5f7dcb447a76827959d5c8af9cd021b065fd360a5a176430035 -#+ccx-utils.5d4a03d8fac908bceccbb03c49ab3e893b2cf08384226b326a9f6a062b8693fd +#+ccx-utils.67bb6667e56f5ca30c6f1a02cfe4307b8bdc1c4fe7fd6373d3e53f6cc0d6e59c #+easyseccomp.65e87db56977d92995485e50a784eee3d3daa3a8d9aedd369f56978c704e4903 \ No newline at end of file diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -21,12 +21,12 @@ #+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435 #+aat.b33fe3833f8ea46ebdb6900ad58529774beb169b76218ce270e3c975bcbfcd43 #+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db -#+containers.6ff2e4c45afa5afc4493cfabdacd8a47a738451d89680bce5d81d576c3f26eda +#+containers.6f6039ec445abc7ab78e4c449a7a3d671e339696caa460f0fe1b17696ad93635 #+fileset.30305918fa6fa5f7dcb447a76827959d5c8af9cd021b065fd360a5a176430035 -#+logincaps.0b57fd55080bdfb254593b6e6cc7e34f4fa19cd1622e9bf3368b75587f9cb1ca +#+logincaps.1dcea63884fc4ef3b2ed76a284d76b5cd0a5757843f5e900859d8159ae7ebf9f #+snaprep.30e9d122c8a1d12f58d81856dd5a79b72d4785bf30bff0e94b3a0f61e6c22238 #+curl.b77362632ee7e28e099c231bbda3b6220cc0cbc62aece9c63f4957cc3f415284 -#+git.01a0c1531eb47cb51bf38a4082a0e16caf7be302d04fa24fde800985f8e37773 +#+git.47197b710752c0a7510495efa88f83cd26eb97a9693e796c13823c831df8bd13 #+xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c #+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a #+getent.08248f0ec8ff20bd1279b61e637208961f5959b2b8bb33caee7720289dad2b5c @@ -34,12 +34,12 @@ #+iconv.9feadab3245c25563106d437e33a396d7a4e365c76dff50f615549237553acfe #+libcap.fb3b00482a6822dad5f4e5411bd5f929fd597a49fa535977dd37b785e13f22f0 #+applyuidgid-caps.6dc8f41171814dbb75b716a5d748812c48d6eef5ed7520db9172cf6dd6016936 -#+ccx-utils.5d4a03d8fac908bceccbb03c49ab3e893b2cf08384226b326a9f6a062b8693fd +#+ccx-utils.67bb6667e56f5ca30c6f1a02cfe4307b8bdc1c4fe7fd6373d3e53f6cc0d6e59c #+user-env.27a0b5452d41afaacb1d76c456caa84d85aff599c39ff32b8db694d2550d5b6d #+strace.40668df6151b4574b553a5923103e07c6ddb344daca606f04edd0ac48e060d55 #+mlog.a882a51752c5081bd671d7d564ea8b5c4502b93c0951cb77a20aa0238c66bc82 -#+system-config.9edf0cd80c8e6a4ac33e572b1057e1ca91ddea453f5a69ebd51c3b79f29dda8d -#+system-config-rc.3f1585d1f5598a7a68dae686aeb860aecb76761f376c37ccc276ae937d5cecb2 +#+system-config.0e7c9b16e24ef45066c4c788f5b831a593cf8b7b74b347e8149d621d577e5da2 +#+system-config-rc.9c3bbc0d69731f8e2798a947e4a984847c9715cabe5a86f60a612e0d4581176f #+system-config-scripts.d12136571c1f2d7a43fcf7cc96f91d5e342018ed98731a123c69ef67e4623f3f -#+system-config-init.5376024cfa6f64a36295e42b25949a62b28683fc092a425b5a6b139bbccfd374 +#+system-config-init.d6ef58d4a68c1c22165bedb872dff77ea0277a9efda513f786543b5f13dc723c #+system-config-zsh.ca45b9086a867eb594d68b32cb4826f747b819c640cb472a6fd1b649b1a1d760 \ No newline at end of file diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git @@ -16,7 +16,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'git-2.43.2' -make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C ./git-2.43.2 \ +make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so" \ CPATH="$pthbs_build_environment/include" \ LDFLAGS="-static --static -L$pthbs_build_environment/library" \ @@ -34,7 +34,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C ./git-2.43.2 \ V=1 all install - check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -5,7 +5,7 @@ #+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435 #+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a #+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+ccx-utils.5d4a03d8fac908bceccbb03c49ab3e893b2cf08384226b326a9f6a062b8693fd +#+ccx-utils.67bb6667e56f5ca30c6f1a02cfe4307b8bdc1c4fe7fd6373d3e53f6cc0d6e59c #@git:52261504e78293b651e73a518834c5c75d0b3bf6:logincaps diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -14,7 +14,7 @@ #+s6.f852407c0b0743b39e769f67ffcaaabeb17233500699e2219937aed7b9774cc6 #+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 #+system-config-scripts.d12136571c1f2d7a43fcf7cc96f91d5e342018ed98731a123c69ef67e4623f3f -#+logincaps.0b57fd55080bdfb254593b6e6cc7e34f4fa19cd1622e9bf3368b75587f9cb1ca +#+logincaps.1dcea63884fc4ef3b2ed76a284d76b5cd0a5757843f5e900859d8159ae7ebf9f #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config @@ -50,7 +50,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.60cd9cb138b265dc3d0ec333de7ade77864e4e8d91f19784ac79a04d666e7ac3' \ + 'pthbs_path_containers=/home/ccx/versions/env.9512b218a2f168cd77c88166422283dd993db521201d27a6478bfdbef423db46' \ 'pthbs_path_mdevd=/home/ccx/versions/env.51ab0c0e64ff93066325f8e4bcab80b46b317ef9b15abe28670e767ec96baca2' \ 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 @@ -6,7 +6,7 @@ #+s6-portable-utils.1118fd2f6ea4b1390c615802d601bd6803cf4545b03a89bed68e36bc2a13087e #+s6-linux-init.a6dbfc71babdb9506c53cad385c613f13a602885c2db0a5db609a86ecc687bac #+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a -#+system-config-rc.3f1585d1f5598a7a68dae686aeb860aecb76761f376c37ccc276ae937d5cecb2 +#+system-config-rc.9c3bbc0d69731f8e2798a947e4a984847c9715cabe5a86f60a612e0d4581176f # - build script start - @@ -29,7 +29,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.3f1585d1f5598a7a68dae686aeb860aecb76761f376c37ccc276ae937d5cecb2/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.9c3bbc0d69731f8e2798a947e4a984847c9715cabe5a86f60a612e0d4581176f/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 @@ -4,7 +4,7 @@ #+busybox-diffutils.963ce6582575680763337552764b6a3c1be781d9fada1d52aa2d04fadeb229d0 #+s6-rc.4709b0b39ae84f7a1efa984a66237c0f6133cec32466acdf0a139e2ef142f5ee #+fileset.30305918fa6fa5f7dcb447a76827959d5c8af9cd021b065fd360a5a176430035 -#+system-config.9edf0cd80c8e6a4ac33e572b1057e1ca91ddea453f5a69ebd51c3b79f29dda8d +#+system-config.0e7c9b16e24ef45066c4c788f5b831a593cf8b7b74b347e8149d621d577e5da2 # - build script start - @@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/home/ccx/versions/system-config.9edf0cd80c8e6a4ac33e572b1057e1ca91ddea453f5a69ebd51c3b79f29dda8d/config/s6-rc-source +src=/home/ccx/versions/system-config.0e7c9b16e24ef45066c4c788f5b831a593cf8b7b74b347e8149d621d577e5da2/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,12 +21,12 @@ #+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435 #+aat.b33fe3833f8ea46ebdb6900ad58529774beb169b76218ce270e3c975bcbfcd43 #+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db -#+containers.6ff2e4c45afa5afc4493cfabdacd8a47a738451d89680bce5d81d576c3f26eda +#+containers.6f6039ec445abc7ab78e4c449a7a3d671e339696caa460f0fe1b17696ad93635 #+fileset.30305918fa6fa5f7dcb447a76827959d5c8af9cd021b065fd360a5a176430035 -#+logincaps.0b57fd55080bdfb254593b6e6cc7e34f4fa19cd1622e9bf3368b75587f9cb1ca +#+logincaps.1dcea63884fc4ef3b2ed76a284d76b5cd0a5757843f5e900859d8159ae7ebf9f #+snaprep.30e9d122c8a1d12f58d81856dd5a79b72d4785bf30bff0e94b3a0f61e6c22238 #+curl.b77362632ee7e28e099c231bbda3b6220cc0cbc62aece9c63f4957cc3f415284 -#+git.01a0c1531eb47cb51bf38a4082a0e16caf7be302d04fa24fde800985f8e37773 +#+git.47197b710752c0a7510495efa88f83cd26eb97a9693e796c13823c831df8bd13 #+xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c #+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a #+getent.08248f0ec8ff20bd1279b61e637208961f5959b2b8bb33caee7720289dad2b5c @@ -34,7 +34,7 @@ #+iconv.9feadab3245c25563106d437e33a396d7a4e365c76dff50f615549237553acfe #+libcap.fb3b00482a6822dad5f4e5411bd5f929fd597a49fa535977dd37b785e13f22f0 #+applyuidgid-caps.6dc8f41171814dbb75b716a5d748812c48d6eef5ed7520db9172cf6dd6016936 -#+ccx-utils.5d4a03d8fac908bceccbb03c49ab3e893b2cf08384226b326a9f6a062b8693fd +#+ccx-utils.67bb6667e56f5ca30c6f1a02cfe4307b8bdc1c4fe7fd6373d3e53f6cc0d6e59c #+user-env.27a0b5452d41afaacb1d76c456caa84d85aff599c39ff32b8db694d2550d5b6d #+strace.40668df6151b4574b553a5923103e07c6ddb344daca606f04edd0ac48e060d55 #+mlog.a882a51752c5081bd671d7d564ea8b5c4502b93c0951cb77a20aa0238c66bc82 \ No newline at end of file diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils @@ -35,7 +35,7 @@ build_env_static() { build_env_static ./link.configure $LDFLAGS - +cd src for name in \ argv0exec \ nosuid \ diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -4,7 +4,7 @@ #+busybox-login.34ba728039b1a7dd31bcbdca2d951887a877acf229a453feb1729bf2fa0b8766 #+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab #+s6.e2ee6b1e77f60e714bd5e81d709b65a07b24dbbd9af559918a598ef82523a8c5 -#+ccx-utils.020204071392f91013fe10d159d85b96ce1cfcf6b0666afd324594dfefdf3b0a +#+ccx-utils.db99ecd4283f9c273fc4c05ef41cc47182f63581ba564e5fde275fb465937d98 #+applyuidgid-caps.8d7ac4d1fafc6213e4902c3cd0f946f5b1361a06897ded604b2dc4eff80d1bab #+easyseccomp.bb0906d21f579981b7d5cf6b965d69d4dfabf2dbae8b494f3268848c46619e8c #+mlog.7a615a6cd358a942b7d328b13562fc11cb3c82d2933f3de7fa727db87d48e6c2 diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -7,7 +7,7 @@ #+alpine-keys.7aa8a887a6f32ef454bca16fe2547b53b765170c2f8f0bab72ddd42c518bc941 #+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9 #+xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3 -#+container-bin-image.8c1a5f6298527959d0eafe4435da7582a171f5268e32c8e85c80cb39c69c6194 +#+container-bin-image.53df785f72ebd029106c573aa802e4396b33bfdd78ba14b65ee62177c04d1a28 #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -64,9 +64,9 @@ for f in '/versions/xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c32 ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.8c1a5f6298527959d0eafe4435da7582a171f5268e32c8e85c80cb39c69c6194/container-bin-image' -test -f '/versions/container-bin-image.8c1a5f6298527959d0eafe4435da7582a171f5268e32c8e85c80cb39c69c6194/container-bin-image/if' -ln -sf '/versions/container-bin-image.8c1a5f6298527959d0eafe4435da7582a171f5268e32c8e85c80cb39c69c6194/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.53df785f72ebd029106c573aa802e4396b33bfdd78ba14b65ee62177c04d1a28/container-bin-image' +test -f '/versions/container-bin-image.53df785f72ebd029106c573aa802e4396b33bfdd78ba14b65ee62177c04d1a28/container-bin-image/if' +ln -sf '/versions/container-bin-image.53df785f72ebd029106c573aa802e4396b33bfdd78ba14b65ee62177c04d1a28/container-bin-image' "${dest}/deps/" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -7,12 +7,12 @@ #+s6-linux-utils.825109564ccf0b423888de36d9946db0453a95ffbce5970d994da9007f8a34cd #+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 #+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd -#+containers.196520ceed32dc6baf245ebcfce2c4a00fc7d24be7273359122b7955fdf1a339 +#+containers.b1a73e0fae9a61ed690d03a9414662fb3cf57cdaedda9d66a769b04b31fe3308 #+xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3 #+zstd.0c21eeca000c0fc1b714595d83cc5210adfa581edcf45820b95cb5921c46fcc4 #+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9 #+alpine-keys.7aa8a887a6f32ef454bca16fe2547b53b765170c2f8f0bab72ddd42c518bc941 #+getent.69120bd1e42219ed632181e8c4743c83e86e377d4b1d1197e6f8aa4c227b38ef #+fileset.a0ba1abeae878cc17e1f0ceccc0c79ee7b75b0476e283b042be371b828285b1f -#+ccx-utils.020204071392f91013fe10d159d85b96ce1cfcf6b0666afd324594dfefdf3b0a +#+ccx-utils.db99ecd4283f9c273fc4c05ef41cc47182f63581ba564e5fde275fb465937d98 #+easyseccomp.bb0906d21f579981b7d5cf6b965d69d4dfabf2dbae8b494f3268848c46619e8c \ No newline at end of file diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -21,12 +21,12 @@ #+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0 #+aat.26c64faca6c93aec6a952f93e4084d75104efe6f7c7fe589fdf2b4a2c8e73bd8 #+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd -#+containers.196520ceed32dc6baf245ebcfce2c4a00fc7d24be7273359122b7955fdf1a339 +#+containers.b1a73e0fae9a61ed690d03a9414662fb3cf57cdaedda9d66a769b04b31fe3308 #+fileset.a0ba1abeae878cc17e1f0ceccc0c79ee7b75b0476e283b042be371b828285b1f -#+logincaps.a67bba67b1e5e55ab2358bdefb29c0493d16dd72cb05571b87fbc1a215878bca +#+logincaps.1be5c33811603cdfe361449d2e898df0f2dc235bb73821be842c6169c6e3cfe9 #+snaprep.faf160dbb290f4b2a5f9b6605820a8f59b9534344c3b3b430c1cdf1a336a8a8f #+curl.7d12db521501148254cee062ca7489c9381330bb81fcfb28239e7846987a5db8 -#+git.f01264e188e8d5c54cf4fce7f662f01ad1b1e8558e305368277e2521f7b6945d +#+git.1b76c97045e62b5f9105e0ca1eac2b191dc8d9ec960b4699b77b484a4c5dfb07 #+xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3 #+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9 #+getent.69120bd1e42219ed632181e8c4743c83e86e377d4b1d1197e6f8aa4c227b38ef @@ -34,12 +34,12 @@ #+iconv.51a4f48a7ffb16a9e7c165bd16e07d0c686a2accab0b74fbc7c9c1a413fa0fc1 #+libcap.690eef0b9368137f247dff6177735aea6f9be49b1fdd5e8784c6fd4c8b84af48 #+applyuidgid-caps.8d7ac4d1fafc6213e4902c3cd0f946f5b1361a06897ded604b2dc4eff80d1bab -#+ccx-utils.020204071392f91013fe10d159d85b96ce1cfcf6b0666afd324594dfefdf3b0a +#+ccx-utils.db99ecd4283f9c273fc4c05ef41cc47182f63581ba564e5fde275fb465937d98 #+user-env.cdccc52b50fbacaeea62161170c6e3b770fa8dcd6a6e46af363cbbe451f6b5a4 #+strace.f9dbe83d3eaac5f19c4d7b3971928e97af25794472024ea02b4fd20ef5d977c2 #+mlog.7a615a6cd358a942b7d328b13562fc11cb3c82d2933f3de7fa727db87d48e6c2 -#+system-config.438ee7c7894e36d3a870512560b8cb449494757dec3871cc7488565bc17bc725 -#+system-config-rc.fd155a5c26116b5624e0011b87236201009a92ed894f4bb52bcdb951c44cfeae +#+system-config.2746af8fb00c6dd31ad38f3cb9d9c2d0765187e1be8576fc587efa850298c58e +#+system-config-rc.d5c64bff620165cab46e6991bb49c705c44ed0517507940d4065b0b18d8c244c #+system-config-scripts.743d8719166a57fed0c83d867e26997a6dafec7ae495b31ac69e13be475405fc -#+system-config-init.88bcb8e164ea26fd8e1038be8b99b87cbeae5d377dbdfc49ad0b1818588e86ad +#+system-config-init.ce6d16735a5629a46311f984ba03a7e746709e997a928f8cf163bc52d8b4ecb1 #+system-config-zsh.2395a0ac100619f08b05c21044f60208ef3fcb135a9302047c299e6d7ee2a6b1 \ No newline at end of file diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git @@ -16,7 +16,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'git-2.43.2' -make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C ./git-2.43.2 \ +make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so" \ CPATH="$pthbs_build_environment/include" \ LDFLAGS="-static --static -L$pthbs_build_environment/library" \ @@ -34,7 +34,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C ./git-2.43.2 \ V=1 all install - check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -5,7 +5,7 @@ #+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0 #+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab #+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+ccx-utils.020204071392f91013fe10d159d85b96ce1cfcf6b0666afd324594dfefdf3b0a +#+ccx-utils.db99ecd4283f9c273fc4c05ef41cc47182f63581ba564e5fde275fb465937d98 #@git:52261504e78293b651e73a518834c5c75d0b3bf6:logincaps diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -14,7 +14,7 @@ #+s6.e2ee6b1e77f60e714bd5e81d709b65a07b24dbbd9af559918a598ef82523a8c5 #+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 #+system-config-scripts.743d8719166a57fed0c83d867e26997a6dafec7ae495b31ac69e13be475405fc -#+logincaps.a67bba67b1e5e55ab2358bdefb29c0493d16dd72cb05571b87fbc1a215878bca +#+logincaps.1be5c33811603cdfe361449d2e898df0f2dc235bb73821be842c6169c6e3cfe9 #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config @@ -50,7 +50,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.c73cf0c4115c8824c53e4962d9028567677a0a14a5d2c76f7448c63b31aa0069' \ + 'pthbs_path_containers=/versions/env.5aff5032e3fbea4f6213475aa9a761da07438206eed44f3f67f136ca84f47d52' \ 'pthbs_path_mdevd=/versions/env.5efd9db39293775a765dd3ca79798f1d6d991d82daea54a5bef5fffce4509f66' \ 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 @@ -6,7 +6,7 @@ #+s6-portable-utils.f4a82103130cfcc49f440896a006e18566297bd1eaec89689a29869958a3982b #+s6-linux-init.07931b00ba7cfaca6877d09e985caf229cbd20c34f35b30754a35b9d19762b56 #+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab -#+system-config-rc.fd155a5c26116b5624e0011b87236201009a92ed894f4bb52bcdb951c44cfeae +#+system-config-rc.d5c64bff620165cab46e6991bb49c705c44ed0517507940d4065b0b18d8c244c # - build script start - @@ -29,7 +29,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.fd155a5c26116b5624e0011b87236201009a92ed894f4bb52bcdb951c44cfeae/config/s6-rc-db +s6rcdb=/versions/system-config-rc.d5c64bff620165cab46e6991bb49c705c44ed0517507940d4065b0b18d8c244c/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 @@ -4,7 +4,7 @@ #+busybox-diffutils.38ca9e723dfa24bd5cc2281952ff03c7dd312918a28dc0619b9816a293b5c8f5 #+s6-rc.6785af4c10f0e833235def47f34d88b8ac76fa2116f63d3bff478fb78de38b04 #+fileset.a0ba1abeae878cc17e1f0ceccc0c79ee7b75b0476e283b042be371b828285b1f -#+system-config.438ee7c7894e36d3a870512560b8cb449494757dec3871cc7488565bc17bc725 +#+system-config.2746af8fb00c6dd31ad38f3cb9d9c2d0765187e1be8576fc587efa850298c58e # - build script start - @@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/versions/system-config.438ee7c7894e36d3a870512560b8cb449494757dec3871cc7488565bc17bc725/config/s6-rc-source +src=/versions/system-config.2746af8fb00c6dd31ad38f3cb9d9c2d0765187e1be8576fc587efa850298c58e/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,12 +21,12 @@ #+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0 #+aat.26c64faca6c93aec6a952f93e4084d75104efe6f7c7fe589fdf2b4a2c8e73bd8 #+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd -#+containers.196520ceed32dc6baf245ebcfce2c4a00fc7d24be7273359122b7955fdf1a339 +#+containers.b1a73e0fae9a61ed690d03a9414662fb3cf57cdaedda9d66a769b04b31fe3308 #+fileset.a0ba1abeae878cc17e1f0ceccc0c79ee7b75b0476e283b042be371b828285b1f -#+logincaps.a67bba67b1e5e55ab2358bdefb29c0493d16dd72cb05571b87fbc1a215878bca +#+logincaps.1be5c33811603cdfe361449d2e898df0f2dc235bb73821be842c6169c6e3cfe9 #+snaprep.faf160dbb290f4b2a5f9b6605820a8f59b9534344c3b3b430c1cdf1a336a8a8f #+curl.7d12db521501148254cee062ca7489c9381330bb81fcfb28239e7846987a5db8 -#+git.f01264e188e8d5c54cf4fce7f662f01ad1b1e8558e305368277e2521f7b6945d +#+git.1b76c97045e62b5f9105e0ca1eac2b191dc8d9ec960b4699b77b484a4c5dfb07 #+xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3 #+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9 #+getent.69120bd1e42219ed632181e8c4743c83e86e377d4b1d1197e6f8aa4c227b38ef @@ -34,7 +34,7 @@ #+iconv.51a4f48a7ffb16a9e7c165bd16e07d0c686a2accab0b74fbc7c9c1a413fa0fc1 #+libcap.690eef0b9368137f247dff6177735aea6f9be49b1fdd5e8784c6fd4c8b84af48 #+applyuidgid-caps.8d7ac4d1fafc6213e4902c3cd0f946f5b1361a06897ded604b2dc4eff80d1bab -#+ccx-utils.020204071392f91013fe10d159d85b96ce1cfcf6b0666afd324594dfefdf3b0a +#+ccx-utils.db99ecd4283f9c273fc4c05ef41cc47182f63581ba564e5fde275fb465937d98 #+user-env.cdccc52b50fbacaeea62161170c6e3b770fa8dcd6a6e46af363cbbe451f6b5a4 #+strace.f9dbe83d3eaac5f19c4d7b3971928e97af25794472024ea02b4fd20ef5d977c2 #+mlog.7a615a6cd358a942b7d328b13562fc11cb3c82d2933f3de7fa727db87d48e6c2 \ No newline at end of file