commit 01480a14a1c24dc15715860f3bc64e9b06de2ca4
parent b2ba5883b3854d7d6cb0af55548ecd344c7baa4d
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Tue, 9 Dec 2025 20:00:41 +0000
add easyseccomp as prerequisite for container-bin-image
Diffstat:
17 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/templates/pkg/container-bin-image b/templates/pkg/container-bin-image
@@ -14,6 +14,7 @@
#+{{pkg_install_name("mlog")}}
#+{{pkg_install_name("abduco")}}
#+{{pkg_install_name("nawk")}}
+#+{{pkg_install_name("easyseccomp")}}
#@sha256:{{files["default-policy.easyseccomp"]}}:default-policy.easyseccomp
img="$pthbs_destdir{{versions}}/$pthbs_package/container-bin-image"
diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image
@@ -55,6 +55,7 @@
#+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5
#+abduco.3a93e52c065be61aac2256e6422c161ee874b75a458cbdf2faf4b8ce4579463c
#+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007
+#+easyseccomp.330029cffaf17cca5b39ef7eaf8ccc4b7dbf01685d07c6afdb56b4dcc6e6409d
#@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
@@ -33,7 +33,7 @@
#+alpine-keys.b022c8887d93ae486745981a1749acfe6e602da6f3cee54c5582da3e56548611
#+apk-tools.29e0d5e4389d0c818110ff0eef0af390ecd9f9439e8394831e68094ecf7ac80d
#+xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541fefdd9f3ed6f36055ac
-#+container-bin-image.bcac89ddc838dbd518657de9b8d947ba47b6f89d547a85d6c93cc97075ad195d
+#+container-bin-image.e66856b3382e0530ca92eef978756d62a4dc82df15cc17f6cdf482ba141b27ba
#@git:9820dbea1cf5060d7d04632f0fed7e91ea608309:containers
@@ -91,9 +91,9 @@ for f in '/home/ccx/versions/xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541f
ln -sf "$f" "${dest}/deps/keys/void/"
done
-test -d '/home/ccx/versions/container-bin-image.bcac89ddc838dbd518657de9b8d947ba47b6f89d547a85d6c93cc97075ad195d/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.bcac89ddc838dbd518657de9b8d947ba47b6f89d547a85d6c93cc97075ad195d/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.bcac89ddc838dbd518657de9b8d947ba47b6f89d547a85d6c93cc97075ad195d/container-bin-image' "${dest}/deps/"
+test -d '/home/ccx/versions/container-bin-image.e66856b3382e0530ca92eef978756d62a4dc82df15cc17f6cdf482ba141b27ba/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.e66856b3382e0530ca92eef978756d62a4dc82df15cc17f6cdf482ba141b27ba/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.e66856b3382e0530ca92eef978756d62a4dc82df15cc17f6cdf482ba141b27ba/container-bin-image' "${dest}/deps/"
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -51,7 +51,7 @@
#+s6-linux-utils.d1a273c7c3eb1a7ba3fd51168731cab02cb23df123e9e5a8ae029a14a5091df1
#+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a
#+confz.f0c5901534e31abbfd9a894e726f877d840e9a4f2e2855de94fa1b8b3252ac4d
-#+containers.93da4f0b0b800ef0e2e4e4285fd121a0ecaa7490f791545966ed9770b0bab384
+#+containers.db6fa4e1f325d4bfde566791ea44dd945d62c15e935a4c2698a83498be16b44c
#+xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541fefdd9f3ed6f36055ac
#+zstd.07ebc1d049247600d4df20a2640d366674671001d16f9d046fbef08699a688c0
#+apk-tools.29e0d5e4389d0c818110ff0eef0af390ecd9f9439e8394831e68094ecf7ac80d
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -66,7 +66,7 @@
#+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df
#+aat.9e1a8d84c57afc208692dea539729548b5e2c84a062f232d0abb0eabebd845c7
#+confz.f0c5901534e31abbfd9a894e726f877d840e9a4f2e2855de94fa1b8b3252ac4d
-#+containers.93da4f0b0b800ef0e2e4e4285fd121a0ecaa7490f791545966ed9770b0bab384
+#+containers.db6fa4e1f325d4bfde566791ea44dd945d62c15e935a4c2698a83498be16b44c
#+fileset.e5a151f626de3d82ae8cbffbe8df007f016ae78c7a795565377da03798048476
#+logincaps.dff305698371563065d0ae0795204a975129931ea7a3c066701f7fc21dfbda4c
#+snaprep.e1f72149bfae312f87fba56b1598446eeec81db67b3a2e98dc894d185924d29b
@@ -89,9 +89,9 @@
#+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
#+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
#+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af
-#+system-config.bbcfdbf8e0ee32bea04c063bcfa46c7a97ba5f40770788d124c5dca3c63968d1
-#+system-config-rc.46af8598ac07cc90b88df4cfbeaadb64241770f1899b9980ac7c605241646b75
+#+system-config.40b42b28713b807fa8e7f5eee7c1646c219056a35f3a69261838bbc6a755a2e6
+#+system-config-rc.ca0c89cbd606a31af4c761467f007211a2ace2d12915669aa947d3adcf3f447b
#+system-config-scripts.0c081aa66e7b2b7ccfb20f9c75e5dfff8f8d6804d0b4624934a8059354c14d9e
-#+system-config-init.c5102963a2af8206212030768edf403cbbe938ba2b8694c96d4fd53b81490ea7
+#+system-config-init.ed35c0e4a7920ce057e60f0bffa9351b9d4c9143571bc1aadf4f1e4cc354e92e
#+system-config-zsh.4fbaba9e3faaa13ba5a2d93a2b3dc4a5a94ebb5ed5bb7facfc94308076a14253
#+busybox.36df1e8543d0b5195f916843937333d8f8e3561445e8ca933ab21271b5ebe855
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -98,7 +98,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.a70f9ae1e5096856e7f60e6eea65cdf6a35a99da4fd4dc09fac621446c596060' \
+ 'pthbs_path_containers=/home/ccx/versions/env.65550d2c3ae64b9c1d10dc952c3b0d27c57d95fcfeb635668c499a5e170f4add' \
'pthbs_path_mdevd=/home/ccx/versions/env.e2f79ac0cba2c32709d0bcb0993314202e512f41afc7bd19a88dc5984e95bd88' \
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
@@ -51,7 +51,7 @@
#+s6-portable-utils.7f4db6a16ab09d3822d709aec42170cb1d2c7c752d88f13e3792e747cbd09a28
#+s6-linux-init.39d00512c8a37829a751fbbe1a7cfc37003dc9e3924d0ca13722eb2835830c2b
#+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92
-#+system-config-rc.46af8598ac07cc90b88df4cfbeaadb64241770f1899b9980ac7c605241646b75
+#+system-config-rc.ca0c89cbd606a31af4c761467f007211a2ace2d12915669aa947d3adcf3f447b
# - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/home/ccx/versions/system-config-rc.46af8598ac07cc90b88df4cfbeaadb64241770f1899b9980ac7c605241646b75/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.ca0c89cbd606a31af4c761467f007211a2ace2d12915669aa947d3adcf3f447b/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.bbcfdbf8e0ee32bea04c063bcfa46c7a97ba5f40770788d124c5dca3c63968d1
+#+system-config.40b42b28713b807fa8e7f5eee7c1646c219056a35f3a69261838bbc6a755a2e6
# - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/home/ccx/versions/system-config.bbcfdbf8e0ee32bea04c063bcfa46c7a97ba5f40770788d124c5dca3c63968d1/config/s6-rc-source
+src=/home/ccx/versions/system-config.40b42b28713b807fa8e7f5eee7c1646c219056a35f3a69261838bbc6a755a2e6/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
@@ -66,7 +66,7 @@
#+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df
#+aat.9e1a8d84c57afc208692dea539729548b5e2c84a062f232d0abb0eabebd845c7
#+confz.f0c5901534e31abbfd9a894e726f877d840e9a4f2e2855de94fa1b8b3252ac4d
-#+containers.93da4f0b0b800ef0e2e4e4285fd121a0ecaa7490f791545966ed9770b0bab384
+#+containers.db6fa4e1f325d4bfde566791ea44dd945d62c15e935a4c2698a83498be16b44c
#+fileset.e5a151f626de3d82ae8cbffbe8df007f016ae78c7a795565377da03798048476
#+logincaps.dff305698371563065d0ae0795204a975129931ea7a3c066701f7fc21dfbda4c
#+snaprep.e1f72149bfae312f87fba56b1598446eeec81db67b3a2e98dc894d185924d29b
diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image
@@ -55,6 +55,7 @@
#+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2
#+abduco.f1db083bc427ed890d5a1b8831a2afd51787e887c0b1fc33638fccbd61bbd105
#+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d
+#+easyseccomp.4f85d77b24139f6fbffb5d91d791c4bfc5a6ad0a792b7f35f239f8e078947a6a
#@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
@@ -33,7 +33,7 @@
#+alpine-keys.cf3dceec55832153ba2ec813edf663f098e3b72412def85cb3485ff7fa24ea49
#+apk-tools.61768759a496abcc715d250d77f79791b387de45fa05a9586007a253361f5be5
#+xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7ca64bb171
-#+container-bin-image.cec1da4521ccf8e06a620a0b93cac108b4177232c2d5323d8aedd33d83ffee63
+#+container-bin-image.48e6f342133bc167737b76c7260d4577c2348486ef3703dafced115a6377a7e4
#@git:9820dbea1cf5060d7d04632f0fed7e91ea608309:containers
@@ -91,9 +91,9 @@ for f in '/versions/xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7
ln -sf "$f" "${dest}/deps/keys/void/"
done
-test -d '/versions/container-bin-image.cec1da4521ccf8e06a620a0b93cac108b4177232c2d5323d8aedd33d83ffee63/container-bin-image'
-test -f '/versions/container-bin-image.cec1da4521ccf8e06a620a0b93cac108b4177232c2d5323d8aedd33d83ffee63/container-bin-image/if'
-ln -sf '/versions/container-bin-image.cec1da4521ccf8e06a620a0b93cac108b4177232c2d5323d8aedd33d83ffee63/container-bin-image' "${dest}/deps/"
+test -d '/versions/container-bin-image.48e6f342133bc167737b76c7260d4577c2348486ef3703dafced115a6377a7e4/container-bin-image'
+test -f '/versions/container-bin-image.48e6f342133bc167737b76c7260d4577c2348486ef3703dafced115a6377a7e4/container-bin-image/if'
+ln -sf '/versions/container-bin-image.48e6f342133bc167737b76c7260d4577c2348486ef3703dafced115a6377a7e4/container-bin-image' "${dest}/deps/"
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -51,7 +51,7 @@
#+s6-linux-utils.6b758d348392935fdee002a2ab4186ca505252fb4ef2e12d9e625ff809fb4f0d
#+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a
#+confz.56e8e5a838da4d763920012f278cd42d4e9e991cc202e114602b7d775a40dd30
-#+containers.ddfe912cf89feff4e18d20007228d043424ef8b76b6377f1d62de02ab7116bbb
+#+containers.4556c68c1bbaf18cc15524bbf1ec0b53b887b28d7a1b36da472cad9a4cf81267
#+xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7ca64bb171
#+zstd.34cc749f8c590e889c6486d4f33b8c57208e3c6e7d36281d84689fac44b9a64c
#+apk-tools.61768759a496abcc715d250d77f79791b387de45fa05a9586007a253361f5be5
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -66,7 +66,7 @@
#+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81
#+aat.e3e638e18b98d6c6fd82d1f1eba60082f4cfcd2e196c975cfd621f88f00e40f0
#+confz.56e8e5a838da4d763920012f278cd42d4e9e991cc202e114602b7d775a40dd30
-#+containers.ddfe912cf89feff4e18d20007228d043424ef8b76b6377f1d62de02ab7116bbb
+#+containers.4556c68c1bbaf18cc15524bbf1ec0b53b887b28d7a1b36da472cad9a4cf81267
#+fileset.f310a9481c4fdb71269bb232f4ae4c004a62c44ee2a053a3b1500d67813a91d3
#+logincaps.3aafc7b5cc23f3d491ec65b0d2517277ee00d568d50e1c4aa9a5484e7b858992
#+snaprep.c514bc4fb9267d7c957a1e104f808965a2d3617274e0c788c97f97f3ebc7b35f
@@ -89,9 +89,9 @@
#+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
#+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
#+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8
-#+system-config.4d02c9bf2508381c3196de8896b97b92e01669550417da841ba6e384b8e4d874
-#+system-config-rc.474564583175d74d1727c7632b25cbcee3f049aa2b58a745249a6bace1a58ceb
+#+system-config.6eb4a08aaef3a50da13e13ab61ad0e45370392f6ae333eaf7cb64dbd7e4b9022
+#+system-config-rc.eb461ebfd114e05e13f46fb8f37ae7251d194f85188541c5648bc7c6163c35b7
#+system-config-scripts.ac2a449afef9d2c804ccca9869bdb1eaf89223a1b687c8e154f4a46216566b11
-#+system-config-init.6d5b6a1f6aa806f55321f22f4fad2a61cf1425bc1532e432beb8fb81948b465d
+#+system-config-init.4567553d12317d2af89ff8a24c9d47591ded1ccead22c3391af1acd69fef1434
#+system-config-zsh.cbbd0ea2d203a601fb2497946adaba74910fd150b071dacffb1d82dd8c4fb33f
#+busybox-modutils.5f321825e26ecc84ba02a1cd21c040ccb3cb8324b94d5b9492012eb5163a5aa7
\ No newline at end of file
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -98,7 +98,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.bc4eb2c9a3f3856f260c3023870bd30813996e35700efb62ef7b8ec1c9aca3e1' \
+ 'pthbs_path_containers=/versions/env.6d40e3a16dc1b9dfa62c53fe7bc45d07ef80b61c64ad9f33d4a84da426c325e4' \
'pthbs_path_mdevd=/versions/env.5e5cccbd0bd86989eb0263bd18dab27db9db6906cce4db4e70dc474fa3a0424d' \
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
@@ -51,7 +51,7 @@
#+s6-portable-utils.88a5962bf96a590c8844071c1802840557768dc0a96078b815c1d9aa08ebe27c
#+s6-linux-init.7a9d91b21cceaf06297ddc4522c7be945b051eb94cd21da564920db0003350e4
#+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5
-#+system-config-rc.474564583175d74d1727c7632b25cbcee3f049aa2b58a745249a6bace1a58ceb
+#+system-config-rc.eb461ebfd114e05e13f46fb8f37ae7251d194f85188541c5648bc7c6163c35b7
# - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/versions/system-config-rc.474564583175d74d1727c7632b25cbcee3f049aa2b58a745249a6bace1a58ceb/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.eb461ebfd114e05e13f46fb8f37ae7251d194f85188541c5648bc7c6163c35b7/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.4d02c9bf2508381c3196de8896b97b92e01669550417da841ba6e384b8e4d874
+#+system-config.6eb4a08aaef3a50da13e13ab61ad0e45370392f6ae333eaf7cb64dbd7e4b9022
# - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/versions/system-config.4d02c9bf2508381c3196de8896b97b92e01669550417da841ba6e384b8e4d874/config/s6-rc-source
+src=/versions/system-config.6eb4a08aaef3a50da13e13ab61ad0e45370392f6ae333eaf7cb64dbd7e4b9022/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
@@ -66,7 +66,7 @@
#+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81
#+aat.e3e638e18b98d6c6fd82d1f1eba60082f4cfcd2e196c975cfd621f88f00e40f0
#+confz.56e8e5a838da4d763920012f278cd42d4e9e991cc202e114602b7d775a40dd30
-#+containers.ddfe912cf89feff4e18d20007228d043424ef8b76b6377f1d62de02ab7116bbb
+#+containers.4556c68c1bbaf18cc15524bbf1ec0b53b887b28d7a1b36da472cad9a4cf81267
#+fileset.f310a9481c4fdb71269bb232f4ae4c004a62c44ee2a053a3b1500d67813a91d3
#+logincaps.3aafc7b5cc23f3d491ec65b0d2517277ee00d568d50e1c4aa9a5484e7b858992
#+snaprep.c514bc4fb9267d7c957a1e104f808965a2d3617274e0c788c97f97f3ebc7b35f
