commit 7e06fcbb42c2302d9073877c08174b1cf53f0219
parent 95bb29ab5a905e1cee6ab85fd52f12c079ed3035
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 21:12:44 +0000
easyseccomp
Diffstat:
13 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/templates/pkg/easyseccomp b/templates/pkg/easyseccomp
@@ -15,8 +15,13 @@
cd {{name}}
patch -p1 <../easyseccomp_sys_types.patch
build_env_static
+LDFLAGS="$LDFLAGS -lerror -largp"
autotools_config --enable-seccomp
-{{make}} V=1
+{{make}} || {{make}} V=1
check_static command/easyseccomp
{% endblock %}
+{% block genlinks_begin %}
+ 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.35f16865629f3f9c84c4b94088a09b9ca069053937042a373501750966b42fc0-
\ No newline at end of file
+#+easyseccomp.e8d467f110a22030b6b0dd949307f285c2db75e4341933e72e419c9a497bc7b0+
\ 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.8b8a2b03a8f9bad97cf0a3db217832b54a3342816a7fb0c6bfb086547549de2c
-#+system-config-rc.f1100a179601fb9629ec20a51431541d7092cfabd33ef8d9708e7767d315729f
+#+system-config.5be6f6a6cc0bf33767ec753089f9acaa484054acef252b8744879b5657a6999d
+#+system-config-rc.2fe0c4f2f2e4596746b7044b1aaadb2c213aa1efab8ba1bba32752bbb098511a
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.c63ab05fb84f1748bdb2e67b5d91c321a01e6774183b653f8dba5ddda483f529
+#+system-config-init.21efe72d150da3a8ba035a68b8e9b974fa1647b5d0426fa157a961311451b9fb
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -68,8 +68,9 @@ check_static() {
cd easyseccomp
patch -p1 <../easyseccomp_sys_types.patch
build_env_static
+LDFLAGS="$LDFLAGS -lerror -largp"
autotools_config --enable-seccomp
-make -j${JOBS:-1} -l$((1+${JOBS:-1})) V=1
+make -j${JOBS:-1} -l$((1+${JOBS:-1})) || make -j${JOBS:-1} -l$((1+${JOBS:-1})) V=1
check_static command/easyseccomp
@@ -77,6 +78,8 @@ check_static command/easyseccomp
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
BEGIN {
+ x["./command/easyseccomp"]=1
+ x["./library/libeasyseccomp.a"]=1
}
function r1(s) {
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.ed6509fd145e79df986a8ab85438d7c1debf47e5586c4f5fc3ec4c477449a03f' \
+ 'pthbs_path_containers=/home/ccx/versions/env.e3753d0ff590e31f4b8f53cae718f9042eae9dce2e5e364e71b62e8d80981e57' \
'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.f1100a179601fb9629ec20a51431541d7092cfabd33ef8d9708e7767d315729f
+#+system-config-rc.2fe0c4f2f2e4596746b7044b1aaadb2c213aa1efab8ba1bba32752bbb098511a
-s6rcdb=/home/ccx/versions/system-config-rc.f1100a179601fb9629ec20a51431541d7092cfabd33ef8d9708e7767d315729f/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.2fe0c4f2f2e4596746b7044b1aaadb2c213aa1efab8ba1bba32752bbb098511a/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.8b8a2b03a8f9bad97cf0a3db217832b54a3342816a7fb0c6bfb086547549de2c
+#+system-config.5be6f6a6cc0bf33767ec753089f9acaa484054acef252b8744879b5657a6999d
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.8b8a2b03a8f9bad97cf0a3db217832b54a3342816a7fb0c6bfb086547549de2c/config/s6-rc-source
+src=/home/ccx/versions/system-config.5be6f6a6cc0bf33767ec753089f9acaa484054acef252b8744879b5657a6999d/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.6063987f7fc86c2c27c1fa3bb7a065c78810daec59736d89009ad35fd2da8d81-
\ No newline at end of file
+#+easyseccomp.084867dc57b1f996adea10ff7c9f6ef88beba4ecaf7064d753beb5e93993dc33+
\ 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.db2dff20fd0bda4dc1fedd9697304907d9eb143f1c6df0e733e1724a595250e3
-#+system-config-rc.8f334e9cbdafc74e6fc7257996dc0fa8200054ec285bdb3901450467d9e52b58
+#+system-config.46b72da78c704b314fe5cf72f2bc9ceb66cb43060843e85e58b56aee65dd408b
+#+system-config-rc.dfe152fa037d9422d324554e4a1ccc84eda104d69c4236998d1cc49388b06600
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.96e01dae36be9eace21d59d02dc01647f1f507d0942cff6169c8384945c64d82
+#+system-config-init.9f095745e1381bf4f2d1d16d7672f1cb4876faff20f0460dc535c5bedde50675
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -68,8 +68,9 @@ check_static() {
cd easyseccomp
patch -p1 <../easyseccomp_sys_types.patch
build_env_static
+LDFLAGS="$LDFLAGS -lerror -largp"
autotools_config --enable-seccomp
-make -j${JOBS:-1} -l$((1+${JOBS:-1})) V=1
+make -j${JOBS:-1} -l$((1+${JOBS:-1})) || make -j${JOBS:-1} -l$((1+${JOBS:-1})) V=1
check_static command/easyseccomp
@@ -77,6 +78,8 @@ check_static command/easyseccomp
cd "$pthbs_destdir/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
BEGIN {
+ x["./command/easyseccomp"]=1
+ x["./library/libeasyseccomp.a"]=1
}
function r1(s) {
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.2066d825ceb613099354031fd58f70845919ab5f31c677c6f7553471d58225bc' \
+ 'pthbs_path_containers=/versions/env.69891650a800b75d6f5bf71c27f6f0f95f202525d11abdb4d4acb340e2d63b8e' \
'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.8f334e9cbdafc74e6fc7257996dc0fa8200054ec285bdb3901450467d9e52b58
+#+system-config-rc.dfe152fa037d9422d324554e4a1ccc84eda104d69c4236998d1cc49388b06600
-s6rcdb=/versions/system-config-rc.8f334e9cbdafc74e6fc7257996dc0fa8200054ec285bdb3901450467d9e52b58/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.dfe152fa037d9422d324554e4a1ccc84eda104d69c4236998d1cc49388b06600/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.db2dff20fd0bda4dc1fedd9697304907d9eb143f1c6df0e733e1724a595250e3
+#+system-config.46b72da78c704b314fe5cf72f2bc9ceb66cb43060843e85e58b56aee65dd408b
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.db2dff20fd0bda4dc1fedd9697304907d9eb143f1c6df0e733e1724a595250e3/config/s6-rc-source
+src=/versions/system-config.46b72da78c704b314fe5cf72f2bc9ceb66cb43060843e85e58b56aee65dd408b/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
