commit 50ad0675e9c4d8068a09fe4ca277300ece5eab96
parent 3d879ed39770baa75018adfd6297f7346e6b901c
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Wed, 30 Apr 2025 13:30:14 +0000
Add missing dependencies for "containers" package
Diffstat:
15 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/templates/pkg/containers b/templates/pkg/containers
@@ -1,6 +1,9 @@
{% extends "scriptsetup" %}
{%- block extra_deps %}
#+{{pkg_install_name("execline")}}
+#+{{pkg_install_name("alpine-keys")}}
+#+{{pkg_install_name("apk-tools")}}
+#+{{pkg_install_name("xbps")}}
{%- endblock %}
{%- block extra_script %}
mkdir "$pkgdir/data"
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -3,6 +3,9 @@
#+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f
+#+alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4
+#+apk-tools.d0d7af182121c66cd5587b51689275557a37562fa1d20b9137b33a97fa12d152
+#+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9
#@git:aa69a0fc1c82c14b945b9b7348306a4e82bb0bbc:containers
: ${JOBS:=1}
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -6,7 +6,7 @@
#+s6-linux-utils.1990b55837ff2c28a81500d80292c6d530c8516347eb896007eb5aed2af6c425
#+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.c40e6b3bb3f89a69f08c01c56056f0483c836032b1116ee60f39ab176fde7250
+#+containers.50ba6459dcb30cd8cbbc3a7a992b341c7e5cf818ddf377692533f22fea20d83f
#+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9
#+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c
#+apk-tools.d0d7af182121c66cd5587b51689275557a37562fa1d20b9137b33a97fa12d152
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -1,7 +1,7 @@
-#+system-config.e5fa2cdda511590ba7bd8232387edef0b004bf42fa67d163cfd53b872f1f1317
-#+system-config-rc.33de16df17466b6c37909e86883525f0f184f744fb52c85a4b2dcc5bd51c5605
+#+system-config.f10ffa35e9efe8978d7946359541b06073f70eb53a5deec7df802e6660472939
+#+system-config-rc.e20c10f59b82e0bef21f3ff620feba0e0fcbfbad07cf73cee0b2b3d3eb3acc71
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.11d1c7322ec86e3fef979c79091a170eb6e9c8df667859549a3e0fabfe40478a
+#+system-config-init.8d4a53628092661c15807e5cb86ab74ffad4e919b0832db088248890df3c5a44
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
#+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3
#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b
@@ -25,7 +25,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.c40e6b3bb3f89a69f08c01c56056f0483c836032b1116ee60f39ab176fde7250
+#+containers.50ba6459dcb30cd8cbbc3a7a992b341c7e5cf818ddf377692533f22fea20d83f
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
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.a8edc5487bb3c2933908b37111cfa0783896f6fbbc5bee48b441dc388e31f40b' \
+ 'pthbs_path_containers=/home/ccx/versions/env.c37d9d59b583c8dfeb1f45064530d5d933837a8aa56474fce9300cc903c55edd' \
'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.33de16df17466b6c37909e86883525f0f184f744fb52c85a4b2dcc5bd51c5605
+#+system-config-rc.e20c10f59b82e0bef21f3ff620feba0e0fcbfbad07cf73cee0b2b3d3eb3acc71
-s6rcdb=/home/ccx/versions/system-config-rc.33de16df17466b6c37909e86883525f0f184f744fb52c85a4b2dcc5bd51c5605/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.e20c10f59b82e0bef21f3ff620feba0e0fcbfbad07cf73cee0b2b3d3eb3acc71/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.e5fa2cdda511590ba7bd8232387edef0b004bf42fa67d163cfd53b872f1f1317
+#+system-config.f10ffa35e9efe8978d7946359541b06073f70eb53a5deec7df802e6660472939
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.e5fa2cdda511590ba7bd8232387edef0b004bf42fa67d163cfd53b872f1f1317/config/s6-rc-source
+src=/home/ccx/versions/system-config.f10ffa35e9efe8978d7946359541b06073f70eb53a5deec7df802e6660472939/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/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -20,7 +20,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.c40e6b3bb3f89a69f08c01c56056f0483c836032b1116ee60f39ab176fde7250
+#+containers.50ba6459dcb30cd8cbbc3a7a992b341c7e5cf818ddf377692533f22fea20d83f
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -3,6 +3,9 @@
#+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9
+#+alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1
+#+apk-tools.20ad2f2e238d23a5eeac3587f85cbe9763bd717a30fb8eb659badd602a556cbf
+#+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473
#@git:aa69a0fc1c82c14b945b9b7348306a4e82bb0bbc:containers
: ${JOBS:=1}
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -6,7 +6,7 @@
#+s6-linux-utils.f7e0654375f11beedafd731ad1dd66c0de8d03452bb8e38bb647cc51cc3adb2e
#+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.b136b2cb905f461c450ed1533ae742a960a69270cb37a27a67d61afa95432e8b
+#+containers.817b61c0691510e0c054b2cb81b5ee77bdec496c1704466eab6c3b4a52fd96b3
#+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473
#+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137
#+apk-tools.20ad2f2e238d23a5eeac3587f85cbe9763bd717a30fb8eb659badd602a556cbf
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -1,7 +1,7 @@
-#+system-config.03d6266d44e1da8706ca36635d8f30849c8f82c509479270d8af6958485a1fdf
-#+system-config-rc.527b894dcd9d7b2f4eb8557dcef3bc210cbb350cd18e5b7764c1f3350bf0f1b0
+#+system-config.367b44e116525512392947a408ef5da9bf23cf478d0786d0da4c4bf8fbba2e07
+#+system-config-rc.60e723415e63cd223b89d06e18421755579381d86f662661c9341fa66a4691e6
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.f0bb79d9b3ed64c15b00d623d58b8dfd628d2ef5cc56c7f52f585a22707e0530
+#+system-config-init.abb5f06ff2f5d6a33c17daca669f290f3a82bf81a690e09b84ffced431a2fbb4
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
#+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089
#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465
@@ -25,7 +25,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.b136b2cb905f461c450ed1533ae742a960a69270cb37a27a67d61afa95432e8b
+#+containers.817b61c0691510e0c054b2cb81b5ee77bdec496c1704466eab6c3b4a52fd96b3
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
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.6cefb1745583e8a402224c0434c13672ac4f909a5f6f40f14d69665f55a5afc2' \
+ 'pthbs_path_containers=/versions/env.9d57eec32f4103175737d3ed7f4e95fcd69d851a12d9bfcceb84f4abf7673d27' \
'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.527b894dcd9d7b2f4eb8557dcef3bc210cbb350cd18e5b7764c1f3350bf0f1b0
+#+system-config-rc.60e723415e63cd223b89d06e18421755579381d86f662661c9341fa66a4691e6
-s6rcdb=/versions/system-config-rc.527b894dcd9d7b2f4eb8557dcef3bc210cbb350cd18e5b7764c1f3350bf0f1b0/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.60e723415e63cd223b89d06e18421755579381d86f662661c9341fa66a4691e6/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.03d6266d44e1da8706ca36635d8f30849c8f82c509479270d8af6958485a1fdf
+#+system-config.367b44e116525512392947a408ef5da9bf23cf478d0786d0da4c4bf8fbba2e07
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.03d6266d44e1da8706ca36635d8f30849c8f82c509479270d8af6958485a1fdf/config/s6-rc-source
+src=/versions/system-config.367b44e116525512392947a408ef5da9bf23cf478d0786d0da4c4bf8fbba2e07/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/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -20,7 +20,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.b136b2cb905f461c450ed1533ae742a960a69270cb37a27a67d61afa95432e8b
+#+containers.817b61c0691510e0c054b2cb81b5ee77bdec496c1704466eab6c3b4a52fd96b3
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
