commit ac41f7f3bde704674fc73761854c1315e25bc744
parent 8e0517e493c28f2ce015230445399287b72c07c6
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sun, 4 May 2025 00:33:38 +0000
container-bin-image
Diffstat:
17 files changed, 57 insertions(+), 33 deletions(-)
diff --git a/templates/pkg/container-bin-image b/templates/pkg/container-bin-image
@@ -7,6 +7,7 @@
mkdir -p "$pthbs_destdir{{versions}}/$pthbs_package/container-bin-image"
cd "$pthbs_destdir{{versions}}/$pthbs_package/container-bin-image"
+# first commands without argv0 aliases
for cmd in "${PATH%%:*}"/*; do
rp=$(realpath "$cmd")
base=$(basename "$rp")
@@ -16,7 +17,14 @@ for cmd in "${PATH%%:*}"/*; do
exit 1
fi
cp -p "$rp" ./
- else
+ fi
+done
+
+# now alias using symlinks
+for cmd in "${PATH%%:*}"/*; do
+ rp=$(realpath "$cmd")
+ base=$(basename "$rp")
+ if ! test $base = "${cmd##*/}"; then
if ! test -f "./$base"; then
cp -p "$rp" ./
fi
diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image
@@ -6,6 +6,7 @@
mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image"
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image"
+# first commands without argv0 aliases
for cmd in "${PATH%%:*}"/*; do
rp=$(realpath "$cmd")
base=$(basename "$rp")
@@ -15,7 +16,14 @@ for cmd in "${PATH%%:*}"/*; do
exit 1
fi
cp -p "$rp" ./
- else
+ fi
+done
+
+# now alias using symlinks
+for cmd in "${PATH%%:*}"/*; do
+ rp=$(realpath "$cmd")
+ base=$(basename "$rp")
+ if ! test $base = "${cmd##*/}"; then
if ! test -f "./$base"; then
cp -p "$rp" ./
fi
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.8e8f807307ff4f17efbf98ecd3504c7fee47d2662a83513e1d961f24bf238a2b
+#+container-bin-image.8dcfc20017b3f29a5b8963334128895ea1628020ec40984a9e87ced1ef65d27c
#@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.8e8f807307ff4f17efbf98ecd3504c7fee47d2662a83513e1d961f24bf238a2b/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.8e8f807307ff4f17efbf98ecd3504c7fee47d2662a83513e1d961f24bf238a2b/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.8e8f807307ff4f17efbf98ecd3504c7fee47d2662a83513e1d961f24bf238a2b/container-bin-image' "$pkgdir/deps/"
+test -d '/home/ccx/versions/container-bin-image.8dcfc20017b3f29a5b8963334128895ea1628020ec40984a9e87ced1ef65d27c/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.8dcfc20017b3f29a5b8963334128895ea1628020ec40984a9e87ced1ef65d27c/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.8dcfc20017b3f29a5b8963334128895ea1628020ec40984a9e87ced1ef65d27c/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.f9a86d8819941472e57bc5ab61d81d562baff1c20945e2f96084b8a00488e1ef
+#+containers.f780f956517ee1ead1de64b3962e0783fd541d9727ed9c5b77d3031c13a576d7
#+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.f9a86d8819941472e57bc5ab61d81d562baff1c20945e2f96084b8a00488e1ef
+#+containers.f780f956517ee1ead1de64b3962e0783fd541d9727ed9c5b77d3031c13a576d7
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -37,8 +37,8 @@
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
-#+system-config.719016323f43f36688417752430e26d390700dd5fe85b702cd1a478188621019
-#+system-config-rc.0a0c1339ad15c7203d544692081dd0776e99c8088ac0a52875dcf41c865ae2af
+#+system-config.eec042ce4ee896d322f9492f3d4ac4c1c30d1b67aa653503e091b38a2de26259
+#+system-config-rc.01d65e3d5bc31008c497ead4405ac82bfa7f9d239cfd1605c7fa6bc428ecf7a6
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.b715b3f0ce50a8536ce308c1da7e69605f5478349f6792da6d29498dcad7d5b8
+#+system-config-init.da092fed6c3a06189cc2abcc2d29494a928ed84704ddaf270f6cde517e1883ee
#+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.22d9d4341fb06dbf0295f6346e4de22bce4cd7cdf649cd41f1d3ac58944f0685' \
+ 'pthbs_path_containers=/home/ccx/versions/env.128f4ee87c1fe46006fed0536e6d5ca6979e94d509959e2d8bb7f582ae1d5e2b' \
'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.0a0c1339ad15c7203d544692081dd0776e99c8088ac0a52875dcf41c865ae2af
+#+system-config-rc.01d65e3d5bc31008c497ead4405ac82bfa7f9d239cfd1605c7fa6bc428ecf7a6
-s6rcdb=/home/ccx/versions/system-config-rc.0a0c1339ad15c7203d544692081dd0776e99c8088ac0a52875dcf41c865ae2af/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.01d65e3d5bc31008c497ead4405ac82bfa7f9d239cfd1605c7fa6bc428ecf7a6/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.719016323f43f36688417752430e26d390700dd5fe85b702cd1a478188621019
+#+system-config.eec042ce4ee896d322f9492f3d4ac4c1c30d1b67aa653503e091b38a2de26259
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.719016323f43f36688417752430e26d390700dd5fe85b702cd1a478188621019/config/s6-rc-source
+src=/home/ccx/versions/system-config.eec042ce4ee896d322f9492f3d4ac4c1c30d1b67aa653503e091b38a2de26259/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.f9a86d8819941472e57bc5ab61d81d562baff1c20945e2f96084b8a00488e1ef
+#+containers.f780f956517ee1ead1de64b3962e0783fd541d9727ed9c5b77d3031c13a576d7
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image
@@ -6,6 +6,7 @@
mkdir -p "$pthbs_destdir/versions/$pthbs_package/container-bin-image"
cd "$pthbs_destdir/versions/$pthbs_package/container-bin-image"
+# first commands without argv0 aliases
for cmd in "${PATH%%:*}"/*; do
rp=$(realpath "$cmd")
base=$(basename "$rp")
@@ -15,7 +16,14 @@ for cmd in "${PATH%%:*}"/*; do
exit 1
fi
cp -p "$rp" ./
- else
+ fi
+done
+
+# now alias using symlinks
+for cmd in "${PATH%%:*}"/*; do
+ rp=$(realpath "$cmd")
+ base=$(basename "$rp")
+ if ! test $base = "${cmd##*/}"; then
if ! test -f "./$base"; then
cp -p "$rp" ./
fi
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.f9936babbe17e7af2f58236a17e4ead746ebcc319a9d931471013a0c4d602b65
+#+container-bin-image.91753ee14b4db63a9d44e6c08506019dba08975af438a8fc5dd5ccfb1eb674d0
#@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.f9936babbe17e7af2f58236a17e4ead746ebcc319a9d931471013a0c4d602b65/container-bin-image'
-test -f '/versions/container-bin-image.f9936babbe17e7af2f58236a17e4ead746ebcc319a9d931471013a0c4d602b65/container-bin-image/if'
-ln -sf '/versions/container-bin-image.f9936babbe17e7af2f58236a17e4ead746ebcc319a9d931471013a0c4d602b65/container-bin-image' "$pkgdir/deps/"
+test -d '/versions/container-bin-image.91753ee14b4db63a9d44e6c08506019dba08975af438a8fc5dd5ccfb1eb674d0/container-bin-image'
+test -f '/versions/container-bin-image.91753ee14b4db63a9d44e6c08506019dba08975af438a8fc5dd5ccfb1eb674d0/container-bin-image/if'
+ln -sf '/versions/container-bin-image.91753ee14b4db63a9d44e6c08506019dba08975af438a8fc5dd5ccfb1eb674d0/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.55df653b8ba0c6c18d136900d5c950aad6d150a8ab1e98a6c265a47a60c2be67
+#+containers.a6d456d2db76c6a96283afc7efa9079b9389d744640d586c617b87a874e4232e
#+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.55df653b8ba0c6c18d136900d5c950aad6d150a8ab1e98a6c265a47a60c2be67
+#+containers.a6d456d2db76c6a96283afc7efa9079b9389d744640d586c617b87a874e4232e
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -37,8 +37,8 @@
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
-#+system-config.518cf3b714829209eb3d9bc4a624160a69412f9874d67a04cb439d22d6b74062
-#+system-config-rc.0783f61c51dcdfb6e7d9edb5b4c1de0fbd066dd004f2c892d8fedac7c8e2c8df
+#+system-config.989fa6f48f0fc15edc45d0310a9c596c4a5fad1476cb75225f7b5b7918da3930
+#+system-config-rc.e6e773098aefe66654af54d83319e2d4c061900cfe727b97e1f00f6b12db9eae
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.cbb5901808f0054a3e228954db2c23c0157d6e63887c6aabf784b6ed3eb51228
+#+system-config-init.944129dfb8be843518ef328658f05453ae0d3461570e6b62ad6825b6bea85274
#+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.cfbf3316d157a87fb6d6c4fa289127b0bb59f477e241ac7ccf2f3c34bdc5a786' \
+ 'pthbs_path_containers=/versions/env.08852de27934937e63e64e7f671cb674ca3bec7607499fc5708aa4c81a5a1894' \
'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.0783f61c51dcdfb6e7d9edb5b4c1de0fbd066dd004f2c892d8fedac7c8e2c8df
+#+system-config-rc.e6e773098aefe66654af54d83319e2d4c061900cfe727b97e1f00f6b12db9eae
-s6rcdb=/versions/system-config-rc.0783f61c51dcdfb6e7d9edb5b4c1de0fbd066dd004f2c892d8fedac7c8e2c8df/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.e6e773098aefe66654af54d83319e2d4c061900cfe727b97e1f00f6b12db9eae/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.518cf3b714829209eb3d9bc4a624160a69412f9874d67a04cb439d22d6b74062
+#+system-config.989fa6f48f0fc15edc45d0310a9c596c4a5fad1476cb75225f7b5b7918da3930
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.518cf3b714829209eb3d9bc4a624160a69412f9874d67a04cb439d22d6b74062/config/s6-rc-source
+src=/versions/system-config.989fa6f48f0fc15edc45d0310a9c596c4a5fad1476cb75225f7b5b7918da3930/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.55df653b8ba0c6c18d136900d5c950aad6d150a8ab1e98a6c265a47a60c2be67
+#+containers.a6d456d2db76c6a96283afc7efa9079b9389d744640d586c617b87a874e4232e
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
