commit ffb96c4f607fead19ed1370a1130af0526fc11df
parent e5f4a3a17ede8e344cfcca5ef7cb757f010fbcfc
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 17:27:20 +0000
libseccomp package
Diffstat:
15 files changed, 106 insertions(+), 69 deletions(-)
diff --git a/templates/pkg/libseccomp b/templates/pkg/libseccomp
@@ -1,22 +1,11 @@
-{% extends "genlinks" %}
-{%- block script %}
-#+{{pkg_install_name("musl-cross-make")}}
-#+{{pkg_install_name("gnu-make")}}
-#+{{pkg_install_name("busybox")}}
-#+{{pkg_install_name("busybox-diffutils")}}
+{% extends "autotools" %}
+{%- block extra_deps %}
#+{{pkg_install_name("pkgconf-pkg-config")}}
#@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
+{% endblock %}
+{% block at_script %}
-{% include "functions/check_static" %}
-{% include "functions/build_env_static" %}
-{% include "functions/vars" %}
-def_prefix
-LDFLAGS=--static
-build_env_static
-
-cd libseccomp-2.6.0
autotools_static libseccomp-2.6.0
-
check_static command/scmp_sys_resolver
{% 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.7f14bf7bb7c38f8da55fe6610afe53cfbe8689d1ce49b88c6eec929917110e70-
\ No newline at end of file
+#+easyseccomp.9b4c02826b40a9e333d5962b3fe0029b05e932658d6390cf04d565ab8e34f70b+
\ 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.2724d9996ce58a483a5b8a0d4cc434114e4edd8e11a429b869974c047850adcb
-#+system-config-rc.f8c4c9e18b989153e3f0959bc7c425c0cb2900a8a2fe1cd10b45865710b3c305
+#+system-config.069186d8ab1c4d2bf89f339eb00abeea5109e2dbfa6d8742cb719f17194bcf35
+#+system-config-rc.ef3915a063e3fdca139f9a665e0883fe8a4f5e81badd421f616300105062a1e7
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.ae8ac15ce3ec56442d1fea555f0d038fdc5a3b9a24f47ab996918c0c04782635
+#+system-config-init.94c821db7a4514072e81b46f04d745fcb27ba80cf072d7a0d5e2b2b44df64a71
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -6,7 +6,7 @@
#+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75
#+flex.322ebabc6eba6cdfd84b1b90f25790b8d917035872c2e6bb2f4c8e2f05eabcfd
#+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f
-#+libseccomp.b501436fd877680fc6276b5fe73311d80afd039abe28c18e6f7e30c2502a3638
+#+libseccomp.110e3b316a159776281f8ae31bc27d3f75f48d9a68fd189c1ebe1d9a2b2ac746
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp
@@ -3,9 +3,47 @@
#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b
#+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3
#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
+#+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75
#+pkgconf-pkg-config.86f9c193f6ccc64cc2ac696a7e3a258f01b8d0c539312ae37c08ea2354332e90
#@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
+
+build_env_static() {
+ export LD_LIBRARY_PATH="$pthbs_build_environment/library"
+ export CPATH="$pthbs_build_environment/include"
+ export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
+ prefix=/home/ccx/versions/$pthbs_package
+ ./configure -C \
+ --prefix="$prefix" \
+ --build="$(${CC:-gcc} -dumpmachine)" \
+ --bindir="$prefix/command" \
+ --sbindir="$prefix/command" \
+ --infodir="$prefix/info" \
+ --localedir="$prefix/locale" \
+ --mandir="$prefix/man" \
+ --libdir="$prefix/library" \
+ --docdir="$prefix/doc/libseccomp" \
+ --datadir="$prefix/data" \
+ --datarootdir="$prefix/data" \
+ --localstatedir='/var/pthbs' \
+ "$@"
+
+}
+
+autotools() {
+ cd "$1"
+ shift
+ autotools_config "$@"
+ make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+ make DESTDIR="$pthbs_destdir" install
+}
+
+autotools_static() {
+ build_env_static
+ autotools "$@" --enable-static --disable-shared
+}
check_static() {
local exe || true
exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
@@ -19,27 +57,13 @@ check_static() {
exit 1
fi
}
-build_env_static() {
- export LD_LIBRARY_PATH="$pthbs_build_environment/library"
- export CPATH="$pthbs_build_environment/include"
- export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
-}
-def_prefix() {
- prefix=/home/ccx/versions/$pthbs_package
-}
-def_dest() {
- dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package
-}
-def_prefix
-LDFLAGS=--static
-build_env_static
-cd libseccomp-2.6.0
-autotools_static libseccomp-2.6.0
+autotools_static libseccomp-2.6.0
check_static command/scmp_sys_resolver
+
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
BEGIN {
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.7779d11016f7520546a8f8beec9b64e1a6c9bca0253dd7b0968cf54ab0b461b2' \
+ 'pthbs_path_containers=/home/ccx/versions/env.fc6e8abd3e3087596bf67b98b849f30504d58e20975584708d480b08c78c7de8' \
'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.f8c4c9e18b989153e3f0959bc7c425c0cb2900a8a2fe1cd10b45865710b3c305
+#+system-config-rc.ef3915a063e3fdca139f9a665e0883fe8a4f5e81badd421f616300105062a1e7
-s6rcdb=/home/ccx/versions/system-config-rc.f8c4c9e18b989153e3f0959bc7c425c0cb2900a8a2fe1cd10b45865710b3c305/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.ef3915a063e3fdca139f9a665e0883fe8a4f5e81badd421f616300105062a1e7/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.2724d9996ce58a483a5b8a0d4cc434114e4edd8e11a429b869974c047850adcb
+#+system-config.069186d8ab1c4d2bf89f339eb00abeea5109e2dbfa6d8742cb719f17194bcf35
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.2724d9996ce58a483a5b8a0d4cc434114e4edd8e11a429b869974c047850adcb/config/s6-rc-source
+src=/home/ccx/versions/system-config.069186d8ab1c4d2bf89f339eb00abeea5109e2dbfa6d8742cb719f17194bcf35/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.75be4d05dd46d4b53704fc8465dfae04706035138f6e93a0483f4b92777abd6e-
\ No newline at end of file
+#+easyseccomp.6b87a88ad904a03eb4c83957a3bc16c3464fff53b83804a893d31d61332bbab9+
\ 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.3d02343a8c79c78f5274bc0ea2e559a4ded866ccefdf8225d76ee64036f799ea
-#+system-config-rc.d1d359132fe16ae232ef5e4a1fdcbbf9a223d547caa36d10882e6f6400240824
+#+system-config.78bba4d8e5f29243cd119515adcb31bd193cf84f6fe7249dc566482803d17522
+#+system-config-rc.33cd211dac61c5b78d94eab6a977616efe62ac06050f1e4a1146fa38199107ab
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.2b3ffae1646bd7fa02ec922ce3a19be28a1a67300ec05617592e4397daf34517
+#+system-config-init.ebbda43ecf67efb21a533f99fcdb7aca22e617b27c7238071c5c4a6bdf5089f8
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -6,7 +6,7 @@
#+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3
#+flex.42bdab01fb2083e92a4417d5fb289c468b9a1a5b8092904b965455b74559262f
#+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0
-#+libseccomp.13abac7652f1550350cbbefb592f66b9f65f7dc013123ff2253c5551c86d6a90
+#+libseccomp.55e2598f0c946d0d49b60a365eb535e73d16976787cda5b5fce007bfaed67c25
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp
@@ -3,9 +3,47 @@
#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465
#+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089
#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
+#+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3
#+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621
#@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
+
+build_env_static() {
+ export LD_LIBRARY_PATH="$pthbs_build_environment/library"
+ export CPATH="$pthbs_build_environment/include"
+ export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
+}
+autotools_config() {
+ prefix=/versions/$pthbs_package
+ ./configure -C \
+ --prefix="$prefix" \
+ --build="$(${CC:-gcc} -dumpmachine)" \
+ --bindir="$prefix/command" \
+ --sbindir="$prefix/command" \
+ --infodir="$prefix/info" \
+ --localedir="$prefix/locale" \
+ --mandir="$prefix/man" \
+ --libdir="$prefix/library" \
+ --docdir="$prefix/doc/libseccomp" \
+ --datadir="$prefix/data" \
+ --datarootdir="$prefix/data" \
+ --localstatedir='/var/pthbs' \
+ "$@"
+
+}
+
+autotools() {
+ cd "$1"
+ shift
+ autotools_config "$@"
+ make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+ make DESTDIR="$pthbs_destdir" install
+}
+
+autotools_static() {
+ build_env_static
+ autotools "$@" --enable-static --disable-shared
+}
check_static() {
local exe || true
exe=$pthbs_destdir/'/versions'/$pthbs_package/$1
@@ -19,27 +57,13 @@ check_static() {
exit 1
fi
}
-build_env_static() {
- export LD_LIBRARY_PATH="$pthbs_build_environment/library"
- export CPATH="$pthbs_build_environment/include"
- export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
-}
-def_prefix() {
- prefix=/versions/$pthbs_package
-}
-def_dest() {
- dest=${pthbs_destdir%/}//versions/$pthbs_package
-}
-def_prefix
-LDFLAGS=--static
-build_env_static
-cd libseccomp-2.6.0
-autotools_static libseccomp-2.6.0
+autotools_static libseccomp-2.6.0
check_static command/scmp_sys_resolver
+
cd "$pthbs_destdir/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
BEGIN {
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.581644c82f20cb340a54e9e954555a370258f63c543e730e5373a69abbca0b4a' \
+ 'pthbs_path_containers=/versions/env.f0cbe198d85d7b702b242ad7502014cd449b3d53e9b664919027e4e7614ff29d' \
'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.d1d359132fe16ae232ef5e4a1fdcbbf9a223d547caa36d10882e6f6400240824
+#+system-config-rc.33cd211dac61c5b78d94eab6a977616efe62ac06050f1e4a1146fa38199107ab
-s6rcdb=/versions/system-config-rc.d1d359132fe16ae232ef5e4a1fdcbbf9a223d547caa36d10882e6f6400240824/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.33cd211dac61c5b78d94eab6a977616efe62ac06050f1e4a1146fa38199107ab/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.3d02343a8c79c78f5274bc0ea2e559a4ded866ccefdf8225d76ee64036f799ea
+#+system-config.78bba4d8e5f29243cd119515adcb31bd193cf84f6fe7249dc566482803d17522
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.3d02343a8c79c78f5274bc0ea2e559a4ded866ccefdf8225d76ee64036f799ea/config/s6-rc-source
+src=/versions/system-config.78bba4d8e5f29243cd119515adcb31bd193cf84f6fe7249dc566482803d17522/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
