commit 4962710009a64f5a9877754ae3c43a326a30b2aa
parent e82813108935a06db01d75198b54c6c736670403
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 19:09:13 +0000
agrp-standalone
Diffstat:
15 files changed, 56 insertions(+), 22 deletions(-)
diff --git a/templates/pkg/argp-standalone b/templates/pkg/argp-standalone
@@ -6,6 +6,14 @@
{% block at_script %}
autotools_static argp-standalone-1.5.0
+{% include "functions/vars" %}
+def_prefix
+
+install -d "$pthbs_destdir/$prefix/library"
+install -m 644 libagrp.a "$pthbs_destdir/$prefix/library"
+
+install -d "$pthbs_destdir/$prefix/include"
+install -m 644 agrp.h "$pthbs_destdir/$prefix/include"
{% endblock %}
{% block genlinks_begin %}
diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone
@@ -59,6 +59,19 @@ check_static() {
autotools_static argp-standalone-1.5.0
+def_prefix() {
+ prefix=/home/ccx/versions/$pthbs_package
+}
+def_dest() {
+ dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package
+}
+def_prefix
+
+install -d "$pthbs_destdir/$prefix/library"
+install -m 644 libagrp.a "$pthbs_destdir/$prefix/library"
+
+install -d "$pthbs_destdir/$prefix/include"
+install -m 644 agrp.h "$pthbs_destdir/$prefix/include"
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.1cdd084919adead85f9572a223c36da4d4cefaa71fb68ffb0f67079c9b89ddfc-
\ No newline at end of file
+#+easyseccomp.bdba337c6792568dace4fe7297c05141453b5b2e7dc558c407b5b8bcc77edebe+
\ 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.0ff34e6818531d66030393fca2710227698f49b59f2f91d48f6e44d0dc249859
-#+system-config-rc.e1b50e73b9ed32c5802d86458ed1ad1865e54bef639390b6935e6e30cf6475f0
+#+system-config.ea09e4b669b0ba67d6412169693de6b0a88690da1620a4563a27274501e2bfa9
+#+system-config-rc.a9e30de56adb22c42452e920162a2373daf0b8caa615569040f17202190132ba
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.975f34f8e7fe41e08e62b29cb2285c0b02f86c1cfa88083e3a5e1c0beb766fc4
+#+system-config-init.601526f887ca6ea6e4301f83afcc885dd360edf8406e7e3abff4c942e1efe5d0
#+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.c14ca46edc2a9e2dc809cc75d357e7703b7f8cbd40735eb10504ff2dc2367e4c
+#+argp-standalone.6c66829bcba6963091e826a61d799dbb9a0f79d2ebc77303037765fcdf28a18b
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@untar::sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321: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.a5331bfe5706306a3f991e1c9d3daa2b080cfc3ca188162b123a4263ada1e760' \
+ 'pthbs_path_containers=/home/ccx/versions/env.f083869d2424322172c38f46751e636406c597d340486b934ce973ba93a358d8' \
'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.e1b50e73b9ed32c5802d86458ed1ad1865e54bef639390b6935e6e30cf6475f0
+#+system-config-rc.a9e30de56adb22c42452e920162a2373daf0b8caa615569040f17202190132ba
-s6rcdb=/home/ccx/versions/system-config-rc.e1b50e73b9ed32c5802d86458ed1ad1865e54bef639390b6935e6e30cf6475f0/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.a9e30de56adb22c42452e920162a2373daf0b8caa615569040f17202190132ba/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.0ff34e6818531d66030393fca2710227698f49b59f2f91d48f6e44d0dc249859
+#+system-config.ea09e4b669b0ba67d6412169693de6b0a88690da1620a4563a27274501e2bfa9
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.0ff34e6818531d66030393fca2710227698f49b59f2f91d48f6e44d0dc249859/config/s6-rc-source
+src=/home/ccx/versions/system-config.ea09e4b669b0ba67d6412169693de6b0a88690da1620a4563a27274501e2bfa9/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
@@ -59,6 +59,19 @@ check_static() {
autotools_static argp-standalone-1.5.0
+def_prefix() {
+ prefix=/versions/$pthbs_package
+}
+def_dest() {
+ dest=${pthbs_destdir%/}//versions/$pthbs_package
+}
+def_prefix
+
+install -d "$pthbs_destdir/$prefix/library"
+install -m 644 libagrp.a "$pthbs_destdir/$prefix/library"
+
+install -d "$pthbs_destdir/$prefix/include"
+install -m 644 agrp.h "$pthbs_destdir/$prefix/include"
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.6892beb7149c45e4799f02458d70b794a806ea93d552feee65feee0bcdb006d0-
\ No newline at end of file
+#+easyseccomp.35285ca0aab5afcbee19cbb3ef14db3837bd7acd0ceb96b4d47928db5b6d2de9+
\ 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.d1983e5bd5cb02995715b3ae99a2169f110e7badc214f8e17adb88f7a546dd51
-#+system-config-rc.99ecd0a8a6736e1156159730a0622015c672fbfef65f3de5b9afa85a15615280
+#+system-config.8db3ec6bcfdc09a7cdbf792b360cbc0a49398a3e3994ea24a43dabc0909643f3
+#+system-config-rc.61b776530694952f4c13a0567868d1c434ebba3bf865209acb57e3e875eb2cec
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.968ef4797f6a0768358bd24bec9635979d9f59af03c44d6491e26ae86f5775f1
+#+system-config-init.c859cbcb0397db7dcbe101adac88addf0697b3649ee22708490659d5cd1033be
#+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.c24539cc0bba7a4ba79ad1981a4b0e460ea1901d63665715e5aed441b973ea65
+#+argp-standalone.032e7e14b270c64b202466d627aecf6fadbe444fe24e41993644c4ab163d024f
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@untar::sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321: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.2c264a760a1193ee18edacd65abc6fbc64a0087ac5db53e66e1f7b99a2e598aa' \
+ 'pthbs_path_containers=/versions/env.9c3fee0cfa920aafa9b1a83292d1c85144a8e871beeba3440e33eb1e1df8cc5c' \
'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.99ecd0a8a6736e1156159730a0622015c672fbfef65f3de5b9afa85a15615280
+#+system-config-rc.61b776530694952f4c13a0567868d1c434ebba3bf865209acb57e3e875eb2cec
-s6rcdb=/versions/system-config-rc.99ecd0a8a6736e1156159730a0622015c672fbfef65f3de5b9afa85a15615280/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.61b776530694952f4c13a0567868d1c434ebba3bf865209acb57e3e875eb2cec/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.d1983e5bd5cb02995715b3ae99a2169f110e7badc214f8e17adb88f7a546dd51
+#+system-config.8db3ec6bcfdc09a7cdbf792b360cbc0a49398a3e3994ea24a43dabc0909643f3
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.d1983e5bd5cb02995715b3ae99a2169f110e7badc214f8e17adb88f7a546dd51/config/s6-rc-source
+src=/versions/system-config.8db3ec6bcfdc09a7cdbf792b360cbc0a49398a3e3994ea24a43dabc0909643f3/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
