commit c354aa11718af934659e15f104749d7b9555c6f4
parent f4e4929a53e64d15ede3081e3d83fc3f731c9c23
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 21:49:45 +0000
easyseccomp
Diffstat:
13 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/templates/pkg/easyseccomp b/templates/pkg/easyseccomp
@@ -18,6 +18,8 @@ touch Makefile.in configure
build_env_static
autotools_config --enable-seccomp
make -j1 V=1 LIBS="-lseccomp -lerror -largp" src/libeasyseccomp_a-lexer.h
+n=30
+until make -j1 V=1 LIBS="-lseccomp -lerror -largp"; do n=$((n-1)); test $n -gt 0 || break; done
make -j1 V=1 LIBS="-lseccomp -lerror -largp" install
check_static command/easyseccomp
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.bc082e182dc6a2382b6f91705b00918bd08432613d186fc45960d833fadbf7f7-
\ No newline at end of file
+#+easyseccomp.4dce9fc41383d7962433fd773de3fe7b1cd7346bfe339fe807d3370c35bf3239+
\ 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.f14bf3415c6112d92fff3ced46966ffc9b3f20e7f262fb1739e207663d653eb8
-#+system-config-rc.e5c51e8394b062e88d3db81ccbb859e78f45f6455f6a1dbc1614f23a1df14efc
+#+system-config.93d20d32fa2f65174dac166da5c1bfc7c735f3b63857be8ae259abc115eaa872
+#+system-config-rc.2673eee6a6d1ca964032017b6726c750eab3dae4ba9233a874b9411e0b4c1451
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.daa05d6d835436eec2b60457c8a33f1d27a3dcd438f1f00081ba00530f3abbb8
+#+system-config-init.1f8db1de0cf41ee262e98f96578e4fe5ad13c85310b755ea276887e4a2faef12
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -71,6 +71,8 @@ touch Makefile.in configure
build_env_static
autotools_config --enable-seccomp
make -j1 V=1 LIBS="-lseccomp -lerror -largp" src/libeasyseccomp_a-lexer.h
+n=30
+until make -j1 V=1 LIBS="-lseccomp -lerror -largp"; do n=$((n-1)); test $n -gt 0 || break; done
make -j1 V=1 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.f08f5e1be20f49a67d9bf6c9167045968ee068fbb35420c4b8d0cf37134029ac' \
+ 'pthbs_path_containers=/home/ccx/versions/env.6eb2b1f1787f5b4a389a70749ee343b96d25d3aa730b017410499628d701dfa7' \
'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.e5c51e8394b062e88d3db81ccbb859e78f45f6455f6a1dbc1614f23a1df14efc
+#+system-config-rc.2673eee6a6d1ca964032017b6726c750eab3dae4ba9233a874b9411e0b4c1451
-s6rcdb=/home/ccx/versions/system-config-rc.e5c51e8394b062e88d3db81ccbb859e78f45f6455f6a1dbc1614f23a1df14efc/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.2673eee6a6d1ca964032017b6726c750eab3dae4ba9233a874b9411e0b4c1451/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.f14bf3415c6112d92fff3ced46966ffc9b3f20e7f262fb1739e207663d653eb8
+#+system-config.93d20d32fa2f65174dac166da5c1bfc7c735f3b63857be8ae259abc115eaa872
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.f14bf3415c6112d92fff3ced46966ffc9b3f20e7f262fb1739e207663d653eb8/config/s6-rc-source
+src=/home/ccx/versions/system-config.93d20d32fa2f65174dac166da5c1bfc7c735f3b63857be8ae259abc115eaa872/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.12bb1110cd586368a5fe78d0b988d4f0219958280f7fae1e4813f4bc654126e0-
\ No newline at end of file
+#+easyseccomp.143445e3e404cc34a9a56a63d10c70ffbc59c687cfac9230b597ed2ac32386b3+
\ 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.cd5e631e8bea5a63cda90b67eae822b8453e96edd679ad2eab209811917a6b4d
-#+system-config-rc.f8ab74721ea42804e3c8283b07c3f1033512beb48c22640db7dc80dd42323e71
+#+system-config.3a1577329cba75f1c06290cfa82bb1789a99065c09130908a351224c9907194f
+#+system-config-rc.d1d6cd1949d4020985633456e2f27ec351a7b39efca0e7e42d63deca49714e85
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.7fdbbb1c148b4a5f5d589b2bd3c3f3bf4d99f5083c84b40b29cf89e882151a79
+#+system-config-init.baed90623f2120ed819a34520a311e13a9cded70d1b1f6e78a6f88a06a511960
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -71,6 +71,8 @@ touch Makefile.in configure
build_env_static
autotools_config --enable-seccomp
make -j1 V=1 LIBS="-lseccomp -lerror -largp" src/libeasyseccomp_a-lexer.h
+n=30
+until make -j1 V=1 LIBS="-lseccomp -lerror -largp"; do n=$((n-1)); test $n -gt 0 || break; done
make -j1 V=1 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.c2f7d8f0515f8d594cc768aebdfbdada741dfeb874d5f0323f93c36e6e690501' \
+ 'pthbs_path_containers=/versions/env.fcac8142f2976d09ebeccdffac7e6c2d032408ed75b6975b903928d8b8ea20eb' \
'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.f8ab74721ea42804e3c8283b07c3f1033512beb48c22640db7dc80dd42323e71
+#+system-config-rc.d1d6cd1949d4020985633456e2f27ec351a7b39efca0e7e42d63deca49714e85
-s6rcdb=/versions/system-config-rc.f8ab74721ea42804e3c8283b07c3f1033512beb48c22640db7dc80dd42323e71/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.d1d6cd1949d4020985633456e2f27ec351a7b39efca0e7e42d63deca49714e85/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.cd5e631e8bea5a63cda90b67eae822b8453e96edd679ad2eab209811917a6b4d
+#+system-config.3a1577329cba75f1c06290cfa82bb1789a99065c09130908a351224c9907194f
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.cd5e631e8bea5a63cda90b67eae822b8453e96edd679ad2eab209811917a6b4d/config/s6-rc-source
+src=/versions/system-config.3a1577329cba75f1c06290cfa82bb1789a99065c09130908a351224c9907194f/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
