mrrl

commit 48cbdb35650edc5f65df6cd00e12187ae24b96e0
parent 94c2a8ebfa925a70cda116b84c2f407e0db30827
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sat,  3 May 2025 22:42:27 +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
@@ -17,7 +17,7 @@ patch -p1 <../easyseccomp_fix_includes.patch
 touch Makefile.in configure
 build_env_static
 autotools_config --enable-seccomp
-make -j1 V=1 LIBS="-lseccomp -lerror -largp" install
+make -j1 V=1 DESTDIR="$pthbs_destdir" LIBS="-lseccomp -lerror -largp" install
 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.38b3609ce44db4a995abddd7658d31e7fe83ba9a04213dc996c69089633b2762-
\ No newline at end of file
+#+easyseccomp.ef520ff06edd2bccf1e03506d8a6603a22602b2f19244b7a9b1c6474ccbba36c+
\ 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.7187290dd9626f7de908264dd2007c18f96ff7b57071af15dbb977596ba4e7e7
-#+system-config-rc.d48307b5a1120a38423ceb5ec225a7d83a3d87e44caade392930dc2c76aec330
+#+system-config.20880e49c754e8a305940126cd57a9e40404335656590600a2a629e50f3c62f7
+#+system-config-rc.a0f2525c02701eec72310ce9bedf35833cebdce2c928e185b5bb1ab2e0948a9b
 #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.9798c85d8d267fbf9d8f89904c07e5adf03e47eae80f556b98c2bc1e1c058d43
+#+system-config-init.83b06b041f51ea863a53fe9e0135368510da5dc3b9337e773bcf96f8159c4077
 #+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309 
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -70,7 +70,7 @@ patch -p1 <../easyseccomp_fix_includes.patch
 touch Makefile.in configure
 build_env_static
 autotools_config --enable-seccomp
-make -j1 V=1 LIBS="-lseccomp -lerror -largp" install
+make -j1 V=1 DESTDIR="$pthbs_destdir" LIBS="-lseccomp -lerror -largp" install
 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.fa47c16a3e3a9709551aa167b30f018ea5d640e9e4a7d2222ee5d29c94db8898' \
+	'pthbs_path_containers=/home/ccx/versions/env.5557175504a136684065855f9de5d682ea13f7574f8fe7ccfe5b658953b0d669' \
 	'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.d48307b5a1120a38423ceb5ec225a7d83a3d87e44caade392930dc2c76aec330
+#+system-config-rc.a0f2525c02701eec72310ce9bedf35833cebdce2c928e185b5bb1ab2e0948a9b
 
-s6rcdb=/home/ccx/versions/system-config-rc.d48307b5a1120a38423ceb5ec225a7d83a3d87e44caade392930dc2c76aec330/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.a0f2525c02701eec72310ce9bedf35833cebdce2c928e185b5bb1ab2e0948a9b/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.7187290dd9626f7de908264dd2007c18f96ff7b57071af15dbb977596ba4e7e7
+#+system-config.20880e49c754e8a305940126cd57a9e40404335656590600a2a629e50f3c62f7
 
 def_prefix() {
 	prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
 }
 def_dest
 
-src=/home/ccx/versions/system-config.7187290dd9626f7de908264dd2007c18f96ff7b57071af15dbb977596ba4e7e7/config/s6-rc-source
+src=/home/ccx/versions/system-config.20880e49c754e8a305940126cd57a9e40404335656590600a2a629e50f3c62f7/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.3a60869e8f9e971d4939bd9ec96e16fe4bf39a4bed59f5c76c99d5428923859d-
\ No newline at end of file
+#+easyseccomp.fba9e681c259d46b7d4dfe5408b7df3c23811b87832691562ccb55b761e66941+
\ 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.edd69191e232216f65416930c43ae07f80b0a8d41652331bb16b8c48065a66a9
-#+system-config-rc.526421f8b1675d5fbfce3e8615d8ab3d4cac4499c80fdce9b7f20b06982826b9
+#+system-config.2094f747728a3b81c8f71047c65d5e2ae276aef10ed3d9c44ad3c53d4850b516
+#+system-config-rc.43a0ae710220e38f9803bfe7ec9a517ecd475d88da168923e023466603654381
 #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.2b97bf0f5432a52ef4a33a877ea74a2cdfd1ff2e32b244d34df95e5c8a36a083
+#+system-config-init.aeec2298d915aefbf220311e431b32eab8716113ceaed6e162497bf1e14e15ac
 #+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f 
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -70,7 +70,7 @@ patch -p1 <../easyseccomp_fix_includes.patch
 touch Makefile.in configure
 build_env_static
 autotools_config --enable-seccomp
-make -j1 V=1 LIBS="-lseccomp -lerror -largp" install
+make -j1 V=1 DESTDIR="$pthbs_destdir" LIBS="-lseccomp -lerror -largp" install
 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.ce9abcdd9d63dd9e04f9488931451b8aef7941cccf9904f7ac8fc01ed2656c58' \
+	'pthbs_path_containers=/versions/env.717b4123582737206333109e9b861bb79b648f451a3a82f89bd40e627b6c22cf' \
 	'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.526421f8b1675d5fbfce3e8615d8ab3d4cac4499c80fdce9b7f20b06982826b9
+#+system-config-rc.43a0ae710220e38f9803bfe7ec9a517ecd475d88da168923e023466603654381
 
-s6rcdb=/versions/system-config-rc.526421f8b1675d5fbfce3e8615d8ab3d4cac4499c80fdce9b7f20b06982826b9/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.43a0ae710220e38f9803bfe7ec9a517ecd475d88da168923e023466603654381/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.edd69191e232216f65416930c43ae07f80b0a8d41652331bb16b8c48065a66a9
+#+system-config.2094f747728a3b81c8f71047c65d5e2ae276aef10ed3d9c44ad3c53d4850b516
 
 def_prefix() {
 	prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
 }
 def_dest
 
-src=/versions/system-config.edd69191e232216f65416930c43ae07f80b0a8d41652331bb16b8c48065a66a9/config/s6-rc-source
+src=/versions/system-config.2094f747728a3b81c8f71047c65d5e2ae276aef10ed3d9c44ad3c53d4850b516/config/s6-rc-source
 s6-rc-compile ./s6-rc-db "$src"
 mkdir -p "$dest/config"
 mv -v s6-rc-db "$dest/config/"