mrrl

commit 682153bd1234ce5e3ac8bf36724b5f25b9f0b6d6
parent 7f771f7c727ea60eef8e506c96aeeec608022c0d
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sat,  3 May 2025 20:06:41 +0000

easyseccomp

Diffstat:
M
templates/pkg/easyseccomp
 | 
4
+++-
M
variants/ccx-x86_64/containers.environment
 | 
4
++--
M
variants/ccx-x86_64/default.environment
 | 
6
+++---
M
variants/ccx-x86_64/easyseccomp
 | 
4
+++-
M
variants/ccx-x86_64/system-config
 | 
2
+-
M
variants/ccx-x86_64/system-config-init
 | 
4
++--
M
variants/ccx-x86_64/system-config-rc
 | 
4
++--
M
variants/root-x86_64/containers.environment
 | 
4
++--
M
variants/root-x86_64/default.environment
 | 
6
+++---
M
variants/root-x86_64/easyseccomp
 | 
4
+++-
M
variants/root-x86_64/system-config
 | 
2
+-
M
variants/root-x86_64/system-config-init
 | 
4
++--
M
variants/root-x86_64/system-config-rc
 | 
4
++--

13 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/templates/pkg/easyseccomp b/templates/pkg/easyseccomp
@@ -14,7 +14,9 @@
 
 cd {{name}}
 patch -p1 <../easyseccomp_sys_types.patch
-autotools_static . --enable-seccomp
+build_env_static
+CPATH=./src:$CPATH
+autotools . --enable-seccomp
 check_static command/easyseccomp
 
 {% endblock %}
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -15,4 +15,4 @@
 #+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447
 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
 #+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
-#+easyseccomp.3697920e1e81e412fe0f2ecf3c6f747f09014c4a2af742c7f4541c7d59edc6cb-
\ No newline at end of file
+#+easyseccomp.0f2c0cb1d2fec204cd9f6f66e8f34cbd4e2fbd1f6e20560c75df57ef3f8a088e+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -36,8 +36,8 @@
 #+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514
 #+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
 #+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
-#+system-config.93b9bb5193e030ce5e7d91ed2006694120edb6557612efa9ef725c0a55c757eb
-#+system-config-rc.0b9966225c723aa09579fbee4c9ab01ef4f16a10208e25f071b7189e95170d2a
+#+system-config.8c28ae3e432f23b6dd1225c35eaa3b1f8cfa24b00d685f3283c841154379076d
+#+system-config-rc.c947af86758e533bd89a40f7a611527f15b897399ce6f9652b80536e3be4e125
 #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.d93851aab1001aaa8d6c3f5e57bad9f9960ae9e6ac7de5df1b3d7b2d23f38cf7
+#+system-config-init.58d56bb4d092b8fe5bbeb5326722dd438ad1051116a835002979b1de0aa57534
 #+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309 
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -67,7 +67,9 @@ check_static() {
 
 cd easyseccomp
 patch -p1 <../easyseccomp_sys_types.patch
-autotools_static . --enable-seccomp
+build_env_static
+CPATH=./src:$CPATH
+autotools . --enable-seccomp
 check_static command/easyseccomp
 
 
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.892f38b689bf280e9978837486c3b3b468564d4bda2e73b59c7ff4e9fedd0df2' \
+	'pthbs_path_containers=/home/ccx/versions/env.e9065b86d6b569d112d5adc06be59c041c82fc56f9c5312854b543ed8f930e72' \
 	'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.0b9966225c723aa09579fbee4c9ab01ef4f16a10208e25f071b7189e95170d2a
+#+system-config-rc.c947af86758e533bd89a40f7a611527f15b897399ce6f9652b80536e3be4e125
 
-s6rcdb=/home/ccx/versions/system-config-rc.0b9966225c723aa09579fbee4c9ab01ef4f16a10208e25f071b7189e95170d2a/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.c947af86758e533bd89a40f7a611527f15b897399ce6f9652b80536e3be4e125/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.93b9bb5193e030ce5e7d91ed2006694120edb6557612efa9ef725c0a55c757eb
+#+system-config.8c28ae3e432f23b6dd1225c35eaa3b1f8cfa24b00d685f3283c841154379076d
 
 def_prefix() {
 	prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
 }
 def_dest
 
-src=/home/ccx/versions/system-config.93b9bb5193e030ce5e7d91ed2006694120edb6557612efa9ef725c0a55c757eb/config/s6-rc-source
+src=/home/ccx/versions/system-config.8c28ae3e432f23b6dd1225c35eaa3b1f8cfa24b00d685f3283c841154379076d/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/containers.environment b/variants/root-x86_64/containers.environment
@@ -15,4 +15,4 @@
 #+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97
 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
 #+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
-#+easyseccomp.979f08c28c4721505e5bd6386f5aaecf3eeaf919f5effb7e860967d24e51024a-
\ No newline at end of file
+#+easyseccomp.e2a9f74903bcaa6d6e48188a1ec84c9096f6f07a78adf32f1e25d0dba9bb4db1+
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -36,8 +36,8 @@
 #+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8
 #+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
 #+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
-#+system-config.634e72fdd83184d96be84f5d6c55c1866a572b18e22e34fc02169419ec3d8fd3
-#+system-config-rc.7694f64a5232cd127a58f873e2d562e45b3116303ab13fe3e920a81f92525869
+#+system-config.25cc254d811d82e2f9dd2f71bf76a6cfd0829c939c00c73e9f0d48b9fefc1c8b
+#+system-config-rc.eeb05752477569b5eeff5ba636f718b29d899f153b93414012a734e9fd7884c9
 #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.5081587a06743423b25ecc17cc37cf1691b81ca72bb7ef41dc89c5d26725fabe
+#+system-config-init.0c97a625b9a07d258591e786a3a265f4465c4cfd11fbc65ace817b10b1eb138f
 #+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f 
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -67,7 +67,9 @@ check_static() {
 
 cd easyseccomp
 patch -p1 <../easyseccomp_sys_types.patch
-autotools_static . --enable-seccomp
+build_env_static
+CPATH=./src:$CPATH
+autotools . --enable-seccomp
 check_static command/easyseccomp
 
 
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.951f9ed6cfb430c53830cc9cd1cb7d838568e251ae59504791f8bcd9d93756c2' \
+	'pthbs_path_containers=/versions/env.9db02eade551f158f628fb7aa02d45f1b5de0d85d1ff1d5b36d04cfbe72af951' \
 	'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.7694f64a5232cd127a58f873e2d562e45b3116303ab13fe3e920a81f92525869
+#+system-config-rc.eeb05752477569b5eeff5ba636f718b29d899f153b93414012a734e9fd7884c9
 
-s6rcdb=/versions/system-config-rc.7694f64a5232cd127a58f873e2d562e45b3116303ab13fe3e920a81f92525869/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.eeb05752477569b5eeff5ba636f718b29d899f153b93414012a734e9fd7884c9/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.634e72fdd83184d96be84f5d6c55c1866a572b18e22e34fc02169419ec3d8fd3
+#+system-config.25cc254d811d82e2f9dd2f71bf76a6cfd0829c939c00c73e9f0d48b9fefc1c8b
 
 def_prefix() {
 	prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
 }
 def_dest
 
-src=/versions/system-config.634e72fdd83184d96be84f5d6c55c1866a572b18e22e34fc02169419ec3d8fd3/config/s6-rc-source
+src=/versions/system-config.25cc254d811d82e2f9dd2f71bf76a6cfd0829c939c00c73e9f0d48b9fefc1c8b/config/s6-rc-source
 s6-rc-compile ./s6-rc-db "$src"
 mkdir -p "$dest/config"
 mv -v s6-rc-db "$dest/config/"