commit 208d66a31a57a1503ffda02e6563f1da73bbc837
parent 03fc85d95e7b195ba74d84ebd18eaee6d582cb96
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sun, 12 Oct 2025 12:35:16 +0000
update environments
Diffstat:
17 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/templates/pkg/containers.environment b/templates/pkg/containers.environment
@@ -16,3 +16,5 @@
#+{{pkg_install_name("fileset")}}
#+{{pkg_install_name("ccx-utils")}}
#+{{pkg_install_name("easyseccomp")}}
+#+{{pkg_install_name("findutils")}}
+#+{{pkg_install_name("nawk")}}
diff --git a/templates/pkg/mdevd.environment b/templates/pkg/mdevd.environment
@@ -4,3 +4,4 @@
#+{{pkg_install_name("s6")}}
#+{{pkg_install_name("mdev-scripts")}}
#+{{pkg_install_name("mdevd")}}
+#+{{pkg_install_name("busybox:modutils")}}
diff --git a/templates/pkg/userspace.environment b/templates/pkg/userspace.environment
@@ -38,3 +38,5 @@
#+{{pkg_install_name("user-env")}}
#+{{pkg_install_name("strace")}}
#+{{pkg_install_name("mlog")}}
+#+{{pkg_install_name("findutils")}}
+#+{{pkg_install_name("nawk")}}
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -15,4 +15,6 @@
#+getent.a9501f429ac77e741a1a60fd699f8f3b8151ed7f78be82041b27d38061eb7e67
#+fileset.ef68ca573cfec23b65e7ed7447d08f037147067bbb24f17c3e33a6db8423c8a1
#+ccx-utils.fd440081dc22cd470ccd8fd164a355a3ab4f70a17b5acd6c816e7d8fc3a68a59
-#+easyseccomp.4368fd5443787bb059c0e7e7368d13ab09b67d789e679620d46929653260849b-
\ No newline at end of file
+#+easyseccomp.4368fd5443787bb059c0e7e7368d13ab09b67d789e679620d46929653260849b
+#+findutils.acabe096cf8a4c328d4edd1b2d0bc2edf3b5207af56e582f77806ddbbf6dd2c1
+#+nawk.7a9a6aeeddfdfce14fd07c84b51c3429fc3de7ef6e37ff73f9dee2ed8299a0c6+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -38,8 +38,10 @@
#+user-env.d869162aa28782e511eccdf5e86b26d73cf6af634060c7be84381e21f64d0587
#+strace.d085f99a7e068784ac0d64f1e3efe437253b28b77d4cc31a4f65c96b4ead3401
#+mlog.f6bd339c239d4e1b7bfe5a337a914ecd7b30795063ec94bce2847b8ad825c0b3
-#+system-config.c8556cccc2852966d6aba65c5912a93edf6ce16fd8080399aac784397204a625
-#+system-config-rc.9e04dfab7771d8bf983dd51d1920d8a8aa24488375294b7fcac8cd3852aa5d2d
+#+findutils.acabe096cf8a4c328d4edd1b2d0bc2edf3b5207af56e582f77806ddbbf6dd2c1
+#+nawk.7a9a6aeeddfdfce14fd07c84b51c3429fc3de7ef6e37ff73f9dee2ed8299a0c6
+#+system-config.d541054dfe128be88eaef8f419618ef1c05650cff1a018f06ffadae7f30af755
+#+system-config-rc.86c483a13bb27c10e7a2c421d3c11421f698944660bb97483d96468a892750e5
#+system-config-scripts.a54759d4f335bd14d0739a8b91412f1ce5302d65013e587018ec1bcf5363b16a
-#+system-config-init.98b1a6521dd5a7613290c3f2d981d6b9e44e7287e60b48eb02fa7c7cab8885fe
+#+system-config-init.83015b86d18512a2d480412c6e39a132613e96bb441784649d5ba15a0a5c5618
#+system-config-zsh.3f24324efe84089cac74c52a6324952a793cd304f29ea46e4f28fb00c8c35df7
\ No newline at end of file
diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment
@@ -3,4 +3,5 @@
#+execline.e7a749921b4a04631cc69f2189ac67401545d9873cdeb7813aa392e8ebd11558
#+s6.ec5e9584f149a7ebfb4f1f1bea29df7e6df41f2aae07dfc886c0bca8872a86e3
#+mdev-scripts.99f601d5168558f96642a39ad9a72ba0156f666b7165f2f11eda33c9c300820a
-#+mdevd.d6567b11bd64531ed1b61d21a52ab45f8af8a73d38eed69cfea60764ee571517-
\ No newline at end of file
+#+mdevd.d6567b11bd64531ed1b61d21a52ab45f8af8a73d38eed69cfea60764ee571517
+#+busybox.cfefa180f012b4a02421bba490d1d82dc7516f72025e2e0828195d2f8a7f2321+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -51,8 +51,8 @@ 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.470a1f4de38696b599ca32f231479a4e5e18f78505ee0725a9e0fe14cbef815b' \
- 'pthbs_path_mdevd=/home/ccx/versions/env.6f1b9f89915b463dcd9d57192d61983d70492c306970232e522361b7f44e2783' \
+ 'pthbs_path_containers=/home/ccx/versions/env.58d0da3d1d0fcb244c86f7656bcd3dbadcba011a243b932d49996e46837806d3' \
+ 'pthbs_path_mdevd=/home/ccx/versions/env.250c7ba035d501b0f73196a770a715186271d1e4108d2af2c60ecf6aed83acb2' \
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
@@ -7,7 +7,7 @@
#+s6-portable-utils.5534529a48c31580917b6612a7531e8ef3b638f5423cc7c117f3b071d54051aa
#+s6-linux-init.370b116a128899247e59ff60d4a636090b81361b7abb0ec9b5d0e5aeb567d075
#+execline.e7a749921b4a04631cc69f2189ac67401545d9873cdeb7813aa392e8ebd11558
-#+system-config-rc.9e04dfab7771d8bf983dd51d1920d8a8aa24488375294b7fcac8cd3852aa5d2d
+#+system-config-rc.86c483a13bb27c10e7a2c421d3c11421f698944660bb97483d96468a892750e5
# - 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.9e04dfab7771d8bf983dd51d1920d8a8aa24488375294b7fcac8cd3852aa5d2d/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.86c483a13bb27c10e7a2c421d3c11421f698944660bb97483d96468a892750e5/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.1aa76d52d9aa0d4541fde1ed8cac30606ca4ec9985ce43454ffc7cd60ab1a0be
#+s6-rc.0d683e0fe121aed629c65833a03a2060db1cc6ed0028fe4f1b28ee6380867a68
#+fileset.ef68ca573cfec23b65e7ed7447d08f037147067bbb24f17c3e33a6db8423c8a1
-#+system-config.c8556cccc2852966d6aba65c5912a93edf6ce16fd8080399aac784397204a625
+#+system-config.d541054dfe128be88eaef8f419618ef1c05650cff1a018f06ffadae7f30af755
# - build script start -
@@ -14,7 +14,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'system-config-rc'
-src=/home/ccx/versions/system-config.c8556cccc2852966d6aba65c5912a93edf6ce16fd8080399aac784397204a625/config/s6-rc-source
+src=/home/ccx/versions/system-config.d541054dfe128be88eaef8f419618ef1c05650cff1a018f06ffadae7f30af755/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
@@ -37,4 +37,6 @@
#+ccx-utils.fd440081dc22cd470ccd8fd164a355a3ab4f70a17b5acd6c816e7d8fc3a68a59
#+user-env.d869162aa28782e511eccdf5e86b26d73cf6af634060c7be84381e21f64d0587
#+strace.d085f99a7e068784ac0d64f1e3efe437253b28b77d4cc31a4f65c96b4ead3401
-#+mlog.f6bd339c239d4e1b7bfe5a337a914ecd7b30795063ec94bce2847b8ad825c0b3-
\ No newline at end of file
+#+mlog.f6bd339c239d4e1b7bfe5a337a914ecd7b30795063ec94bce2847b8ad825c0b3
+#+findutils.acabe096cf8a4c328d4edd1b2d0bc2edf3b5207af56e582f77806ddbbf6dd2c1
+#+nawk.7a9a6aeeddfdfce14fd07c84b51c3429fc3de7ef6e37ff73f9dee2ed8299a0c6+
\ No newline at end of file
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -15,4 +15,6 @@
#+getent.fc12089f12363b52fd60dd586a3e64264b96b91e5f1e75065e06567db7c4bab2
#+fileset.1971823cad4993996adf72ab25c1201795c7af2f47abf0fbbbef93f748dcc2aa
#+ccx-utils.6f2321b07c0de2ea8904eaa883931f2ae61a5a38d472d499a26819ffd6d9faf0
-#+easyseccomp.97e5ec6c3f9fcb92e01f5fb87dcc36e9b83d3dbd6414f9ab65d9ff73d4ac0cf0-
\ No newline at end of file
+#+easyseccomp.97e5ec6c3f9fcb92e01f5fb87dcc36e9b83d3dbd6414f9ab65d9ff73d4ac0cf0
+#+findutils.dece147f2921d0477c8aec1d431a3b18e1198e7ad81b06b51368f561ee311e4b
+#+nawk.6f65756dfd9fd32f6b702d0659871036b39b90591b8c8f739874371552169a73+
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -38,8 +38,10 @@
#+user-env.c122a1e224f7b55335598aed23d9faf242ebdeb93f22599e0daf744dfe6d90fc
#+strace.738f60dbbd23a60faa4cc56e512b15b58679042fe1d9cb37c9deff22bf0c164b
#+mlog.ccfb3c3a0ae18af9411bffe67e03b6dee0df9427906bd028635bce7208f9fc8f
-#+system-config.aac6a6b5be89ed129cbc7f00973c09f1a04faa2bf171a59f8a4438cedd24049b
-#+system-config-rc.aec1e74c926b61cdfa7a4dfd67a90862a63734fa8cf4fbebf5af17d065ac7960
+#+findutils.dece147f2921d0477c8aec1d431a3b18e1198e7ad81b06b51368f561ee311e4b
+#+nawk.6f65756dfd9fd32f6b702d0659871036b39b90591b8c8f739874371552169a73
+#+system-config.72bc58f2454ee65b27c1a8d2f785d76287ce8b90526c76f5574be461deb23923
+#+system-config-rc.5aa1b80a470e262a4390a79316b32933735feb11bb38cb4effc75d83eef2c0f1
#+system-config-scripts.5ade8006267d5dd6f2fa7be80dc04f8396ed6e6da6abd1d23eaaee1f237ba341
-#+system-config-init.ee68dee2e30f000b1e035e98382f8d39f5a9c7f87c011cac76ac961fd0034ad0
+#+system-config-init.65b874221a69fd3662406ece6c6b973a6e59897fc14a7ba0bfb2ae8097f51468
#+system-config-zsh.2f424f7007ce63719a484ba88a797dba7ae43a63408eb4ebd0dc8d7b252fccc1
\ No newline at end of file
diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment
@@ -3,4 +3,5 @@
#+execline.12affe71ab57cb7af1ded3d020f86f17da85e43f90ba29f285bdc99b4033b709
#+s6.00ab14dbd9452f164300744ed4109021c203164b343b7c011eeae7bb7415109f
#+mdev-scripts.990f7d9c1b54374777f7d593e600fa38362c5f3ccf41e4a00cbce48f79f4d1c7
-#+mdevd.2bacf3577f74d3075a45d49dbef781a8a66ead6fb13cc446024a26d64feb7284-
\ No newline at end of file
+#+mdevd.2bacf3577f74d3075a45d49dbef781a8a66ead6fb13cc446024a26d64feb7284
+#+busybox.2fc781342919549fb8bcb0f966b3a2d0f3a54f5d8c10f4d03962654d8f766321+
\ No newline at end of file
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -51,8 +51,8 @@ printf '%s\n' >config/etc/skel/loginexec \
chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
- 'pthbs_path_containers=/versions/env.b94ecee485af1d1beb5510aa2b9651218d4620e83cc1911c84a074e9e438c83b' \
- 'pthbs_path_mdevd=/versions/env.d08eec61635bd94204804ededd34a403402dd7ba288a8e21f5620e963827a06e' \
+ 'pthbs_path_containers=/versions/env.0b5f6504965948ad13fc368b8fe6d54b8da0fca71a81ba4b80a6cbf00def279a' \
+ 'pthbs_path_mdevd=/versions/env.9d89fcf5bf93b880d7afe1bd517794ff71a33fa4869615b247f5d2ed7b377e2e' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
sort -u build/execfile | while IFS= read exename; do
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.2a35e10fc49989ff11cab6f9c8ff1ce2e07000d2ec36296cbc1236f9eb6b6305
#+s6-linux-init.b686a32f757913770efafac4666d1be98cea4a76838f7d79e646dd63ac67d507
#+execline.12affe71ab57cb7af1ded3d020f86f17da85e43f90ba29f285bdc99b4033b709
-#+system-config-rc.aec1e74c926b61cdfa7a4dfd67a90862a63734fa8cf4fbebf5af17d065ac7960
+#+system-config-rc.5aa1b80a470e262a4390a79316b32933735feb11bb38cb4effc75d83eef2c0f1
# - 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.aec1e74c926b61cdfa7a4dfd67a90862a63734fa8cf4fbebf5af17d065ac7960/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.5aa1b80a470e262a4390a79316b32933735feb11bb38cb4effc75d83eef2c0f1/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.7c9e0bee30fb6332bf7fa171c534c15d5d7d4fb0702c8f3cad054b4c34cd52ab
#+s6-rc.55862e01a106b3a786dfdadbca91ae5847fe7858a1b01c2bc1b30251b9d37c0b
#+fileset.1971823cad4993996adf72ab25c1201795c7af2f47abf0fbbbef93f748dcc2aa
-#+system-config.aac6a6b5be89ed129cbc7f00973c09f1a04faa2bf171a59f8a4438cedd24049b
+#+system-config.72bc58f2454ee65b27c1a8d2f785d76287ce8b90526c76f5574be461deb23923
# - build script start -
@@ -14,7 +14,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'system-config-rc'
-src=/versions/system-config.aac6a6b5be89ed129cbc7f00973c09f1a04faa2bf171a59f8a4438cedd24049b/config/s6-rc-source
+src=/versions/system-config.72bc58f2454ee65b27c1a8d2f785d76287ce8b90526c76f5574be461deb23923/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
@@ -37,4 +37,6 @@
#+ccx-utils.6f2321b07c0de2ea8904eaa883931f2ae61a5a38d472d499a26819ffd6d9faf0
#+user-env.c122a1e224f7b55335598aed23d9faf242ebdeb93f22599e0daf744dfe6d90fc
#+strace.738f60dbbd23a60faa4cc56e512b15b58679042fe1d9cb37c9deff22bf0c164b
-#+mlog.ccfb3c3a0ae18af9411bffe67e03b6dee0df9427906bd028635bce7208f9fc8f-
\ No newline at end of file
+#+mlog.ccfb3c3a0ae18af9411bffe67e03b6dee0df9427906bd028635bce7208f9fc8f
+#+findutils.dece147f2921d0477c8aec1d431a3b18e1198e7ad81b06b51368f561ee311e4b
+#+nawk.6f65756dfd9fd32f6b702d0659871036b39b90591b8c8f739874371552169a73+
\ No newline at end of file
