commit abe35026295960d439295efc61ddad00ee2ab944
parent 8cfee0f771da4d14c9562c43b3105429cf66167a
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 18:14:56 +0000
Add argp-standalone as dependency of easyseccomp
Diffstat:
17 files changed, 194 insertions(+), 20 deletions(-)
diff --git a/downloadlist.sha256 b/downloadlist.sha256
@@ -53,3 +53,4 @@ f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb 189200 https://
83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc 685655 https://github.com/seccomp/libseccomp/releases/download/v2.6.0/libseccomp-2.6.0.tar.gz
588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2 1215925 https://ftp.gnu.org/gnu/gperf/gperf-3.1.tar.gz
0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9 2329 https://hacktivis.me/releases/error-standalone/error-standalone-2.0.tar.gz
+c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6 65889 https://github.com/argp-standalone/argp-standalone/archive/refs/tags/1.5.0.tar.gz
diff --git a/templates/pkg/argp-standalone b/templates/pkg/argp-standalone
@@ -0,0 +1,22 @@
+{% extends "genlinks" %}
+{%- block script %}
+#+{{pkg_install_name("musl-cross-make")}}
+#+{{pkg_install_name("gnu-make")}}
+#+{{pkg_install_name("busybox")}}
+#+{{pkg_install_name("busybox-diffutils")}}
+#@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
+
+{% include "functions/build_env_static" %}
+prefix={{versions}}/$pthbs_package
+build_env_static
+cd argp-standalone-1.5.0
+{{make}} PREFIX={{versions}}/$pthbs_package \
+ DESTDIR="$pthbs_destdir" \
+ INCDIR="$prefix/include" \
+ LIBDIR="$prefix/library" \
+ install-static
+{% endblock %}
+{% block genlinks_begin %}
+ x["./library/libargp.a"]=1
+ x["./include/argp.h"]=1
+{% endblock %}
diff --git a/templates/pkg/easyseccomp b/templates/pkg/easyseccomp
@@ -4,6 +4,7 @@
#+{{pkg_install_name("bison")}}
#+{{pkg_install_name("libseccomp")}}
#+{{pkg_install_name("error-standalone")}}
+#+{{pkg_install_name("argp-standalone")}}
#@git:{{submodule.current[name]}}:{{name}}
#@sha256:{{files["easyseccomp-configure.tar"]}}:easyseccomp-configure.tar
{%- endblock %}
diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone
@@ -0,0 +1,74 @@
+#!/usr/bin/env pthbs-build
+#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78
+#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b
+#+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3
+#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
+#@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
+
+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"
+}
+prefix=/home/ccx/versions/$pthbs_package
+build_env_static
+cd argp-standalone-1.5.0
+make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/home/ccx/versions/$pthbs_package \
+ DESTDIR="$pthbs_destdir" \
+ INCDIR="$prefix/include" \
+ LIBDIR="$prefix/library" \
+ install-static
+
+cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
+find -type d -o -print | awk -F/ '
+BEGIN {
+ x["./library/libargp.a"]=1
+ x["./include/argp.h"]=1
+}
+
+function r1(s) {
+ sub("^[.]/[^/]*", ".", s)
+ return s
+}
+function s1(repl, s) {
+ sub("^[.]/[^/]*", "./"repl, s)
+ return s
+}
+function link(src) {
+ x[$0]=0
+ printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
+}
+$1!="."{exit 1}
+
+
+$2 == "command" { link($0); next }
+$2 == "bin" { link(s1("command", $0)); next }
+
+$2 == "library.so" { link($0); next }
+$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+$2 == "data" { link($0); next }
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
+
+END {
+ for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+ for(fname in x) {
+ if(x[fname]) {
+ printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
+ exit 3
+ }
+ }
+}' >.install-links.new
+mv .install-links.new .install-links
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.9cdf7142b43281ecedd301ca96fa4aaa5d4d2e98c2b947960dca57748608c878-
\ No newline at end of file
+#+easyseccomp.238f707107363b2215072e5d84bdd2293c178e1e75f33566e422948b30ef2a96+
\ 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.cf4f4f0a19e844a4d51e4a02b4b860d770811506b5b8566015cef85fa6878c64
-#+system-config-rc.ce4ef808bfecdfe6ed8cb042009f766ee30734c07d1af93886ce45b938d929af
+#+system-config.63901c3528cff4f24bba7d62101506518cbc95d696ef5ff99292cef9b0884f0f
+#+system-config-rc.ddd704cbe8e7a3c87931937ee0dbb937fa56422d0e59dee66bc260ce32c66860
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.81b9f3cbcbf40fdcbc8b1d6b029cffd999aedd43747364c464e5b3d06c454a45
+#+system-config-init.57f0fec93d72ebec0e37b55963b9dd774fe4172c8f7fd0be201fc1de3bab9bed
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -8,6 +8,7 @@
#+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f
#+libseccomp.8b32056ea0458b22266d8fc1b3cce05c82d08282c40a1e56d00d15fa57cdc156
#+error-standalone.664c98067651c547ed8252fefb7237335ee7b15aa7ea4a338ff8d65dc02a6c0e
+#+argp-standalone.7a74302cba2f5fc1794fe047008b86207e088aff52b2fbb9a937bfc9bcdf5e23
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
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.89688f25cd24af02ff3fb13fb1f045c47e2427698c52ebd680ecf63e6fe0d00a' \
+ 'pthbs_path_containers=/home/ccx/versions/env.81771911f76a4cdb0c3d53ba3a3878c1d8307abfc61e60d8929252d6a99adfb9' \
'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.ce4ef808bfecdfe6ed8cb042009f766ee30734c07d1af93886ce45b938d929af
+#+system-config-rc.ddd704cbe8e7a3c87931937ee0dbb937fa56422d0e59dee66bc260ce32c66860
-s6rcdb=/home/ccx/versions/system-config-rc.ce4ef808bfecdfe6ed8cb042009f766ee30734c07d1af93886ce45b938d929af/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.ddd704cbe8e7a3c87931937ee0dbb937fa56422d0e59dee66bc260ce32c66860/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.cf4f4f0a19e844a4d51e4a02b4b860d770811506b5b8566015cef85fa6878c64
+#+system-config.63901c3528cff4f24bba7d62101506518cbc95d696ef5ff99292cef9b0884f0f
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.cf4f4f0a19e844a4d51e4a02b4b860d770811506b5b8566015cef85fa6878c64/config/s6-rc-source
+src=/home/ccx/versions/system-config.63901c3528cff4f24bba7d62101506518cbc95d696ef5ff99292cef9b0884f0f/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/argp-standalone b/variants/root-x86_64/argp-standalone
@@ -0,0 +1,74 @@
+#!/usr/bin/env pthbs-build
+#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc
+#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465
+#+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089
+#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
+#@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
+
+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"
+}
+prefix=/versions/$pthbs_package
+build_env_static
+cd argp-standalone-1.5.0
+make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/versions/$pthbs_package \
+ DESTDIR="$pthbs_destdir" \
+ INCDIR="$prefix/include" \
+ LIBDIR="$prefix/library" \
+ install-static
+
+cd "$pthbs_destdir/versions/$pthbs_package"
+find -type d -o -print | awk -F/ '
+BEGIN {
+ x["./library/libargp.a"]=1
+ x["./include/argp.h"]=1
+}
+
+function r1(s) {
+ sub("^[.]/[^/]*", ".", s)
+ return s
+}
+function s1(repl, s) {
+ sub("^[.]/[^/]*", "./"repl, s)
+ return s
+}
+function link(src) {
+ x[$0]=0
+ printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
+}
+$1!="."{exit 1}
+
+
+$2 == "command" { link($0); next }
+$2 == "bin" { link(s1("command", $0)); next }
+
+$2 == "library.so" { link($0); next }
+$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+$2 == "data" { link($0); next }
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
+
+END {
+ for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+ for(fname in x) {
+ if(x[fname]) {
+ printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
+ exit 3
+ }
+ }
+}' >.install-links.new
+mv .install-links.new .install-links
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.1d6d493e3a879feb8218830d5b893996456322cc1bc1ae47ea505de7a835b41a-
\ No newline at end of file
+#+easyseccomp.b6e902c3da858069c0f7ce4799d59f45c0cb72afd4c47cb2fa20048d4a31313f+
\ 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.8f90c3865edf8bac99a6b11324162d22c4c5e6ba189037172c80bf5601a3f335
-#+system-config-rc.d59aef65ea08dff445b6156783aae83187c21bbc4c931cdfa6da74eb1a4198a9
+#+system-config.d9e31fb6df53080426396f578aa2e30224ed357993287c29413f94ff7337549a
+#+system-config-rc.b9f71916478f4ab87de759390e7164c3c0141c59fb7385828f76c6ecfcb17445
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.d9e6ea4fb39b98699ace5ca5f86b9ea3009395256dbbd19bfc0a7203a14e1757
+#+system-config-init.e020913ef90ccaf06f4edd92cc9310f5f60ed253b9c8b176fe399467d75232d5
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -8,6 +8,7 @@
#+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0
#+libseccomp.cf3861629089b6a01e1499bd0296161802ff4978c7adde69cff19c5c5a568902
#+error-standalone.b756d86efb93b61ab49683dd2614413fc0a0c66fed3026f238ab32a725257ab2
+#+argp-standalone.384d51b79a2ce37003f82c079df9d6beea50e3435e2ddf74b0cb3a8e798b5d89
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
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.ed0af017a4e26c359a5fc6947793ef3753d14298cac754a70ad2c9cccdbe0c47' \
+ 'pthbs_path_containers=/versions/env.f3adda7c0ca3e23551d877ea31a372956bc0bc2b5c868cf70bca75eb2b448efe' \
'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.d59aef65ea08dff445b6156783aae83187c21bbc4c931cdfa6da74eb1a4198a9
+#+system-config-rc.b9f71916478f4ab87de759390e7164c3c0141c59fb7385828f76c6ecfcb17445
-s6rcdb=/versions/system-config-rc.d59aef65ea08dff445b6156783aae83187c21bbc4c931cdfa6da74eb1a4198a9/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.b9f71916478f4ab87de759390e7164c3c0141c59fb7385828f76c6ecfcb17445/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.8f90c3865edf8bac99a6b11324162d22c4c5e6ba189037172c80bf5601a3f335
+#+system-config.d9e31fb6df53080426396f578aa2e30224ed357993287c29413f94ff7337549a
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.8f90c3865edf8bac99a6b11324162d22c4c5e6ba189037172c80bf5601a3f335/config/s6-rc-source
+src=/versions/system-config.d9e31fb6df53080426396f578aa2e30224ed357993287c29413f94ff7337549a/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
