commit 831e7a0e12d1c6a98e44074a843726d2d4a61b17
parent d00e73f6d8c3da030f90efea9c1d3168116a638a
Author: ccx <ccx@te2000.cz>
Date: Fri, 1 Mar 2024 18:21:49 +0000
Containers install fully
Diffstat:
23 files changed, 98 insertions(+), 69 deletions(-)
diff --git a/packages/alpine-keys b/packages/alpine-keys
@@ -22,7 +22,7 @@ def_prefix() {
prefix=/versions/$pthbs_package
}
def_dest() {
- dest=$pthbs_destdir//versions/$pthbs_package
+ dest=${pthbs_destdir%/}//versions/$pthbs_package
}
def_prefix
d="${pthbs_destdir%/}/$prefix/keys/alpine"
diff --git a/packages/apk-tools b/packages/apk-tools
@@ -4,7 +4,7 @@
#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c
#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48
#+patch.c738e7d35300fa9db0eba35891656cd875ae3f672155663b7858045b64607349
-#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3
+#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7
#+zstd.62d99b3e023021ff3e372f212569b6fb81c47c91a00c49dfd35f3f508e7370d1
#+pkgconf-pkg-config.9ce762e8803a43c875dd59a366babec3f2ac504bf3985bba236c13f70b396f43
#@git:4cfb907282ede4b7f52f2514fbf96c60e1cad441:apk-tools
@@ -32,7 +32,7 @@ def_prefix() {
prefix=/versions/$pthbs_package
}
def_dest() {
- dest=$pthbs_destdir//versions/$pthbs_package
+ dest=${pthbs_destdir%/}//versions/$pthbs_package
}
build_env_static
diff --git a/packages/containers b/packages/containers
@@ -3,7 +3,7 @@
#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4
#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60
#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08
-#@git:82a131003d3cecfd9eb9ce12df1a4e7f90c8bc74:containers
+#@git:e9d356d5d04d90fc0873524b985c36be14696fa2:containers
: ${JOBS:=1}
prefix=/versions/$pthbs_package
@@ -33,17 +33,23 @@ printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \
"typeset -g container_service_script_dir='$prefix/data/service_scripts'" \
"typeset -g container_alpine_keys_dir='$prefix/deps/keys/alpine/x86_64'" \
"typeset -g container_apk_executable='$prefix/deps/command/apk.static'" \
+ "typeset -g container_void_keys_dir='$prefix/deps/keys/void'" \
"typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'"
mkdir -p "$pkgdir/deps/command"
-ln -sf '/versions/apk-tools.92ac25d305512b8bf6942374a52485b4a5492fa62abfc0f0dee1eddafa0711b7/command/apk.static' "$pkgdir/deps/command/"
-ln -sf '/versions/xbps.3fb741d52592288dcd04226e546971e58038901cceb53fcfcc49806e4d25c1e6/command/xbps-install.static' "$pkgdir/deps/command/"
+ln -sf '/versions/apk-tools.1a5bf6659a08ee0c79fae91d1eefaf8b8e5b93adb82c80e7f477f52fab0b489f/command/apk.static' "$pkgdir/deps/command/"
+ln -sf '/versions/xbps.de1d351a8216d20d40694c87b8a45873b4c21b23d3fccbd6ad88852db30cd0ff/command/xbps-install.static' "$pkgdir/deps/command/"
-for f in '/versions/alpine-keys.7ba61ccdeb39b3d39111cb98bf9f1e5bd8ad010e4c295ea62db5dcfd40c45cfa/keys/alpine/'*/*; do
+for f in '/versions/alpine-keys.e2c47d8ae8d41e30d8ed82e811fd8b6d775c738c0672ea0a09cc90cdd8a008d8'/keys/alpine/*/*; do
d=$(basename "${f%/*}")
mkdir -p "$pkgdir/deps/keys/alpine/$d"
ln -sf "$f" "$pkgdir/deps/keys/alpine/$d/"
done
+
+mkdir -p "$pkgdir/deps/keys/void"
+for f in '/versions/xbps.de1d351a8216d20d40694c87b8a45873b4c21b23d3fccbd6ad88852db30cd0ff'/keys/void/*; do
+ ln -sf "$f" "$pkgdir/deps/keys/void/"
+done
cd "$pthbs_destdir/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
diff --git a/packages/containers.environment b/packages/containers.environment
@@ -6,10 +6,11 @@
#+s6-linux-utils.14f66e4eeae2e1406d10752d06ca9ca4a83ca14464aa6179b32e9fc0bf21ad42
#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4
#+confz.35f8619bf06bdf10d847e3fc93d49129ab2b39d4d23ed4d9e90f9309d298c22d
-#+containers.386d7cef5b1891a63124c2aaa875094108d4146e7bab01a5ed31c4299f5983f3
-#+xbps.3fb741d52592288dcd04226e546971e58038901cceb53fcfcc49806e4d25c1e6
-#+apk-tools.92ac25d305512b8bf6942374a52485b4a5492fa62abfc0f0dee1eddafa0711b7
-#+alpine-keys.7ba61ccdeb39b3d39111cb98bf9f1e5bd8ad010e4c295ea62db5dcfd40c45cfa
-#+getent.712b2d2b4e4027e2ad86f89a43c8304b9a2dfca34f5371a24c9898bf3325363c
+#+containers.f26df119904d0e9a93a7edc5cc35d06b4d01a37ae120172afa3832b5eb64c1a8
+#+xbps.de1d351a8216d20d40694c87b8a45873b4c21b23d3fccbd6ad88852db30cd0ff
+#+zstd.62d99b3e023021ff3e372f212569b6fb81c47c91a00c49dfd35f3f508e7370d1
+#+apk-tools.1a5bf6659a08ee0c79fae91d1eefaf8b8e5b93adb82c80e7f477f52fab0b489f
+#+alpine-keys.e2c47d8ae8d41e30d8ed82e811fd8b6d775c738c0672ea0a09cc90cdd8a008d8
+#+getent.71be4aabb688fc90f3ef296584adf760cfcd2b120193af2bc6198a75cee314aa
#+fileset.8eeccb853780cd74b0a926007fd20caceff376bff04e615de75b1efb9e71447c
-#+pidns_run.1d37c8d72037591fe19c91f7c234df1d1858644267e0939d3622bfbf748b5d85-
\ No newline at end of file
+#+pidns_run.9ee24751b87f1d881a49c8ff1b0e3ebe027bffb20d6017da7c69d78b85c9ac4d+
\ No newline at end of file
diff --git a/packages/curl b/packages/curl
@@ -4,7 +4,7 @@
#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c
#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48
#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065
-#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3
+#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7
#@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
build_env_static() {
diff --git a/packages/default.environment b/packages/default.environment
@@ -9,7 +9,7 @@
#+patch.c738e7d35300fa9db0eba35891656cd875ae3f672155663b7858045b64607349
#+flex.c564f7c6d8a89cd1c53a5677f65987700122bb0a417dfff9348c78b8df17efb9
#+bison.bd4f6247caa50159da9ce7ab37e36df1ecdfd779f307ed1f20e6fdbbb2a134e7
-#+rsync.3f8e5afe215047e1feee67c6b0389a0cb2e58511a479fd0b23a8c6321f32989d
+#+rsync.a6c51048cd1331f9a454a00ab852087080810b0bda2758c8033424fb99063aba
#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08
#+s6.4f5d726b3cd79949492d55acfbc7a2554cdb7cc3f6861ad620870621e454da50
#+s6-rc.40667d135c9990814a75eb664f12673a28482a896e115579ec275163fb484292
@@ -18,20 +18,20 @@
#+s6-linux-init.8dfd3c5fae01b4c1fc48c9d454ba47e96bc832566ac352ee25de67907683a87e
#+mdevd.258e6ea50bf186f8ce57dee77b25e45f8b3bcae5283037d78dcd795db6397325
#+s6-dns.48685ba743c4728b4176e99ae41261e5b13d9ad0ee52e6f711afd42f37f52da0
-#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3
-#+s6-networking.f8d1e618cf34e59039afa31da99bc0e04ffd19644ff33795f5d48cca978fd0ae
+#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7
+#+s6-networking.cc1e01f56502ebec90a4ea7b632dde9b02df852462d6a213b8c29191849f7e0c
#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4
#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60
#+aat.edb4bd6fe5e267bc49c88621d03e0f415209a73b75edec16f439a8a87b6f14c0
#+confz.35f8619bf06bdf10d847e3fc93d49129ab2b39d4d23ed4d9e90f9309d298c22d
-#+containers.386d7cef5b1891a63124c2aaa875094108d4146e7bab01a5ed31c4299f5983f3
+#+containers.f26df119904d0e9a93a7edc5cc35d06b4d01a37ae120172afa3832b5eb64c1a8
#+fileset.8eeccb853780cd74b0a926007fd20caceff376bff04e615de75b1efb9e71447c
#+logincaps.d9386a7c29239489154a246351c0e0deb584624d16ec764b4a17e8856e37fc1f
#+snaprep.4386ae5a1a3fbf3d875ff06709e6d2103d4090f21a9ad73cee731c32a5e4f8f3
-#+curl.9ce7d4ddfc3a2df6a775182d191df4c96bd08f79a781d61ac9aebba39c8873bb
-#+git.55986da38ffda7a1c13f96e1fe9d1c3906ddf296708125414d8f9dd42cb64caa
-#+xbps.3fb741d52592288dcd04226e546971e58038901cceb53fcfcc49806e4d25c1e6
-#+apk-tools.92ac25d305512b8bf6942374a52485b4a5492fa62abfc0f0dee1eddafa0711b7
-#+getent.712b2d2b4e4027e2ad86f89a43c8304b9a2dfca34f5371a24c9898bf3325363c
-#+getconf.8e799176d421bb1e6e14def4852ee296ce48c126a965412f8e6952fe640b2702
-#+iconv.cfbdfdf8a13d4758b99e8522ff8d83fe9cadabd6a66b3868d5dadf42453b936f-
\ No newline at end of file
+#+curl.811150400df70e5701f0c499be0854745bb4470018e7211f9fbe6f1b2b1533d4
+#+git.c7e88a88793e6158bc09f8014837d162b9f50553fd5c9fe5c0b243fbe49d8f78
+#+xbps.de1d351a8216d20d40694c87b8a45873b4c21b23d3fccbd6ad88852db30cd0ff
+#+apk-tools.1a5bf6659a08ee0c79fae91d1eefaf8b8e5b93adb82c80e7f477f52fab0b489f
+#+getent.71be4aabb688fc90f3ef296584adf760cfcd2b120193af2bc6198a75cee314aa
+#+getconf.17f16778ec3ce935b4a70331f01c6b233c8a5a8a064bbfbc86db16f1fa6cdf63
+#+iconv.d782d7452b3c1090084b0ba12c2e5bd2648d1d45eca1849a96d2b41dfb91c9d9+
\ No newline at end of file
diff --git a/packages/getconf b/packages/getconf
@@ -27,7 +27,7 @@ def_prefix() {
prefix=/versions/$pthbs_package
}
def_dest() {
- dest=$pthbs_destdir//versions/$pthbs_package
+ dest=${pthbs_destdir%/}//versions/$pthbs_package
}
build_env_static
def_prefix
diff --git a/packages/getent b/packages/getent
@@ -27,7 +27,7 @@ def_prefix() {
prefix=/versions/$pthbs_package
}
def_dest() {
- dest=$pthbs_destdir//versions/$pthbs_package
+ dest=${pthbs_destdir%/}//versions/$pthbs_package
}
build_env_static
def_prefix
diff --git a/packages/git b/packages/git
@@ -4,8 +4,8 @@
#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c
#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48
#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065
-#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3
-#+curl.9ce7d4ddfc3a2df6a775182d191df4c96bd08f79a781d61ac9aebba39c8873bb
+#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7
+#+curl.811150400df70e5701f0c499be0854745bb4470018e7211f9fbe6f1b2b1533d4
#@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
check_static() {
diff --git a/packages/iconv b/packages/iconv
@@ -27,7 +27,7 @@ def_prefix() {
prefix=/versions/$pthbs_package
}
def_dest() {
- dest=$pthbs_destdir//versions/$pthbs_package
+ dest=${pthbs_destdir%/}//versions/$pthbs_package
}
build_env_static
def_prefix
diff --git a/packages/kernel.environment b/packages/kernel.environment
@@ -1 +1 @@
-#+linux.1968c865a84aabe992da5649761ee67798022accf23cec0d14dd5e0985094e11-
\ No newline at end of file
+#+linux.bcc0e0ac888fcae5d61ba81807ab0bc6ef7a609cd32a856f2ec597689ebbce11+
\ No newline at end of file
diff --git a/packages/libressl b/packages/libressl
@@ -56,7 +56,7 @@ check_static() {
export LDFLAGS="--static"
-autotools_static libressl-3.8.2
+autotools_static libressl-3.8.2 --sysconfdir=/etc
check_static command/openssl
check_static command/ocspcheck
diff --git a/packages/linux b/packages/linux
@@ -6,7 +6,7 @@
#+patch.c738e7d35300fa9db0eba35891656cd875ae3f672155663b7858045b64607349
#+flex.c564f7c6d8a89cd1c53a5677f65987700122bb0a417dfff9348c78b8df17efb9
#+bison.bd4f6247caa50159da9ce7ab37e36df1ecdfd779f307ed1f20e6fdbbb2a134e7
-#+rsync.3f8e5afe215047e1feee67c6b0389a0cb2e58511a479fd0b23a8c6321f32989d
+#+rsync.a6c51048cd1331f9a454a00ab852087080810b0bda2758c8033424fb99063aba
#+libelf-compat.a3f567beacf8a00194cd18e3564737bbd3d58448706a3ac07a34ca88b8ad0a34
#@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
#@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
diff --git a/packages/pidns_run b/packages/pidns_run
@@ -28,7 +28,7 @@ def_prefix() {
prefix=/versions/$pthbs_package
}
def_dest() {
- dest=$pthbs_destdir//versions/$pthbs_package
+ dest=${pthbs_destdir%/}//versions/$pthbs_package
}
build_env_static
def_prefix
diff --git a/packages/rsync b/packages/rsync
@@ -5,7 +5,7 @@
#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48
#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065
#+popt.37ed47b20ce3edc6b2cd974ab0b22a92ce4d55e0b8e97be57c68a55810dce820
-#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3
+#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7
#@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
build_env_static() {
diff --git a/packages/s6-networking b/packages/s6-networking
@@ -6,7 +6,7 @@
#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08
#+s6.4f5d726b3cd79949492d55acfbc7a2554cdb7cc3f6861ad620870621e454da50
#+s6-dns.48685ba743c4728b4176e99ae41261e5b13d9ad0ee52e6f711afd42f37f52da0
-#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3
+#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7
#@git:68db8af7c26461d4477f482ecbc279729fa911e4:s6-networking
: ${JOBS:=1}
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -5,7 +5,7 @@
#+patch.c738e7d35300fa9db0eba35891656cd875ae3f672155663b7858045b64607349
#+flex.c564f7c6d8a89cd1c53a5677f65987700122bb0a417dfff9348c78b8df17efb9
#+bison.bd4f6247caa50159da9ce7ab37e36df1ecdfd779f307ed1f20e6fdbbb2a134e7
-#+rsync.3f8e5afe215047e1feee67c6b0389a0cb2e58511a479fd0b23a8c6321f32989d
+#+rsync.a6c51048cd1331f9a454a00ab852087080810b0bda2758c8033424fb99063aba
#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08
#+s6.4f5d726b3cd79949492d55acfbc7a2554cdb7cc3f6861ad620870621e454da50
#+s6-rc.40667d135c9990814a75eb664f12673a28482a896e115579ec275163fb484292
@@ -14,20 +14,20 @@
#+s6-linux-init.8dfd3c5fae01b4c1fc48c9d454ba47e96bc832566ac352ee25de67907683a87e
#+mdevd.258e6ea50bf186f8ce57dee77b25e45f8b3bcae5283037d78dcd795db6397325
#+s6-dns.48685ba743c4728b4176e99ae41261e5b13d9ad0ee52e6f711afd42f37f52da0
-#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3
-#+s6-networking.f8d1e618cf34e59039afa31da99bc0e04ffd19644ff33795f5d48cca978fd0ae
+#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7
+#+s6-networking.cc1e01f56502ebec90a4ea7b632dde9b02df852462d6a213b8c29191849f7e0c
#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4
#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60
#+aat.edb4bd6fe5e267bc49c88621d03e0f415209a73b75edec16f439a8a87b6f14c0
#+confz.35f8619bf06bdf10d847e3fc93d49129ab2b39d4d23ed4d9e90f9309d298c22d
-#+containers.386d7cef5b1891a63124c2aaa875094108d4146e7bab01a5ed31c4299f5983f3
+#+containers.f26df119904d0e9a93a7edc5cc35d06b4d01a37ae120172afa3832b5eb64c1a8
#+fileset.8eeccb853780cd74b0a926007fd20caceff376bff04e615de75b1efb9e71447c
#+logincaps.d9386a7c29239489154a246351c0e0deb584624d16ec764b4a17e8856e37fc1f
#+snaprep.4386ae5a1a3fbf3d875ff06709e6d2103d4090f21a9ad73cee731c32a5e4f8f3
-#+curl.9ce7d4ddfc3a2df6a775182d191df4c96bd08f79a781d61ac9aebba39c8873bb
-#+git.55986da38ffda7a1c13f96e1fe9d1c3906ddf296708125414d8f9dd42cb64caa
-#+xbps.3fb741d52592288dcd04226e546971e58038901cceb53fcfcc49806e4d25c1e6
-#+apk-tools.92ac25d305512b8bf6942374a52485b4a5492fa62abfc0f0dee1eddafa0711b7
-#+getent.712b2d2b4e4027e2ad86f89a43c8304b9a2dfca34f5371a24c9898bf3325363c
-#+getconf.8e799176d421bb1e6e14def4852ee296ce48c126a965412f8e6952fe640b2702
-#+iconv.cfbdfdf8a13d4758b99e8522ff8d83fe9cadabd6a66b3868d5dadf42453b936f-
\ No newline at end of file
+#+curl.811150400df70e5701f0c499be0854745bb4470018e7211f9fbe6f1b2b1533d4
+#+git.c7e88a88793e6158bc09f8014837d162b9f50553fd5c9fe5c0b243fbe49d8f78
+#+xbps.de1d351a8216d20d40694c87b8a45873b4c21b23d3fccbd6ad88852db30cd0ff
+#+apk-tools.1a5bf6659a08ee0c79fae91d1eefaf8b8e5b93adb82c80e7f477f52fab0b489f
+#+getent.71be4aabb688fc90f3ef296584adf760cfcd2b120193af2bc6198a75cee314aa
+#+getconf.17f16778ec3ce935b4a70331f01c6b233c8a5a8a064bbfbc86db16f1fa6cdf63
+#+iconv.d782d7452b3c1090084b0ba12c2e5bd2648d1d45eca1849a96d2b41dfb91c9d9+
\ No newline at end of file
diff --git a/packages/xbps b/packages/xbps
@@ -5,7 +5,7 @@
#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48
#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065
#+libarchive.7ae626a2036298772ddce8cd995ff9097feef3ed3fa59d794c4bdebdc2435739
-#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3
+#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7
#+pkgconf-pkg-config.9ce762e8803a43c875dd59a366babec3f2ac504bf3985bba236c13f70b396f43
#@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
@@ -57,13 +57,20 @@ check_static() {
fi
}
+def_prefix() {
+ prefix=/versions/$pthbs_package
+}
+def_dest() {
+ dest=${pthbs_destdir%/}//versions/$pthbs_package
+}
export LDFLAGS=--static
export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
build_env_static
+def_dest
+def_prefix
cd xbps-0.59.2
-prefix=/versions/$pthbs_package
find lib bin -name '*.c' -exec sed -iEe '/^[\t ]*#[\t ]*define[\t ]+_GNU_SOURCE/d' '{}' \;
find lib bin -name '*.c' -exec sed -iEe '/#.*_GNU_SOURCE/d' '{}' \;
./configure --verbose \
@@ -74,14 +81,14 @@ find lib bin -name '*.c' -exec sed -iEe '/#.*_GNU_SOURCE/d' '{}' \;
--infodir="$prefix/info" \
--mandir="$prefix/man" \
--libdir="$prefix/library" \
- --localstatedir='/var/pthbs' \
+ --localstatedir=/var \
--enable-static
make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C include
make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C lib libxbps.a
-install -d "$pthbs_destdir/$prefix/library"
-install -m 644 lib/libxbps.a "$pthbs_destdir/$prefix/library"
-install -d "$pthbs_destdir/$prefix/command"
+install -d "$dest/library"
+install -m 644 lib/libxbps.a "$dest/library"
+install -d "$dest/command"
for cmd in xbps-alternatives xbps-create xbps-dgraph xbps-install xbps-pkgdb xbps-query xbps-reconfigure xbps-remove xbps-rindex xbps-uhelper xbps-checkvers xbps-fbulk xbps-digest xbps-fetch xbps-uchroot xbps-uunshare; do
make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C "bin/$cmd" "$cmd.static"
install -m 755 "bin/$cmd/$cmd.static" "$pthbs_destdir/$prefix/command"
@@ -90,7 +97,8 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C data
make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C data install DESTDIR="$pthbs_destdir"
check_static command/xbps-install.static
-mv -v "$pthbs_destdir//var/pthbs/db/xbps/keys" "$pthbs_destdir/$prefix/"
+mkdir -p "$dest/keys"
+mv -v "$pthbs_destdir/var/db/xbps/keys" "$dest/keys/void"
@@ -115,6 +123,7 @@ function link(src) {
$1!="."{exit 1}
+$2 == "keys" { link($0); next }
$2 == "command" { link($0); next }
$2 == "bin" { link(s1("command", $0)); next }
diff --git a/templates/functions/vars b/templates/functions/vars
@@ -2,5 +2,5 @@ def_prefix() {
prefix={{versions}}/$pthbs_package
}
def_dest() {
- dest=$pthbs_destdir/{{versions}}/$pthbs_package
+ dest=${pthbs_destdir%/}/{{versions}}/$pthbs_package
}
diff --git a/templates/pkg/containers b/templates/pkg/containers
@@ -10,18 +10,24 @@ printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \
"typeset -g container_service_script_dir='$prefix/data/service_scripts'" \
"typeset -g container_alpine_keys_dir='$prefix/deps/keys/alpine/x86_64'" \
"typeset -g container_apk_executable='$prefix/deps/command/apk.static'" \
+ "typeset -g container_void_keys_dir='$prefix/deps/keys/void'" \
"typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'"
mkdir -p "$pkgdir/deps/command"
-ln -sf '{{versions}}/apk-tools.{{pkg_sha256("apk-tools")}}/command/apk.static' "$pkgdir/deps/command/"
-ln -sf '{{versions}}/xbps.{{pkg_sha256("xbps")}}/command/xbps-install.static' "$pkgdir/deps/command/"
+ln -sf '{{pkg_install_dir("apk-tools")}}/command/apk.static' "$pkgdir/deps/command/"
+ln -sf '{{pkg_install_dir("xbps")}}/command/xbps-install.static' "$pkgdir/deps/command/"
-for f in '{{versions}}/alpine-keys.{{pkg_sha256("alpine-keys")}}/keys/alpine/'*/*; do
+for f in '{{pkg_install_dir("alpine-keys")}}'/keys/alpine/*/*; do
d=$(basename "${f%/*}")
mkdir -p "$pkgdir/deps/keys/alpine/$d"
ln -sf "$f" "$pkgdir/deps/keys/alpine/$d/"
done
+mkdir -p "$pkgdir/deps/keys/void"
+for f in '{{pkg_install_dir("xbps")}}'/keys/void/*; do
+ ln -sf "$f" "$pkgdir/deps/keys/void/"
+done
+
{%- endblock %}
{% block genlinks_begin %}
x["./command/container_sysroot_run"]=1
diff --git a/templates/pkg/containers.environment b/templates/pkg/containers.environment
@@ -8,6 +8,7 @@
#+{{pkg_install_name("confz")}}
#+{{pkg_install_name("containers")}}
#+{{pkg_install_name("xbps")}}
+#+{{pkg_install_name("zstd")}}{# called by xbps-install #}
#+{{pkg_install_name("apk-tools")}}
#+{{pkg_install_name("alpine-keys")}}
#+{{pkg_install_name("getent")}}
diff --git a/templates/pkg/libressl b/templates/pkg/libressl
@@ -5,7 +5,7 @@
{% block at_script %}
export LDFLAGS="--static"
-autotools_static libressl-3.8.2
+autotools_static libressl-3.8.2 --sysconfdir=/etc
check_static command/openssl
check_static command/ocspcheck
diff --git a/templates/pkg/xbps b/templates/pkg/xbps
@@ -6,13 +6,15 @@
#@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
{%- endblock %}
{% block at_script %}
+{% include "functions/vars" %}
export LDFLAGS=--static
export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
build_env_static
+def_dest
+def_prefix
cd xbps-0.59.2
-prefix={{versions}}/$pthbs_package
find lib bin -name '*.c' -exec sed -iEe '/^[\t ]*#[\t ]*define[\t ]+_GNU_SOURCE/d' '{}' \;
find lib bin -name '*.c' -exec sed -iEe '/#.*_GNU_SOURCE/d' '{}' \;
./configure --verbose \
@@ -23,14 +25,14 @@ find lib bin -name '*.c' -exec sed -iEe '/#.*_GNU_SOURCE/d' '{}' \;
--infodir="$prefix/info" \
--mandir="$prefix/man" \
--libdir="$prefix/library" \
- --localstatedir='{{var_dir}}' \
+ --localstatedir=/var \
--enable-static
{{make}} -C include
{{make}} -C lib libxbps.a
-install -d "$pthbs_destdir/$prefix/library"
-install -m 644 lib/libxbps.a "$pthbs_destdir/$prefix/library"
-install -d "$pthbs_destdir/$prefix/command"
+install -d "$dest/library"
+install -m 644 lib/libxbps.a "$dest/library"
+install -d "$dest/command"
for cmd in xbps-alternatives xbps-create xbps-dgraph xbps-install xbps-pkgdb xbps-query xbps-reconfigure xbps-remove xbps-rindex xbps-uhelper xbps-checkvers xbps-fbulk xbps-digest xbps-fetch xbps-uchroot xbps-uunshare; do
{{make}} -C "bin/$cmd" "$cmd.static"
install -m 755 "bin/$cmd/$cmd.static" "$pthbs_destdir/$prefix/command"
@@ -39,9 +41,13 @@ done
{{make}} -C data install DESTDIR="$pthbs_destdir"
check_static command/xbps-install.static
-mv -v "$pthbs_destdir/{{var_dir}}/db/xbps/keys" "$pthbs_destdir/$prefix/"
+mkdir -p "$dest/keys"
+mv -v "$pthbs_destdir/var/db/xbps/keys" "$dest/keys/void"
{% endblock %}
{% block genlinks_begin %}
x["./command/xbps-install.static"]=1
{%- endblock %}
+{% block rules %}
+$2 == "keys" { link($0); next }
+{% endblock -%}
