mrrl

commit 5ce72deaaaf2b6b1326bc775fb24858ba18db725
parent 11a3c3f08c9f86c850c220d49bffa84fd26d7637
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sat,  3 May 2025 21:24:36 +0000

easyseccomp

Diffstat:
M
templates/pkg/easyseccomp
 | 
2
+-
M
variants/ccx-x86_64/containers.environment
 | 
4
++--
M
variants/ccx-x86_64/default.environment
 | 
6
+++---
M
variants/ccx-x86_64/easyseccomp
 | 
2
+-
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
 | 
2
+-
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, 23 insertions(+), 23 deletions(-)
diff --git a/templates/pkg/easyseccomp b/templates/pkg/easyseccomp
@@ -13,7 +13,7 @@
 {% block at_script %}
 
 cd {{name}}
-patch -p1 <../easyseccomp_sys_types.patch
+patch -p1 <../easyseccomp_fix_includes.patch
 build_env_static
 LDFLAGS="$LDFLAGS -lerror -largp"
 autotools_config --enable-seccomp
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.99ce4a2e859ca62f2b0669e5fb52f6654138604e03a40add3e5d7984eec0f1dd-
\ No newline at end of file
+#+easyseccomp.83eed9a737bc0f397341fe0acb3d70f5cabd0587732017a5cd8feaebeb573d23+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -37,8 +37,8 @@
 #+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
 #+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
 #+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
-#+system-config.e911ddb9fb1005baa7ea64268aeb3008bc4327c40ff8b81f4267a11dda50e886
-#+system-config-rc.4a9084fa38a4da5d16c0bd4adb66af577779afefeaf296272b9c52922719f55b
+#+system-config.2083ab9d4f4df36d03d91ed64ebce7d487ac3d83b864963539b4cc122b9f9c25
+#+system-config-rc.0a7f4fbef8977282f88db5ea7e860ef5e7759f910a291251ac305703bdff3d41
 #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.d8ba68f3a65489ad30ab905f4fa24e06313576f87874c4fa2c4b4cf9a5e4cafc
+#+system-config-init.3c81d81e7520b6e33b3a14c66f16fc9f6a6bc1a60fe604daca2c528d85f932cf
 #+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309 
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -66,7 +66,7 @@ check_static() {
 
 
 cd easyseccomp
-patch -p1 <../easyseccomp_sys_types.patch
+patch -p1 <../easyseccomp_fix_includes.patch
 build_env_static
 LDFLAGS="$LDFLAGS -lerror -largp"
 autotools_config --enable-seccomp
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.dfab34dca2a8d028842e503205fffa5c2f86fd93ee90a531e0b51558115b828d' \
+	'pthbs_path_containers=/home/ccx/versions/env.01545973b79d1928b549d6cb9fae2898066b54e4e3c117f6b7e2fd568a1fb165' \
 	'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.4a9084fa38a4da5d16c0bd4adb66af577779afefeaf296272b9c52922719f55b
+#+system-config-rc.0a7f4fbef8977282f88db5ea7e860ef5e7759f910a291251ac305703bdff3d41
 
-s6rcdb=/home/ccx/versions/system-config-rc.4a9084fa38a4da5d16c0bd4adb66af577779afefeaf296272b9c52922719f55b/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.0a7f4fbef8977282f88db5ea7e860ef5e7759f910a291251ac305703bdff3d41/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.e911ddb9fb1005baa7ea64268aeb3008bc4327c40ff8b81f4267a11dda50e886
+#+system-config.2083ab9d4f4df36d03d91ed64ebce7d487ac3d83b864963539b4cc122b9f9c25
 
 def_prefix() {
 	prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
 }
 def_dest
 
-src=/home/ccx/versions/system-config.e911ddb9fb1005baa7ea64268aeb3008bc4327c40ff8b81f4267a11dda50e886/config/s6-rc-source
+src=/home/ccx/versions/system-config.2083ab9d4f4df36d03d91ed64ebce7d487ac3d83b864963539b4cc122b9f9c25/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.2ea0f72a5dbfd351c715e372a76221eda9c506fdecc93f873def5db5bd3de376-
\ No newline at end of file
+#+easyseccomp.ca6545f8114788289f4603cfb6f716d817f2b47ee0994f37afb839c3e8df7c44+
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -37,8 +37,8 @@
 #+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
 #+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
 #+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
-#+system-config.238651f84e80bfe563d70d1b178b97f995c9898bb4115a76aba2e329ab9c4591
-#+system-config-rc.4251687bb176efaecb388934398d95c32fa180303675b3c5d757b32e97074a3f
+#+system-config.29d54710cb7e77927c7efe854e5520c5643452dc90998a78864c0fc51d548718
+#+system-config-rc.c924a5a77a9bd3bf48431cc6140e0b2d96b83a6f7e44632b1b8e97c2eb924ba2
 #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.2fd78022c867265019b3d16862b0e8a1423eba75c4fb1ef9c291b17ca35b97f2
+#+system-config-init.6913be2922e890e0860e99ad433c55820fdb5f58cb49507555ee1a8dbe6115a7
 #+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f 
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -66,7 +66,7 @@ check_static() {
 
 
 cd easyseccomp
-patch -p1 <../easyseccomp_sys_types.patch
+patch -p1 <../easyseccomp_fix_includes.patch
 build_env_static
 LDFLAGS="$LDFLAGS -lerror -largp"
 autotools_config --enable-seccomp
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.5755b6dcc5b044917722a85ca3fb3dde30a9a893cfdfacc2c5f566afad2d9bfc' \
+	'pthbs_path_containers=/versions/env.0ad34b7e89b5442f2c45e44d186bcca5ade2f4de021373d6701505fe058a72e3' \
 	'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.4251687bb176efaecb388934398d95c32fa180303675b3c5d757b32e97074a3f
+#+system-config-rc.c924a5a77a9bd3bf48431cc6140e0b2d96b83a6f7e44632b1b8e97c2eb924ba2
 
-s6rcdb=/versions/system-config-rc.4251687bb176efaecb388934398d95c32fa180303675b3c5d757b32e97074a3f/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.c924a5a77a9bd3bf48431cc6140e0b2d96b83a6f7e44632b1b8e97c2eb924ba2/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.238651f84e80bfe563d70d1b178b97f995c9898bb4115a76aba2e329ab9c4591
+#+system-config.29d54710cb7e77927c7efe854e5520c5643452dc90998a78864c0fc51d548718
 
 def_prefix() {
 	prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
 }
 def_dest
 
-src=/versions/system-config.238651f84e80bfe563d70d1b178b97f995c9898bb4115a76aba2e329ab9c4591/config/s6-rc-source
+src=/versions/system-config.29d54710cb7e77927c7efe854e5520c5643452dc90998a78864c0fc51d548718/config/s6-rc-source
 s6-rc-compile ./s6-rc-db "$src"
 mkdir -p "$dest/config"
 mv -v s6-rc-db "$dest/config/"