commit e804d7608d795b75330f1c8054d58250b24dd330
parent 18862121a751b0dd442e7accea815034e01a0358
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Wed, 8 Oct 2025 16:21:52 +0000
abduco: print config.mk during build
Diffstat:
19 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/templates/pkg/abduco b/templates/pkg/abduco
@@ -22,7 +22,7 @@ CC = cc
CFLAGS = -pipe -Os
LDFLAGS = -static
EOF
-sed 's/^/> ' config.mk
+sed 's/^/> /' config.mk
make DESTDIR="${pthbs_destdir}" install
# the Makefile hardcodes 'bin' despite configure undersanding BINDIR
mv "${pthbs_destdir}${prefix}/bin" "${pthbs_destdir}${prefix}/command"
diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco
@@ -37,7 +37,7 @@ CC = cc
CFLAGS = -pipe -Os
LDFLAGS = -static
EOF
-sed 's/^/> ' config.mk
+sed 's/^/> /' config.mk
make DESTDIR="${pthbs_destdir}" install
# the Makefile hardcodes 'bin' despite configure undersanding BINDIR
mv "${pthbs_destdir}${prefix}/bin" "${pthbs_destdir}${prefix}/command"
diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image
@@ -8,7 +8,7 @@
#+applyuidgid-caps.39e027e509a32cdf24c86783914e3bc18d730aefe06c84e172780a17e500b882
#+easyseccomp.6631f58c9fe090f2b2becc5ac606901736aba4ad2a0075f6402bec85eaa3df7b
#+mlog.a63c78a5967e11f6fcac02b7eced93c023b82172f901e0f3929fad33b591f676
-#+abduco.edd8f8f966171755d4b1eefc073c5f98451ebb37c300fd22310b0fcf97ee69c1
+#+abduco.9788efe51d22c220fc48c6eb326450031b440df986715605bbb2968dfffe707a
#@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.e3e18eec4bee62fe551c779628f092173533bc479b283c84633f6e934a973c77
+#+container-bin-image.3ec927a697f21b1729dfb27bf06e9aabf33498c04bf51ef44a5bbac41cb36242
#@git:8ec212c9411088ad7e116e330d6a33f68c539678: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.e3e18eec4bee62fe551c779628f092173533bc479b283c84633f6e934a973c77/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.e3e18eec4bee62fe551c779628f092173533bc479b283c84633f6e934a973c77/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.e3e18eec4bee62fe551c779628f092173533bc479b283c84633f6e934a973c77/container-bin-image' "$pkgdir/deps/"
+test -d '/home/ccx/versions/container-bin-image.3ec927a697f21b1729dfb27bf06e9aabf33498c04bf51ef44a5bbac41cb36242/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.3ec927a697f21b1729dfb27bf06e9aabf33498c04bf51ef44a5bbac41cb36242/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.3ec927a697f21b1729dfb27bf06e9aabf33498c04bf51ef44a5bbac41cb36242/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.a0db771cc8ba3ed2125ba89263fa56dfc71fc96680e11babf61075468ae50da6
#+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.4e6d6b19281f8635665919690fdd55d607fa0f4844c06eadfa4fde388f5947f3
+#+containers.f2c7145efe3ebbf6feefb468c34592ae96919486057a08dfca965d45d77c44e8
#+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.4e6d6b19281f8635665919690fdd55d607fa0f4844c06eadfa4fde388f5947f3
+#+containers.f2c7145efe3ebbf6feefb468c34592ae96919486057a08dfca965d45d77c44e8
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.0dbfa34f984cf27eb1bbdf2d410e42d6be476034bfaa3ed99cab35d68dba70e9
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -38,8 +38,8 @@
#+user-env.e62405f563e0121ea18afb590d6c8a65c51bef9de4381a0129d41707d28d4441
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
#+mlog.a63c78a5967e11f6fcac02b7eced93c023b82172f901e0f3929fad33b591f676
-#+system-config.798762683bed26f57978e80a46a7cc1d696dbb717d7d0d2bac0fcb107faaf475
-#+system-config-rc.649987fd9329b0b07f16c2f3bb9b2a3fc59ed25ac4df18813bf9e3c7d40b604c
+#+system-config.b25dcd24cc3a69698828326261f61864b992a9536bc9f9cfebc081b00193319b
+#+system-config-rc.d855abd600b7614bd4b524b4f0fb17cef43c1a382128ca96454d4f8ce7e5b655
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.9607912ff13ada79c710662a2a3e828921748c1c8cf5fc58c67e93718935271e
+#+system-config-init.000bca654ebcee067b0810c925bf1dbb7192416301a39877978a2d9742555fef
#+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.17e84590f9684c0f21255b2426f143141461d6a2eba0933f16195ced50815fd7' \
+ 'pthbs_path_containers=/home/ccx/versions/env.04ba33fadd94976b2814e75c98e09f466a5504c61103b58482e31dfd3a568b00' \
'pthbs_path_mdevd=/home/ccx/versions/env.e02ae465352da50ef107cd44a20fcd4524a472fd04085d4ce4d6f0245573acca' \
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.3e96b31d7bff608d0c9810e699237fbac7801bb03ae57eff5f09fd4f7b7f55ad
#+s6-linux-init.0ac562bab483ecc9e38880c5f8056ec0246bfdc86a3f5c3fde04fde1520f03b0
#+execline.e05ca0101b7193066488ca5ce760820c4eb1b11c13416faafc05e1bfd3469609
-#+system-config-rc.649987fd9329b0b07f16c2f3bb9b2a3fc59ed25ac4df18813bf9e3c7d40b604c
+#+system-config-rc.d855abd600b7614bd4b524b4f0fb17cef43c1a382128ca96454d4f8ce7e5b655
-s6rcdb=/home/ccx/versions/system-config-rc.649987fd9329b0b07f16c2f3bb9b2a3fc59ed25ac4df18813bf9e3c7d40b604c/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.d855abd600b7614bd4b524b4f0fb17cef43c1a382128ca96454d4f8ce7e5b655/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.91f16e41dc564b3f1e3fbf438e9712a340c13dcadffddb145f75f19da4c64c35
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
-#+system-config.798762683bed26f57978e80a46a7cc1d696dbb717d7d0d2bac0fcb107faaf475
+#+system-config.b25dcd24cc3a69698828326261f61864b992a9536bc9f9cfebc081b00193319b
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.798762683bed26f57978e80a46a7cc1d696dbb717d7d0d2bac0fcb107faaf475/config/s6-rc-source
+src=/home/ccx/versions/system-config.b25dcd24cc3a69698828326261f61864b992a9536bc9f9cfebc081b00193319b/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.4e6d6b19281f8635665919690fdd55d607fa0f4844c06eadfa4fde388f5947f3
+#+containers.f2c7145efe3ebbf6feefb468c34592ae96919486057a08dfca965d45d77c44e8
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.0dbfa34f984cf27eb1bbdf2d410e42d6be476034bfaa3ed99cab35d68dba70e9
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco
@@ -37,7 +37,7 @@ CC = cc
CFLAGS = -pipe -Os
LDFLAGS = -static
EOF
-sed 's/^/> ' config.mk
+sed 's/^/> /' config.mk
make DESTDIR="${pthbs_destdir}" install
# the Makefile hardcodes 'bin' despite configure undersanding BINDIR
mv "${pthbs_destdir}${prefix}/bin" "${pthbs_destdir}${prefix}/command"
diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image
@@ -8,7 +8,7 @@
#+applyuidgid-caps.2587cbe1a32d2c3ac238bd85e76afa805ad8f3e2c9d41eaad03c785596eea894
#+easyseccomp.a69f369af91163a534bf0d1bf51c74cd98c971d7eb5f61c2ee29afb6ba7a9344
#+mlog.3a2fb37a92813d4c8700d3f9eb95753b0f2b72d5de13f03ba2f52fc0732ac487
-#+abduco.d2653eb3e7b8d53213f598d24946e558c4a091d493e48cb553f25bf2575515f8
+#+abduco.78cc7870ef9f19561234fc5082db86cb5aae0e5e9fa534a316dbbe5d870c4f44
#@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.bf2f63a2ff0afd348e92989c2ad4ea9212b1556f3cc29539584abd6f03f28f41
+#+container-bin-image.cd2bb6c7e42da21b6383ed86fb3117982b75759389267380c57e59bf60ac35b6
#@git:8ec212c9411088ad7e116e330d6a33f68c539678: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.bf2f63a2ff0afd348e92989c2ad4ea9212b1556f3cc29539584abd6f03f28f41/container-bin-image'
-test -f '/versions/container-bin-image.bf2f63a2ff0afd348e92989c2ad4ea9212b1556f3cc29539584abd6f03f28f41/container-bin-image/if'
-ln -sf '/versions/container-bin-image.bf2f63a2ff0afd348e92989c2ad4ea9212b1556f3cc29539584abd6f03f28f41/container-bin-image' "$pkgdir/deps/"
+test -d '/versions/container-bin-image.cd2bb6c7e42da21b6383ed86fb3117982b75759389267380c57e59bf60ac35b6/container-bin-image'
+test -f '/versions/container-bin-image.cd2bb6c7e42da21b6383ed86fb3117982b75759389267380c57e59bf60ac35b6/container-bin-image/if'
+ln -sf '/versions/container-bin-image.cd2bb6c7e42da21b6383ed86fb3117982b75759389267380c57e59bf60ac35b6/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.b4bed4df5163ff766e2a159788e78588eecd34c3031295e6a79a78c75188f0b8
#+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.236d067f1cc71932703b992bcaf95732f5e44590966d2f95156fe61157cdc398
+#+containers.52af71b0bd3734a4bd1939db015ee0cfa4b995ca0db04609120a73792057ee78
#+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.236d067f1cc71932703b992bcaf95732f5e44590966d2f95156fe61157cdc398
+#+containers.52af71b0bd3734a4bd1939db015ee0cfa4b995ca0db04609120a73792057ee78
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.6aeb9a653ac1eda5349ec73a3602951b14e13127d775373aad2f7849f18490ca
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -38,8 +38,8 @@
#+user-env.727ab1af6e3f8dd92ca7f5379e970bfd9954eef1d9ba04b2de74253b3232cbb2
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
#+mlog.3a2fb37a92813d4c8700d3f9eb95753b0f2b72d5de13f03ba2f52fc0732ac487
-#+system-config.72945b2681ba2d0a1949c65058ad08e6994e927a5aa51ddd84c22662af18309e
-#+system-config-rc.e6e8009c5e5b201ddecda3e85e8c3ed8eab8ae8299bcc938324716d8e4ed7e4b
+#+system-config.eccf4c8403b50ab505d4a844b89869e2772fc9188355975d466e5731b3a84604
+#+system-config-rc.e0a2f6cc21b46fc85c39ffb12f11019afdbbfca8f66e1ff5e09e5d436d22deec
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.59474ffcf8915a7411108df982e0acb905ae81c3b7c577ddfbabf7e7ca7f6f46
+#+system-config-init.41da06fbeb7f6923b2d37bdff8e3a601489b74b658cf632320463bc506b3c90e
#+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.439f6fc14fbdd250b9b881d2df141d28cdb351904802ea391bfe853901cd045a' \
+ 'pthbs_path_containers=/versions/env.74c891ae129269277f291e371f5567cce022e455faa0a27fe4976e7fcc7dd2f8' \
'pthbs_path_mdevd=/versions/env.ba58b4a599e47f5a32e4b0a42665ca211512228e70616f7d9b2fa8228846132c' \
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.25e13b694f2974d37ada521a42f6eb3919ff4b6b99132ba9652f9e6f0e2465ec
#+s6-linux-init.e5ef1bf6548ab0cd7754de77f19786ac9563d3c4064dd80e7ce8987a71815f7e
#+execline.feca91be393983bdabaa82b69a55e6f4ac0351cb09bf6147608f0a19bcc2ab07
-#+system-config-rc.e6e8009c5e5b201ddecda3e85e8c3ed8eab8ae8299bcc938324716d8e4ed7e4b
+#+system-config-rc.e0a2f6cc21b46fc85c39ffb12f11019afdbbfca8f66e1ff5e09e5d436d22deec
-s6rcdb=/versions/system-config-rc.e6e8009c5e5b201ddecda3e85e8c3ed8eab8ae8299bcc938324716d8e4ed7e4b/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.e0a2f6cc21b46fc85c39ffb12f11019afdbbfca8f66e1ff5e09e5d436d22deec/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.f6c438a4869ff14ab1ad4fafba04c1caa55432a10d96f125cb6b5fcbb6f80694
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
-#+system-config.72945b2681ba2d0a1949c65058ad08e6994e927a5aa51ddd84c22662af18309e
+#+system-config.eccf4c8403b50ab505d4a844b89869e2772fc9188355975d466e5731b3a84604
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.72945b2681ba2d0a1949c65058ad08e6994e927a5aa51ddd84c22662af18309e/config/s6-rc-source
+src=/versions/system-config.eccf4c8403b50ab505d4a844b89869e2772fc9188355975d466e5731b3a84604/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.236d067f1cc71932703b992bcaf95732f5e44590966d2f95156fe61157cdc398
+#+containers.52af71b0bd3734a4bd1939db015ee0cfa4b995ca0db04609120a73792057ee78
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.6aeb9a653ac1eda5349ec73a3602951b14e13127d775373aad2f7849f18490ca
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
