commit aba438b695065234fc3afa18a53db2ffbf3d9285
parent 08a1e6dc6a93f3b33141550a1c3e7e023d205bcc
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 18:47:04 +0000
argp-standalone
Diffstat:
16 files changed, 34 insertions(+), 46 deletions(-)
diff --git a/templates/pkg/argp-standalone b/templates/pkg/argp-standalone
@@ -1,13 +1,11 @@
{% 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
+#@untar::sha256:{{files["argp-standalone-1.5.0-configure.tar"]}}:argp-standalone-1.5.0
{%- endblock %}
{% block at_script %}
-cd argp-standalone-1.5.0
-tar -xvf ../argp-standalone-1.5.0-configure.tar
-autotools_static .
+autotools_static argp-standalone-1.5.0
{% endblock %}
{% block genlinks_begin %}
diff --git a/templates/pkg/easyseccomp b/templates/pkg/easyseccomp
@@ -6,13 +6,11 @@
#+{{pkg_install_name("error-standalone")}}
#+{{pkg_install_name("argp-standalone")}}
#@git:{{submodule.current[name]}}:{{name}}
-#@sha256:{{files["easyseccomp-configure.tar"]}}:easyseccomp-configure.tar
+#@untar::sha256:{{files["easyseccomp-configure.tar"]}}:{{name}}
{%- endblock %}
{% block at_script %}
-cd easyseccomp
-tar -xvf ../easyseccomp-configure.tar
-autotools_static . --enable-seccomp
+autotools_static {{name}} --enable-seccomp
check_static command/easyseccomp
{% endblock %}
diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone
@@ -5,7 +5,7 @@
#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
#+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75
#@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
-#@sha256:0069d3906d6b9a0aafa943bb5ce2b359ce486881c373ba6eee7736aa5d133302:argp-standalone-1.5.0-configure.tar
+#@untar::sha256:0069d3906d6b9a0aafa943bb5ce2b359ce486881c373ba6eee7736aa5d133302:argp-standalone-1.5.0
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
@@ -58,9 +58,7 @@ check_static() {
}
-cd argp-standalone-1.5.0
-tar -xvf ../argp-standalone-1.5.0-configure.tar
-autotools_static .
+autotools_static argp-standalone-1.5.0
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.b33b4e8c9a2581033d9bedb6657dc5736db3934800f42087cb175456ca5c90d4-
\ No newline at end of file
+#+easyseccomp.5d144492dbf91dac12913f62a242af548e98977161ec0711e705e5c127483ad4+
\ 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.4d1b2e827afd1016bde2bea13ebb10b93a85660003d08dad6bc586f0b4336dbc
-#+system-config-rc.05c5a168fb6fc18806385c4d20ba1756ae8973693d0ec5ffb53a87b2697da810
+#+system-config.ad274e8f65e0f9bd538834bc01a60638ada1afef18cde99eeab581904d7dab31
+#+system-config-rc.754273c877ae2ccff809d6977bf87692ba9a176f255a5b3cf8375bc806b72e5d
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.fab4cc9beefd7ca1224a3b5ad1d1e3216996f7f1f91f80b40c558a1f279147e3
+#+system-config-init.03a470d6dddbaa7872466c33cd0d9a8667887bc29b3ab77e90627dedf9759aed
#+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,9 +8,9 @@
#+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f
#+libseccomp.8b32056ea0458b22266d8fc1b3cce05c82d08282c40a1e56d00d15fa57cdc156
#+error-standalone.664c98067651c547ed8252fefb7237335ee7b15aa7ea4a338ff8d65dc02a6c0e
-#+argp-standalone.5abcdd9677182bf8de883bff03ab46a8d990ccb41868fe1751771d870a757ea1
+#+argp-standalone.723d285519469723d41dc8995ad91acbda1bf2e7a96b906b13de19d8b9e2dc82
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
-#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
+#@untar::sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
@@ -63,9 +63,7 @@ check_static() {
}
-cd easyseccomp
-tar -xvf ../easyseccomp-configure.tar
-autotools_static . --enable-seccomp
+autotools_static easyseccomp --enable-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.dcb9ffd18b57e0c9d513eb84d5f994925b87938e0833b6642248e4921dc9b721' \
+ 'pthbs_path_containers=/home/ccx/versions/env.311eadb80b88a20d5105bbc3a55a9ebb973ef7c847ee6beb3e92c70ced26dd51' \
'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.05c5a168fb6fc18806385c4d20ba1756ae8973693d0ec5ffb53a87b2697da810
+#+system-config-rc.754273c877ae2ccff809d6977bf87692ba9a176f255a5b3cf8375bc806b72e5d
-s6rcdb=/home/ccx/versions/system-config-rc.05c5a168fb6fc18806385c4d20ba1756ae8973693d0ec5ffb53a87b2697da810/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.754273c877ae2ccff809d6977bf87692ba9a176f255a5b3cf8375bc806b72e5d/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.4d1b2e827afd1016bde2bea13ebb10b93a85660003d08dad6bc586f0b4336dbc
+#+system-config.ad274e8f65e0f9bd538834bc01a60638ada1afef18cde99eeab581904d7dab31
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.4d1b2e827afd1016bde2bea13ebb10b93a85660003d08dad6bc586f0b4336dbc/config/s6-rc-source
+src=/home/ccx/versions/system-config.ad274e8f65e0f9bd538834bc01a60638ada1afef18cde99eeab581904d7dab31/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,7 +5,7 @@
#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
#+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3
#@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
-#@sha256:0069d3906d6b9a0aafa943bb5ce2b359ce486881c373ba6eee7736aa5d133302:argp-standalone-1.5.0-configure.tar
+#@untar::sha256:0069d3906d6b9a0aafa943bb5ce2b359ce486881c373ba6eee7736aa5d133302:argp-standalone-1.5.0
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
@@ -58,9 +58,7 @@ check_static() {
}
-cd argp-standalone-1.5.0
-tar -xvf ../argp-standalone-1.5.0-configure.tar
-autotools_static .
+autotools_static argp-standalone-1.5.0
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.6238c46b97aa0265efabd009fb5f333ae98a5adcf3010d05d66a9c6b4a38380b-
\ No newline at end of file
+#+easyseccomp.1479f4956769f77ead50c1c6f55673c74600e88133109069e191af06e972416b+
\ 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.f2616448e98f093445b92acb2ad6a190b8afd6b1a55ddf10feddc17db9b4dc41
-#+system-config-rc.f47a483bccb23544befc56792d8becbc2bacd8e83d86ebf3b97b410a1c3b9578
+#+system-config.906f1077c8801399c97293fc43925a397506f9e93a62bf899523ff91c58937d1
+#+system-config-rc.56531cfecfe252de6d8355edd1bf9a97165b151d584097e92dcf22d426bba992
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.a48e8a84caefddd0c2104ffb150fb1d1671100ea431e5b7fd1146698a7ec3a13
+#+system-config-init.78757d27d58d97095c34b932867bdfde47171ba972a83a3c8e715a2637fdec93
#+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,9 +8,9 @@
#+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0
#+libseccomp.cf3861629089b6a01e1499bd0296161802ff4978c7adde69cff19c5c5a568902
#+error-standalone.b756d86efb93b61ab49683dd2614413fc0a0c66fed3026f238ab32a725257ab2
-#+argp-standalone.4b42aab90811cfaaa41b0ab14c6ff06b406bf7727b76de751242419c3a5cea77
+#+argp-standalone.a4845f1450eac31f86bf60a1100183abd1ee9ea8f4aec5a75edccced33423c0b
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
-#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
+#@untar::sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
@@ -63,9 +63,7 @@ check_static() {
}
-cd easyseccomp
-tar -xvf ../easyseccomp-configure.tar
-autotools_static . --enable-seccomp
+autotools_static easyseccomp --enable-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.433df68c87c4426ed671aff726c719bcc9add93d799bc5ac470178649b92e031' \
+ 'pthbs_path_containers=/versions/env.e55ff0a0b3539064b9e6c2e4d8f455445473ccdf9743692a376dbd05a00d36e6' \
'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.f47a483bccb23544befc56792d8becbc2bacd8e83d86ebf3b97b410a1c3b9578
+#+system-config-rc.56531cfecfe252de6d8355edd1bf9a97165b151d584097e92dcf22d426bba992
-s6rcdb=/versions/system-config-rc.f47a483bccb23544befc56792d8becbc2bacd8e83d86ebf3b97b410a1c3b9578/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.56531cfecfe252de6d8355edd1bf9a97165b151d584097e92dcf22d426bba992/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.f2616448e98f093445b92acb2ad6a190b8afd6b1a55ddf10feddc17db9b4dc41
+#+system-config.906f1077c8801399c97293fc43925a397506f9e93a62bf899523ff91c58937d1
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.f2616448e98f093445b92acb2ad6a190b8afd6b1a55ddf10feddc17db9b4dc41/config/s6-rc-source
+src=/versions/system-config.906f1077c8801399c97293fc43925a397506f9e93a62bf899523ff91c58937d1/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
