commit afddfa255941b4eb9657274b77a48f003d5d713b
parent ef2d9e4739d3b2d228ee40b3ea11505f9490e6df
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 16:59:51 +0000
Add pregenerated autotools output to easyseccomp
Diffstat:
15 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/filelist.sha256 b/filelist.sha256
@@ -24,6 +24,7 @@ e81557d01115c246b88d9138281a6d16e484acb0581d396e6c03b02a378dcc1d files/busybox.
9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2 files/busybox_bootstrap.config
75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3 files/config.sub
9be2e5a97b3fcbc60dedb71967667b9a21d562dbfdaa7f9f74f4b3d9cbb5df86 files/dwarf.h
+2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321 files/easyseccomp-configure.tar
a6ffb38364effd623e135b206ec97ff9e6826a1f285e349a3633df55db38bc9e files/elf.h
0991a992f75396056c7d7f698fa7e87be24349ae85a195060d46e6a61881d97b files/gelf.h
cb8081499f316acdc7b31b486b8d68afd68094db8f420aba0eab2c3e8de13888 files/lh_bootstrap-x86_64-config
diff --git a/files/easyseccomp-configure.tar b/files/easyseccomp-configure.tar
Binary files differ.
diff --git a/templates/pkg/easyseccomp b/templates/pkg/easyseccomp
@@ -3,10 +3,13 @@
#+{{pkg_install_name("flex")}}
#+{{pkg_install_name("bison")}}
#@git:{{submodule.current[name]}}:{{name}}
+#@sha256:{{files["easyseccomp-configure.tar"]}}:easyseccomp-configure.tar
{%- endblock %}
{% block at_script %}
-autotools_static easyseccomp --disable-seccomp
+cd easyseccomp
+tar -xvf ../easyseccomp-configure.tar
+autotools_static . --disable-seccomp
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.0d5b4a32695b27fb312959b8c2ee22a94de1a636c76daf51e756f8fbf355eb29-
\ No newline at end of file
+#+easyseccomp.5953f823942db47bcbfd7fdda501cab4b76517de23e701d7c6f021d6f904e9df+
\ 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.2dde1683920ca0fc2211ead798a13a0e04a5343706bf4bd28c4ae7897490e5f1
-#+system-config-rc.9c23d873130070b782c7f3e8bf82296b70a9e9e49d5feb7983658ace8f239044
+#+system-config.dbd9ca9df610c01e6701422aa2c10b04ca52f676a2253c85c3075d4c0d9e407b
+#+system-config-rc.a318bcb84241ab728217492b101600aa67d7dc25b54e3d5fd1b16fa5d13625f0
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.f4fba65bdccf3a757bd304e36dfb6b565be3921b0dde9f722b758e7468a8bf6a
+#+system-config-init.9193280086f333c2063361ad0fe56a37de7b527e04013baacaf112f1fb7caedc
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -7,6 +7,7 @@
#+flex.322ebabc6eba6cdfd84b1b90f25790b8d917035872c2e6bb2f4c8e2f05eabcfd
#+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
+#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
@@ -59,7 +60,9 @@ check_static() {
}
-autotools_static easyseccomp --disable-seccomp
+cd easyseccomp
+tar -xvf ../easyseccomp-configure.tar
+autotools_static . --disable-seccomp
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.a05c926c6053ec25eb2bb6e0e94071426cf796a9570f2552075aa925e751ba6c' \
+ 'pthbs_path_containers=/home/ccx/versions/env.aed8db036dcc551e13b96f0dddf181016444aa9930bbd1d5aa46e3dc107a512b' \
'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.9c23d873130070b782c7f3e8bf82296b70a9e9e49d5feb7983658ace8f239044
+#+system-config-rc.a318bcb84241ab728217492b101600aa67d7dc25b54e3d5fd1b16fa5d13625f0
-s6rcdb=/home/ccx/versions/system-config-rc.9c23d873130070b782c7f3e8bf82296b70a9e9e49d5feb7983658ace8f239044/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.a318bcb84241ab728217492b101600aa67d7dc25b54e3d5fd1b16fa5d13625f0/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.2dde1683920ca0fc2211ead798a13a0e04a5343706bf4bd28c4ae7897490e5f1
+#+system-config.dbd9ca9df610c01e6701422aa2c10b04ca52f676a2253c85c3075d4c0d9e407b
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.2dde1683920ca0fc2211ead798a13a0e04a5343706bf4bd28c4ae7897490e5f1/config/s6-rc-source
+src=/home/ccx/versions/system-config.dbd9ca9df610c01e6701422aa2c10b04ca52f676a2253c85c3075d4c0d9e407b/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.b4babcb3c1d7ec13262d63622f6f20ff4e43391c61184cbec90dc85aad073933-
\ No newline at end of file
+#+easyseccomp.ba88e4aa368554e5a83605e695b68121d7fb177ca69935982472ba28b2b47d22+
\ 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.06258e20b94b4ce34c5323fcfa8687db97b75c25c7ca38ca279f59356519c85b
-#+system-config-rc.ae927f24f1457b0f8f916ccb4ac958195ac773af00708aab33ee98f15144b5f3
+#+system-config.4c0e32ca9682b39c92254a71ffce5342809fe98e662aeba1d25abe9359b1d822
+#+system-config-rc.41950a1e455bb68c5ae18bc8acaf3c10d9172a9883f0d8fbbab5e19631516532
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.20d5c092cbf4a48ff2c07649a60c2f3d1e3d5c35f7484c773fe31d0d5442ba85
+#+system-config-init.301837347f82ddf951520ed3c6671026e02739445fecad502ab844495288a1f2
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -7,6 +7,7 @@
#+flex.42bdab01fb2083e92a4417d5fb289c468b9a1a5b8092904b965455b74559262f
#+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
+#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
@@ -59,7 +60,9 @@ check_static() {
}
-autotools_static easyseccomp --disable-seccomp
+cd easyseccomp
+tar -xvf ../easyseccomp-configure.tar
+autotools_static . --disable-seccomp
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.ddacf43c56d96eab0458aa2da69d487ff5b3448e93b6ab5b61cd79d28a8b5ec1' \
+ 'pthbs_path_containers=/versions/env.1954cbbb732c1bc21032ff045738b204be04f96e10063768c741971e1b792f49' \
'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.ae927f24f1457b0f8f916ccb4ac958195ac773af00708aab33ee98f15144b5f3
+#+system-config-rc.41950a1e455bb68c5ae18bc8acaf3c10d9172a9883f0d8fbbab5e19631516532
-s6rcdb=/versions/system-config-rc.ae927f24f1457b0f8f916ccb4ac958195ac773af00708aab33ee98f15144b5f3/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.41950a1e455bb68c5ae18bc8acaf3c10d9172a9883f0d8fbbab5e19631516532/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.06258e20b94b4ce34c5323fcfa8687db97b75c25c7ca38ca279f59356519c85b
+#+system-config.4c0e32ca9682b39c92254a71ffce5342809fe98e662aeba1d25abe9359b1d822
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.06258e20b94b4ce34c5323fcfa8687db97b75c25c7ca38ca279f59356519c85b/config/s6-rc-source
+src=/versions/system-config.4c0e32ca9682b39c92254a71ffce5342809fe98e662aeba1d25abe9359b1d822/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
