mrrl

commit 8bf79047ad4c3b69c54e70e7ccfa99839991b9fd
parent bf61b11356e9a7c4013ff310477139ab76a3edbf
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sun,  4 May 2025 00:39:16 +0000

container-bin-image

Diffstat:
M
templates/pkg/container-bin-image
 | 
2
+-
M
variants/ccx-x86_64/container-bin-image
 | 
2
+-
M
variants/ccx-x86_64/containers
 | 
8
++++----
M
variants/ccx-x86_64/containers.environment
 | 
2
+-
M
variants/ccx-x86_64/default.environment
 | 
8
++++----
M
variants/ccx-x86_64/system-config
 | 
2
+-
M
variants/ccx-x86_64/system-config-init
 | 
4
++--
M
variants/ccx-x86_64/system-config-rc
 | 
4
++--
M
variants/ccx-x86_64/userspace.environment
 | 
2
+-
M
variants/root-x86_64/container-bin-image
 | 
2
+-
M
variants/root-x86_64/containers
 | 
8
++++----
M
variants/root-x86_64/containers.environment
 | 
2
+-
M
variants/root-x86_64/default.environment
 | 
8
++++----
M
variants/root-x86_64/system-config
 | 
2
+-
M
variants/root-x86_64/system-config-init
 | 
4
++--
M
variants/root-x86_64/system-config-rc
 | 
4
++--
M
variants/root-x86_64/userspace.environment
 | 
2
+-

17 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/templates/pkg/container-bin-image b/templates/pkg/container-bin-image
@@ -41,5 +41,5 @@ for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps; do
 done
 ./true
 
-touch .install-links
+touch "$pthbs_destdir{{versions}}/$pthbs_package/.install-links"
 {% endblock %}
diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image
@@ -40,4 +40,4 @@ for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps; do
 done
 ./true
 
-touch .install-links
+touch "$pthbs_destdir/home/ccx/versions/$pthbs_package/.install-links"
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -6,7 +6,7 @@
 #+alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4
 #+apk-tools.d0d7af182121c66cd5587b51689275557a37562fa1d20b9137b33a97fa12d152
 #+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9
-#+container-bin-image.7a39935caeb768df8d458d5a367a10d58bf4b744383037d2f2113504eabcc8f9
+#+container-bin-image.b3437f39fd18f2f9bf24f8b4f5b210205c4961c5fe5cca74be283c4b223cf8e6
 #@git:aa69a0fc1c82c14b945b9b7348306a4e82bb0bbc:containers
 
 : ${JOBS:=1}
@@ -57,9 +57,9 @@ for f in '/home/ccx/versions/xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0b
 	ln -sf "$f" "$pkgdir/deps/keys/void/"
 done
 
-test -d '/home/ccx/versions/container-bin-image.7a39935caeb768df8d458d5a367a10d58bf4b744383037d2f2113504eabcc8f9/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.7a39935caeb768df8d458d5a367a10d58bf4b744383037d2f2113504eabcc8f9/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.7a39935caeb768df8d458d5a367a10d58bf4b744383037d2f2113504eabcc8f9/container-bin-image' "$pkgdir/deps/"
+test -d '/home/ccx/versions/container-bin-image.b3437f39fd18f2f9bf24f8b4f5b210205c4961c5fe5cca74be283c4b223cf8e6/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.b3437f39fd18f2f9bf24f8b4f5b210205c4961c5fe5cca74be283c4b223cf8e6/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.b3437f39fd18f2f9bf24f8b4f5b210205c4961c5fe5cca74be283c4b223cf8e6/container-bin-image' "$pkgdir/deps/"
 
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -7,7 +7,7 @@
 #+s6-linux-utils.1990b55837ff2c28a81500d80292c6d530c8516347eb896007eb5aed2af6c425
 #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f
 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.9deddff47b62760719737ab7fb1b0784cbfd933aa71bfa5833cf397a34dd95d8
+#+containers.d0acddc3ddb5acf30bf0ab6056745113e4beaf98c66d6923f2790e439fc3c44f
 #+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9
 #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c
 #+apk-tools.d0d7af182121c66cd5587b51689275557a37562fa1d20b9137b33a97fa12d152
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -21,7 +21,7 @@
 #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.9deddff47b62760719737ab7fb1b0784cbfd933aa71bfa5833cf397a34dd95d8
+#+containers.d0acddc3ddb5acf30bf0ab6056745113e4beaf98c66d6923f2790e439fc3c44f
 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
 #+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -37,8 +37,8 @@
 #+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
 #+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
 #+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
-#+system-config.4a44e2d2d0dd7eba2ed811b92ecb9eef0cb845348234c1986877b7d945ef4ae9
-#+system-config-rc.3293f3a502f57315fb026e509862ce15311718b82c0aa65205dbeba002fae31d
+#+system-config.74382c065c2e9fa53151df4a8263b71c7bbe07168a526d7b2ac2eeb446b886f0
+#+system-config-rc.88b36ee0ee65b852e9237ea765927611a3d66f466bd1185435bdccdfdffaed81
 #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.c205c67a945125f145bb25d893bf27e6fb1f34be52cd058367f9c5d442668c34
+#+system-config-init.fbc330553df02261442610fe2a3ae15bb6026bd6f4fd5c7263a49e9d38ade87f
 #+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309 
\ No newline at end of file
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.78e62266b4b0ed7ab04a2d213af2c6b3ccbf4afa06648676fea2256c96193be0' \
+	'pthbs_path_containers=/home/ccx/versions/env.41610599a2a889fc21ce903e94c6834d57c907a8eba4047af4b7d6b6e8cd15f6' \
 	'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.3293f3a502f57315fb026e509862ce15311718b82c0aa65205dbeba002fae31d
+#+system-config-rc.88b36ee0ee65b852e9237ea765927611a3d66f466bd1185435bdccdfdffaed81
 
-s6rcdb=/home/ccx/versions/system-config-rc.3293f3a502f57315fb026e509862ce15311718b82c0aa65205dbeba002fae31d/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.88b36ee0ee65b852e9237ea765927611a3d66f466bd1185435bdccdfdffaed81/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.4a44e2d2d0dd7eba2ed811b92ecb9eef0cb845348234c1986877b7d945ef4ae9
+#+system-config.74382c065c2e9fa53151df4a8263b71c7bbe07168a526d7b2ac2eeb446b886f0
 
 def_prefix() {
 	prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
 }
 def_dest
 
-src=/home/ccx/versions/system-config.4a44e2d2d0dd7eba2ed811b92ecb9eef0cb845348234c1986877b7d945ef4ae9/config/s6-rc-source
+src=/home/ccx/versions/system-config.74382c065c2e9fa53151df4a8263b71c7bbe07168a526d7b2ac2eeb446b886f0/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
@@ -21,7 +21,7 @@
 #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.9deddff47b62760719737ab7fb1b0784cbfd933aa71bfa5833cf397a34dd95d8
+#+containers.d0acddc3ddb5acf30bf0ab6056745113e4beaf98c66d6923f2790e439fc3c44f
 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
 #+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image
@@ -40,4 +40,4 @@ for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps; do
 done
 ./true
 
-touch .install-links
+touch "$pthbs_destdir/versions/$pthbs_package/.install-links"
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -6,7 +6,7 @@
 #+alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1
 #+apk-tools.20ad2f2e238d23a5eeac3587f85cbe9763bd717a30fb8eb659badd602a556cbf
 #+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473
-#+container-bin-image.29fc17669c4064e26ec40e6634b58ba9121c84307b958daa3dc4913c1d4edbd8
+#+container-bin-image.9940753d4b8b1ded6ae3fe2bf88e232e0aa6f03be16eda3c04385e1c3624d704
 #@git:aa69a0fc1c82c14b945b9b7348306a4e82bb0bbc:containers
 
 : ${JOBS:=1}
@@ -57,9 +57,9 @@ for f in '/versions/xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfa
 	ln -sf "$f" "$pkgdir/deps/keys/void/"
 done
 
-test -d '/versions/container-bin-image.29fc17669c4064e26ec40e6634b58ba9121c84307b958daa3dc4913c1d4edbd8/container-bin-image'
-test -f '/versions/container-bin-image.29fc17669c4064e26ec40e6634b58ba9121c84307b958daa3dc4913c1d4edbd8/container-bin-image/if'
-ln -sf '/versions/container-bin-image.29fc17669c4064e26ec40e6634b58ba9121c84307b958daa3dc4913c1d4edbd8/container-bin-image' "$pkgdir/deps/"
+test -d '/versions/container-bin-image.9940753d4b8b1ded6ae3fe2bf88e232e0aa6f03be16eda3c04385e1c3624d704/container-bin-image'
+test -f '/versions/container-bin-image.9940753d4b8b1ded6ae3fe2bf88e232e0aa6f03be16eda3c04385e1c3624d704/container-bin-image/if'
+ln -sf '/versions/container-bin-image.9940753d4b8b1ded6ae3fe2bf88e232e0aa6f03be16eda3c04385e1c3624d704/container-bin-image' "$pkgdir/deps/"
 
 cd "$pthbs_destdir/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -7,7 +7,7 @@
 #+s6-linux-utils.f7e0654375f11beedafd731ad1dd66c0de8d03452bb8e38bb647cc51cc3adb2e
 #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b
 #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.0cfcdd53e929ffaa55a489ba93f96bb5bbc465f2d6e8a8cd90788f003031e94e
+#+containers.3aa7360ea0b418cc12699046266b44598384324b85500fc7857bcd8c048151b9
 #+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473
 #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137
 #+apk-tools.20ad2f2e238d23a5eeac3587f85cbe9763bd717a30fb8eb659badd602a556cbf
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -21,7 +21,7 @@
 #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
 #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.0cfcdd53e929ffaa55a489ba93f96bb5bbc465f2d6e8a8cd90788f003031e94e
+#+containers.3aa7360ea0b418cc12699046266b44598384324b85500fc7857bcd8c048151b9
 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
 #+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
 #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -37,8 +37,8 @@
 #+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
 #+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
 #+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
-#+system-config.6f1b25ec471cbde10de618d71b6ac15b0184809aa287e361430fb3ed7e2e8d1c
-#+system-config-rc.83eaddd99c36733b78220c3bd41f9ac2e999961d4f95c18f70b3a4000907e6dd
+#+system-config.c457b6ca3f397532dc661661aec3d721b1a0d931f15588eeb32e694aa08b764a
+#+system-config-rc.6504fcf385174b87a33298adac5e260353899f7830ac2f4dacecaceea78425ce
 #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.a687bdccc900ed62d9182d89246e7f4033b676effcfb930024e27c23d379edae
+#+system-config-init.6294f68026de5c510b57f36dd58ea3b99bc2db5b40df0de352e1cdfb75747d09
 #+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f 
\ No newline at end of file
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.551d73b6f91587fe63c19a2fe06dbe76a695366b8b16952ae138d1dfa126a1e4' \
+	'pthbs_path_containers=/versions/env.da14a1cd5056017a3eaab56734b5284c52d631adcfe383f1515ec0436257328b' \
 	'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.83eaddd99c36733b78220c3bd41f9ac2e999961d4f95c18f70b3a4000907e6dd
+#+system-config-rc.6504fcf385174b87a33298adac5e260353899f7830ac2f4dacecaceea78425ce
 
-s6rcdb=/versions/system-config-rc.83eaddd99c36733b78220c3bd41f9ac2e999961d4f95c18f70b3a4000907e6dd/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.6504fcf385174b87a33298adac5e260353899f7830ac2f4dacecaceea78425ce/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.6f1b25ec471cbde10de618d71b6ac15b0184809aa287e361430fb3ed7e2e8d1c
+#+system-config.c457b6ca3f397532dc661661aec3d721b1a0d931f15588eeb32e694aa08b764a
 
 def_prefix() {
 	prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
 }
 def_dest
 
-src=/versions/system-config.6f1b25ec471cbde10de618d71b6ac15b0184809aa287e361430fb3ed7e2e8d1c/config/s6-rc-source
+src=/versions/system-config.c457b6ca3f397532dc661661aec3d721b1a0d931f15588eeb32e694aa08b764a/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
@@ -21,7 +21,7 @@
 #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
 #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.0cfcdd53e929ffaa55a489ba93f96bb5bbc465f2d6e8a8cd90788f003031e94e
+#+containers.3aa7360ea0b418cc12699046266b44598384324b85500fc7857bcd8c048151b9
 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
 #+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
 #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5