commit 8852a261b7e3ef8faf7a07763a6dcb17e2312b7a
parent e51091d6c5d3ac105d9e95f6540831afcca295b2
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 18:32:05 +0000
argp-standalone
Diffstat:
17 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/filelist.sha256 b/filelist.sha256
@@ -17,6 +17,7 @@ d11f6b21c61b4274e182eb888883a8ba8acdbf820dcc7a6d82a7d9fc2fd2836d files/alpine-d
40a216cbd163f22e5f16a9e0929de7cde221b9cbae8e36aa368b1e128afe0a31 files/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd files/apk-tools.patch
818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093 files/applyuidgid-caps.c
+e3c48e543302e8239aa99f37e94fbe44056a6d402ac0829fcd86fc6fbdc094fc files/argp-standalone-1.5.0-configure.tar
1d9bd69b7a9a90f27db72629ceb4faaab2aab470103b77b5abd335c6f8bd0f35 files/argv0exec-amd64
8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9 files/argv0exec.c
e81557d01115c246b88d9138281a6d16e484acb0581d396e6c03b02a378dcc1d files/busybox.config
diff --git a/files/argp-standalone-1.5.0-configure.tar b/files/argp-standalone-1.5.0-configure.tar
Binary files differ.
diff --git a/templates/pkg/argp-standalone b/templates/pkg/argp-standalone
@@ -1,10 +1,13 @@
{% extends "autotools" %}
{%- block extra_deps %}
#@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
+#@sha256:{{files["argp-standalone-1.5.0-configure.tar"]}}:argp-standalone-1.5.0-configure.tar
{%- endblock %}
{% block at_script %}
-autotools_static argp-standalone-1.5.0
+cd argp-standalone-1.5.0
+tar -xvf ../argp-standalone-1.5.0-configure.tar
+autotools_static .
{% endblock %}
{% block genlinks_begin %}
diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone
@@ -5,6 +5,7 @@
#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
#+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75
#@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
+#@sha256:e3c48e543302e8239aa99f37e94fbe44056a6d402ac0829fcd86fc6fbdc094fc:argp-standalone-1.5.0-configure.tar
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
@@ -57,7 +58,9 @@ check_static() {
}
-autotools_static argp-standalone-1.5.0
+cd argp-standalone-1.5.0
+tar -xvf ../argp-standalone-1.5.0-configure.tar
+autotools_static .
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.1773f4b5204399bc38421f8c0727687279c5e89d1b317818e06be21095467ad3-
\ No newline at end of file
+#+easyseccomp.8c2f1ec7ecb696f6d5c9450a7e28b48c80ce77eff81323fff606c6cfb15cb4be+
\ 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.dd7280a4a3179b2efe7bd7e2c19af6a275aa8e2031afdfce1f7460fab88d6efa
-#+system-config-rc.12e19311f53cf0c86cc2cc0bca5200b372f330fc1dd67178f76d11a2feef4a2c
+#+system-config.4d14fd8ca3171beb4ddff37bebc0b13cefa70accb6c3bd884c1cd3671b9e0a25
+#+system-config-rc.6fa50e6691ef56d5fb658f42960822704763d1c3485007723b8f7698988f9df3
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.59762cdb250ec1c31f165bae46d7ee7a3ea67cfc079c8a8de4d5b2b7f20124f1
+#+system-config-init.08673157844f2ee179cb5f9b97131fc00c5bc0d9f0efd3846ef5d20710e991c7
#+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,7 +8,7 @@
#+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f
#+libseccomp.8b32056ea0458b22266d8fc1b3cce05c82d08282c40a1e56d00d15fa57cdc156
#+error-standalone.664c98067651c547ed8252fefb7237335ee7b15aa7ea4a338ff8d65dc02a6c0e
-#+argp-standalone.5d1313cda46e986b052520e9d5290674a11d3cfd57f2a5379a31593ce1801f52
+#+argp-standalone.05dfd952be0eff874082a586b5b94a35aff719c992121124a107b076c97660b7
#@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.6d6dc64370da519b84a93e254615de981b188f65475484726b8aa5afce3ce903' \
+ 'pthbs_path_containers=/home/ccx/versions/env.2a6361244fa78a7537faf2a6bab66ab7414ff8ff0768f8e6c54a77385578d919' \
'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.12e19311f53cf0c86cc2cc0bca5200b372f330fc1dd67178f76d11a2feef4a2c
+#+system-config-rc.6fa50e6691ef56d5fb658f42960822704763d1c3485007723b8f7698988f9df3
-s6rcdb=/home/ccx/versions/system-config-rc.12e19311f53cf0c86cc2cc0bca5200b372f330fc1dd67178f76d11a2feef4a2c/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.6fa50e6691ef56d5fb658f42960822704763d1c3485007723b8f7698988f9df3/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.dd7280a4a3179b2efe7bd7e2c19af6a275aa8e2031afdfce1f7460fab88d6efa
+#+system-config.4d14fd8ca3171beb4ddff37bebc0b13cefa70accb6c3bd884c1cd3671b9e0a25
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.dd7280a4a3179b2efe7bd7e2c19af6a275aa8e2031afdfce1f7460fab88d6efa/config/s6-rc-source
+src=/home/ccx/versions/system-config.4d14fd8ca3171beb4ddff37bebc0b13cefa70accb6c3bd884c1cd3671b9e0a25/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
@@ -5,6 +5,7 @@
#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
#+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3
#@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
+#@sha256:e3c48e543302e8239aa99f37e94fbe44056a6d402ac0829fcd86fc6fbdc094fc:argp-standalone-1.5.0-configure.tar
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
@@ -57,7 +58,9 @@ check_static() {
}
-autotools_static argp-standalone-1.5.0
+cd argp-standalone-1.5.0
+tar -xvf ../argp-standalone-1.5.0-configure.tar
+autotools_static .
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.27f9af09622f1a4324cbc1d03611ee8cc3ce76b48212273718cc92d94e2f5d11-
\ No newline at end of file
+#+easyseccomp.d14ec402626e56383ed16a484bfd3caeb202b76789b048f290004efebbcc2eed+
\ 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.df7c6c3276173a63d669fc2d858a5b59adc114d52c0184a4dea214e3a254b877
-#+system-config-rc.e06807e55d970560cedc371e23bff442b332b78e30d0e2c4a5abae0d38c5ffb3
+#+system-config.191d1451d649060398f1d148b0009a4266c8e4bf1ba7f3e26c1cce0656146ca2
+#+system-config-rc.cf73dfe845ba7b20ba3e6fbb65c4540302db65fc3257fd4b08078f384478ba09
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.c24ecf9e3adb7b59f1bb3e759051865efd38e97f0ba3851fcc651721054a6fc2
+#+system-config-init.904b69466e3c3fdc72a375e340a7ae9b7eeef1c18f982d53b3fa8e4cc6b66a2f
#+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,7 +8,7 @@
#+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0
#+libseccomp.cf3861629089b6a01e1499bd0296161802ff4978c7adde69cff19c5c5a568902
#+error-standalone.b756d86efb93b61ab49683dd2614413fc0a0c66fed3026f238ab32a725257ab2
-#+argp-standalone.5c1f20d0d6f6f290182cacc89fb87a6f18cf7b639da406133a6aaf80ef08603d
+#+argp-standalone.aa816a040e2a13843c70dd89365293ea1904a408d57e7d1dbf3985ba4d776234
#@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.5a1794303c81478188f79e5c39490afda7be898c977f2539f4a88e017c23e375' \
+ 'pthbs_path_containers=/versions/env.5831e5ea3a4b8a38443f5c8abbbfa0da7a01d9d8a00b50aa5e38652c9b32ed49' \
'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.e06807e55d970560cedc371e23bff442b332b78e30d0e2c4a5abae0d38c5ffb3
+#+system-config-rc.cf73dfe845ba7b20ba3e6fbb65c4540302db65fc3257fd4b08078f384478ba09
-s6rcdb=/versions/system-config-rc.e06807e55d970560cedc371e23bff442b332b78e30d0e2c4a5abae0d38c5ffb3/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.cf73dfe845ba7b20ba3e6fbb65c4540302db65fc3257fd4b08078f384478ba09/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.df7c6c3276173a63d669fc2d858a5b59adc114d52c0184a4dea214e3a254b877
+#+system-config.191d1451d649060398f1d148b0009a4266c8e4bf1ba7f3e26c1cce0656146ca2
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.df7c6c3276173a63d669fc2d858a5b59adc114d52c0184a4dea214e3a254b877/config/s6-rc-source
+src=/versions/system-config.191d1451d649060398f1d148b0009a4266c8e4bf1ba7f3e26c1cce0656146ca2/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
