mrrl

commit c549800975b0625af032ecfd3692725b87ff8b86
parent 79a4f3d28001b272599d3c14d685ddf034fb94ce
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sat,  3 May 2025 19:38:03 +0000

easyseccomp

Diffstat:
M
templates/pkg/easyseccomp
 | 
1
+
M
variants/ccx-x86_64/containers.environment
 | 
4
++--
M
variants/ccx-x86_64/default.environment
 | 
6
+++---
M
variants/ccx-x86_64/easyseccomp
 | 
1
+
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
 | 
1
+
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(+), 20 deletions(-)
diff --git a/templates/pkg/easyseccomp b/templates/pkg/easyseccomp
@@ -1,5 +1,6 @@
 {% extends "autotools" %}
 {%- block extra_deps %}
+#+{{pkg_install_name("patch")}}
 #+{{pkg_install_name("flex")}}
 #+{{pkg_install_name("bison")}}
 #+{{pkg_install_name("libseccomp")}}
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.4db51bfc35d5c386660c100d780d75e3ccf8fccb5a87efc785f97df4f6af2b8c-
\ No newline at end of file
+#+easyseccomp.49862b3893f30b4c2d5b68f9662f13f3d568f93e39371cabbd436e2af4d1346c+
\ 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.3c56257ad1250cf2aaa1bfa2e9c29f78fccb77090ae86aaaa88d48d5792b270e
-#+system-config-rc.49168925c2d9af05c8bd79829854c42d5bae6d8f24f041a3cd97581a0ef4b8c1
+#+system-config.a4fc673b0f254ee0d62a1e990a47e88adce6a80a145a9329825c36c2fd112c2e
+#+system-config-rc.a51e95bd26efdcc278bb538357779f4f7f20a7fb9f6b1caee356eebb204c7738
 #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.052fa48c2a7afbc7ee24b999ba1bc6cd3fef5fd3411e054a2496c7c43cb5a420
+#+system-config-init.d96a712b1b62fa751101073ed52c423e0096604e1bf12d908904404ae54ef7b8
 #+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309 
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -4,6 +4,7 @@
 #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3
 #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
 #+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75
+#+patch.05834624d74752d1cbe386cd61dbd0dd98d69aad7777828dcf07390ab8772d4b
 #+flex.322ebabc6eba6cdfd84b1b90f25790b8d917035872c2e6bb2f4c8e2f05eabcfd
 #+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f
 #+libseccomp.8b32056ea0458b22266d8fc1b3cce05c82d08282c40a1e56d00d15fa57cdc156
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.dd15d133c17c6bc14ec7ab8f6acf08ac0d184e765592878b85bf1587447977bf' \
+	'pthbs_path_containers=/home/ccx/versions/env.b8a78f420d0c8e0eb25dd5de8582d1810d4b909a5f3b7fe90e91e6c951f06cf0' \
 	'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.49168925c2d9af05c8bd79829854c42d5bae6d8f24f041a3cd97581a0ef4b8c1
+#+system-config-rc.a51e95bd26efdcc278bb538357779f4f7f20a7fb9f6b1caee356eebb204c7738
 
-s6rcdb=/home/ccx/versions/system-config-rc.49168925c2d9af05c8bd79829854c42d5bae6d8f24f041a3cd97581a0ef4b8c1/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.a51e95bd26efdcc278bb538357779f4f7f20a7fb9f6b1caee356eebb204c7738/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.3c56257ad1250cf2aaa1bfa2e9c29f78fccb77090ae86aaaa88d48d5792b270e
+#+system-config.a4fc673b0f254ee0d62a1e990a47e88adce6a80a145a9329825c36c2fd112c2e
 
 def_prefix() {
 	prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
 }
 def_dest
 
-src=/home/ccx/versions/system-config.3c56257ad1250cf2aaa1bfa2e9c29f78fccb77090ae86aaaa88d48d5792b270e/config/s6-rc-source
+src=/home/ccx/versions/system-config.a4fc673b0f254ee0d62a1e990a47e88adce6a80a145a9329825c36c2fd112c2e/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.04499687496743359212ac503af851a4ab0a1d4ddf16699cc87268047cabf944-
\ No newline at end of file
+#+easyseccomp.9563e91200ae2e30a863c3fc916666e81307d020524a1e3ced38ccb85e93a0be+
\ 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.959c596f5697a5bfdbdd720f8cc745634524f35efd50ebce28fadf173a0b8c85
-#+system-config-rc.1a8daf9ea6593d4397c99f09967b2d5df41f99da448a3e0982e4953f75104b55
+#+system-config.224820c14b313d2386c79991f95666521c19acd1a94f39559e61b22bc5c55f2d
+#+system-config-rc.60d44547606fe5880137792579e289f6bf4f26160a2f2de20178198b2f2fa50b
 #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.a7b5ebc837ea3072581a68762cf24a0c2235236712429247700850a5645f87f1
+#+system-config-init.40a740cf35a4365760111991fbec5a71926d6214d97543509f2df95fcc0979bf
 #+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f 
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -4,6 +4,7 @@
 #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089
 #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
 #+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3
+#+patch.9d8b2c370a0ccf6e5ad48c27070ff1da2d30d41327fd5711a76cf570b34ae523
 #+flex.42bdab01fb2083e92a4417d5fb289c468b9a1a5b8092904b965455b74559262f
 #+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0
 #+libseccomp.cf3861629089b6a01e1499bd0296161802ff4978c7adde69cff19c5c5a568902
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.b755d8c50ac427e0347fad4557cc3b8c26457f534288e9f424578caeb9f67ecd' \
+	'pthbs_path_containers=/versions/env.3607a2981e61caab29923f7f59abb72f256e0fcdae9edee5c67842262d48e013' \
 	'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.1a8daf9ea6593d4397c99f09967b2d5df41f99da448a3e0982e4953f75104b55
+#+system-config-rc.60d44547606fe5880137792579e289f6bf4f26160a2f2de20178198b2f2fa50b
 
-s6rcdb=/versions/system-config-rc.1a8daf9ea6593d4397c99f09967b2d5df41f99da448a3e0982e4953f75104b55/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.60d44547606fe5880137792579e289f6bf4f26160a2f2de20178198b2f2fa50b/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.959c596f5697a5bfdbdd720f8cc745634524f35efd50ebce28fadf173a0b8c85
+#+system-config.224820c14b313d2386c79991f95666521c19acd1a94f39559e61b22bc5c55f2d
 
 def_prefix() {
 	prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
 }
 def_dest
 
-src=/versions/system-config.959c596f5697a5bfdbdd720f8cc745634524f35efd50ebce28fadf173a0b8c85/config/s6-rc-source
+src=/versions/system-config.224820c14b313d2386c79991f95666521c19acd1a94f39559e61b22bc5c55f2d/config/s6-rc-source
 s6-rc-compile ./s6-rc-db "$src"
 mkdir -p "$dest/config"
 mv -v s6-rc-db "$dest/config/"