commit b774ec4c1b3b9f4cc44f4738661b326c716874f2
parent 49410ee09ed36394273a20029e155d47b039a3bc
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 21:34:55 +0000
easyseccomp
Diffstat:
13 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/templates/pkg/easyseccomp b/templates/pkg/easyseccomp
@@ -16,13 +16,14 @@ cd {{name}}
patch -p1 <../easyseccomp_fix_includes.patch
touch Makefile.in configure
build_env_static
-LDFLAGS="$LDFLAGS -lerror -largp"
autotools_config --enable-seccomp
-{{make}} || {{make}} V=1
+{{make}} src/libeasyseccomp_a-lexer.h
+{{make}} V=1 LIBS="-lseccomp -lerror -largp"
check_static command/easyseccomp
{% endblock %}
{% block genlinks_begin %}
+ x["./command/seccomp-run"]=1
x["./command/easyseccomp"]=1
x["./library/libeasyseccomp.a"]=1
{% 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.6f8d063a0cf70a327594ad1b3a9191ac0fd77d9fac007d1215f89e02379729b5-
\ No newline at end of file
+#+easyseccomp.a7d2b0b93cf1a063a835b2d40046926f5511f19ea3d56a12926d5c46f69c1525+
\ 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.05446f2a2b6963cc98153de46c493f131e70007f656c59e4a887017bd4f0360f
-#+system-config-rc.07e9c05d7f354d8c31020a8dd7bc4a9c444723e805e8ae16fdd976a463b3991b
+#+system-config.e80a169c81ccf9269903fb7ecafc28ceb46d288ad69c8b94d511c9488cbfb0b9
+#+system-config-rc.41bac3e3c9b33b82b40a7db993ef8ca9d93705f25c43e97bb17649ea5aea8b8e
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.11571f7bf82f6649d1fdee81430847903f7aff779fcd401e28357b88fa78a62e
+#+system-config-init.90968e6c1d24ad1040533293e537c8d7eb35507258be1feaea8acb0eaf36be54
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -69,9 +69,9 @@ cd easyseccomp
patch -p1 <../easyseccomp_fix_includes.patch
touch Makefile.in configure
build_env_static
-LDFLAGS="$LDFLAGS -lerror -largp"
autotools_config --enable-seccomp
-make -j${JOBS:-1} -l$((1+${JOBS:-1})) || make -j${JOBS:-1} -l$((1+${JOBS:-1})) V=1
+make -j${JOBS:-1} -l$((1+${JOBS:-1})) src/libeasyseccomp_a-lexer.h
+make -j${JOBS:-1} -l$((1+${JOBS:-1})) V=1 LIBS="-lseccomp -lerror -largp"
check_static command/easyseccomp
@@ -79,6 +79,7 @@ check_static command/easyseccomp
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
BEGIN {
+ x["./command/seccomp-run"]=1
x["./command/easyseccomp"]=1
x["./library/libeasyseccomp.a"]=1
}
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.a1bfb2ea82e04096af6772dc1fe4729044fff5cd3262db0475ca36d69d8a442d' \
+ 'pthbs_path_containers=/home/ccx/versions/env.2142844bf52c9bc0aa18c3c984e6299a41e2dfe5b3709e71aa3cd09785cfd3c2' \
'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.07e9c05d7f354d8c31020a8dd7bc4a9c444723e805e8ae16fdd976a463b3991b
+#+system-config-rc.41bac3e3c9b33b82b40a7db993ef8ca9d93705f25c43e97bb17649ea5aea8b8e
-s6rcdb=/home/ccx/versions/system-config-rc.07e9c05d7f354d8c31020a8dd7bc4a9c444723e805e8ae16fdd976a463b3991b/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.41bac3e3c9b33b82b40a7db993ef8ca9d93705f25c43e97bb17649ea5aea8b8e/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.05446f2a2b6963cc98153de46c493f131e70007f656c59e4a887017bd4f0360f
+#+system-config.e80a169c81ccf9269903fb7ecafc28ceb46d288ad69c8b94d511c9488cbfb0b9
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.05446f2a2b6963cc98153de46c493f131e70007f656c59e4a887017bd4f0360f/config/s6-rc-source
+src=/home/ccx/versions/system-config.e80a169c81ccf9269903fb7ecafc28ceb46d288ad69c8b94d511c9488cbfb0b9/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.33b7fde8d3ba2d54ba32df38f9788566964b43af056f593728ba3959992fe8b9-
\ No newline at end of file
+#+easyseccomp.2d03fc0b18b1dff4a32f1eb582172ca9ad2c7c4a330fa1313425aa2cb86e40b7+
\ 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.ad4a683eeb271ff98d3d28f808d9d8aabc4258a5defe6425bdb008c6b204d067
-#+system-config-rc.9f3ce7d3433abce28ac03a4159a9971a44a7aaf4546e953cf10e3ea2751fa0cc
+#+system-config.7ebfd544e34061a36833c1a873484df169098fa5dc82ca8258410586e21bcbb8
+#+system-config-rc.f12d55322a049d06e42792d24db5bca4ca93e1fb9f1955f9c4d81cc0af0c0f27
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.0face7288a8af325d727e0e0733fb55e1831e30985070f8185ed14af856680e8
+#+system-config-init.48f9cf0ff35763aba8f1320c14130a208683a16f2c8213be7cabe3df0c7d2cf2
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -69,9 +69,9 @@ cd easyseccomp
patch -p1 <../easyseccomp_fix_includes.patch
touch Makefile.in configure
build_env_static
-LDFLAGS="$LDFLAGS -lerror -largp"
autotools_config --enable-seccomp
-make -j${JOBS:-1} -l$((1+${JOBS:-1})) || make -j${JOBS:-1} -l$((1+${JOBS:-1})) V=1
+make -j${JOBS:-1} -l$((1+${JOBS:-1})) src/libeasyseccomp_a-lexer.h
+make -j${JOBS:-1} -l$((1+${JOBS:-1})) V=1 LIBS="-lseccomp -lerror -largp"
check_static command/easyseccomp
@@ -79,6 +79,7 @@ check_static command/easyseccomp
cd "$pthbs_destdir/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
BEGIN {
+ x["./command/seccomp-run"]=1
x["./command/easyseccomp"]=1
x["./library/libeasyseccomp.a"]=1
}
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.0a80fd39c9bc2a9ffa93afccc218ae9510052c7f22da9ad18e5aa924f8d9f48d' \
+ 'pthbs_path_containers=/versions/env.b785da6502b6f92d068f512d51aab39f2f11cf926dd57f1275d38fa065218a27' \
'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.9f3ce7d3433abce28ac03a4159a9971a44a7aaf4546e953cf10e3ea2751fa0cc
+#+system-config-rc.f12d55322a049d06e42792d24db5bca4ca93e1fb9f1955f9c4d81cc0af0c0f27
-s6rcdb=/versions/system-config-rc.9f3ce7d3433abce28ac03a4159a9971a44a7aaf4546e953cf10e3ea2751fa0cc/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.f12d55322a049d06e42792d24db5bca4ca93e1fb9f1955f9c4d81cc0af0c0f27/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.ad4a683eeb271ff98d3d28f808d9d8aabc4258a5defe6425bdb008c6b204d067
+#+system-config.7ebfd544e34061a36833c1a873484df169098fa5dc82ca8258410586e21bcbb8
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.ad4a683eeb271ff98d3d28f808d9d8aabc4258a5defe6425bdb008c6b204d067/config/s6-rc-source
+src=/versions/system-config.7ebfd544e34061a36833c1a873484df169098fa5dc82ca8258410586e21bcbb8/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
