commit f2ad097e79b4d95d02306030f260b88e0d5b893e
parent 67db2ada19ca26eb599c0f7adbe53228f84c1af7
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Tue, 15 Apr 2025 02:12:28 +0000
update ccx-utils
Diffstat:
17 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -349,6 +349,7 @@ fd0e197d9c746faec8c8854fcfd416964440615d sources/busybox
ffe18087faa553747d68ce662e0d4e9e7265fc3f sources/busybox
8f1f25979665e0aceb70f8af5da81d7a9664313f sources/ccx-utils
c5eed37c744c786076a1ec13132ade7ef410ed16 sources/ccx-utils
+fae441e25a1ac266742ba6446b37ae56c8e57076 sources/ccx-utils
c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz
3b0d0d748309e2c5a2057f5374cb43e8a00647aa sources/containers
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils
@@ -4,7 +4,7 @@
#+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3
#+skalibs.25eb68b4f9146b6b700c824f55528e30c9d34686368d4485ed04b66adbf34c39
#+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e
-#@git:8f1f25979665e0aceb70f8af5da81d7a9664313f:ccx-utils
+#@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils
check_static() {
local exe || true
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -13,4 +13,4 @@
#+alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4
#+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
-#+ccx-utils.10e3efa27e8c554af4ac52fae7b9f7563c16e64864c0b1e4fd5ba8f6423fe4af-
\ No newline at end of file
+#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -1,7 +1,7 @@
-#+system-config.1bcb19610d91e11f003e45fe6019534f9f7efa27b8ddd6e7d0815d4d9c98b196
-#+system-config-rc.e958de7ec5a92da144b6adc4b76585e98979c6b432ca504187eb9694f694c60c
+#+system-config.55f94808f69a30f61b47c720c34f66d0aab106f46ae09ecd6c2be17ca9f6121d
+#+system-config-rc.6090e0982e7abf6b6606930650d136b815ced343e65f4a648c80a614fe40b68e
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.f449b02f144537efb0a3df2ba814eac07932c2d869e7c3ca1d42a42a68c9f57d
+#+system-config-init.4ed703f96d9a9957dfd04fb02f962ca1ecd9b59a2303c9945d03247bfae84805
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
#+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3
#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b
@@ -27,7 +27,7 @@
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
#+containers.24571a2ed64695863d34cdb9b3f7387dedab57d6f19a19bb2d7b9d5b7242d945
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
-#+logincaps.286b5b06430343b96352ecb1b88d1e27f3ee6f9d69b76d0b5d26e527a902b621
+#+logincaps.f9379c249cd9b245d918cd4d6bdd210d392ca51e8f43b04ce2a29f04e0f4902b
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
#+curl.363090b3afccfe46f001c57627d39283abe5cc6a6357ee493bd55f8ab11607ba
#+git.c969489861a9208c195a11e9ec701d8f322e68505dff04cc209453a1f68fa1fc
@@ -38,5 +38,5 @@
#+iconv.e574881283799fa144f1d9df753a05d9f7effa47ae0a06a92b532decde48f145
#+libcap.4b28b26ba2d2086e58476a4629bc9bc939bd7326eae233dd9066fbec00a93aca
#+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514
-#+ccx-utils.10e3efa27e8c554af4ac52fae7b9f7563c16e64864c0b1e4fd5ba8f6423fe4af
+#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
\ No newline at end of file
diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps
@@ -4,7 +4,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f
#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78
-#+ccx-utils.10e3efa27e8c554af4ac52fae7b9f7563c16e64864c0b1e4fd5ba8f6423fe4af
+#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#@git:8c753d77f710d0ecc4f44e0992f060ed47c61c81:logincaps
: ${JOBS:=1}
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -13,7 +13,7 @@
#+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e
#+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+logincaps.286b5b06430343b96352ecb1b88d1e27f3ee6f9d69b76d0b5d26e527a902b621
+#+logincaps.f9379c249cd9b245d918cd4d6bdd210d392ca51e8f43b04ce2a29f04e0f4902b
#@git:0a1466e946de353d1947a4cdb2210b5699c141dd:system-config
def_prefix() {
@@ -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.9b32791e0c44cef828b929e62b28f5e924e4098fccd261e672826053b9803edb' \
+ 'pthbs_path_containers=/home/ccx/versions/env.7461af696cf4c320fc9a0d1d797ecac3dce0e0be6111e8a34bc079280716547c' \
'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.e958de7ec5a92da144b6adc4b76585e98979c6b432ca504187eb9694f694c60c
+#+system-config-rc.6090e0982e7abf6b6606930650d136b815ced343e65f4a648c80a614fe40b68e
-s6rcdb=/home/ccx/versions/system-config-rc.e958de7ec5a92da144b6adc4b76585e98979c6b432ca504187eb9694f694c60c/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.6090e0982e7abf6b6606930650d136b815ced343e65f4a648c80a614fe40b68e/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.1bcb19610d91e11f003e45fe6019534f9f7efa27b8ddd6e7d0815d4d9c98b196
+#+system-config.55f94808f69a30f61b47c720c34f66d0aab106f46ae09ecd6c2be17ca9f6121d
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.1bcb19610d91e11f003e45fe6019534f9f7efa27b8ddd6e7d0815d4d9c98b196/config/s6-rc-source
+src=/home/ccx/versions/system-config.55f94808f69a30f61b47c720c34f66d0aab106f46ae09ecd6c2be17ca9f6121d/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
@@ -22,7 +22,7 @@
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
#+containers.24571a2ed64695863d34cdb9b3f7387dedab57d6f19a19bb2d7b9d5b7242d945
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
-#+logincaps.286b5b06430343b96352ecb1b88d1e27f3ee6f9d69b76d0b5d26e527a902b621
+#+logincaps.f9379c249cd9b245d918cd4d6bdd210d392ca51e8f43b04ce2a29f04e0f4902b
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
#+curl.363090b3afccfe46f001c57627d39283abe5cc6a6357ee493bd55f8ab11607ba
#+git.c969489861a9208c195a11e9ec701d8f322e68505dff04cc209453a1f68fa1fc
@@ -33,5 +33,5 @@
#+iconv.e574881283799fa144f1d9df753a05d9f7effa47ae0a06a92b532decde48f145
#+libcap.4b28b26ba2d2086e58476a4629bc9bc939bd7326eae233dd9066fbec00a93aca
#+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514
-#+ccx-utils.10e3efa27e8c554af4ac52fae7b9f7563c16e64864c0b1e4fd5ba8f6423fe4af
+#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
\ No newline at end of file
diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils
@@ -4,7 +4,7 @@
#+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089
#+skalibs.80095d3b5fc0b02710609d76fd585ca9556056300f83a94e4dc094ee3f53fa86
#+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e
-#@git:8f1f25979665e0aceb70f8af5da81d7a9664313f:ccx-utils
+#@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils
check_static() {
local exe || true
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -13,4 +13,4 @@
#+alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1
#+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
-#+ccx-utils.8a15ff362f7e08a2b390a473962a86e57740eb29faaf42d4b066412c3f21f5db-
\ No newline at end of file
+#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac+
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -1,7 +1,7 @@
-#+system-config.88cb0bd3be3af080c043322154c2f265e8ac27881ded3fdbc6909bcddf02f9a7
-#+system-config-rc.2164db7ea07d1cb2a25be013aa4183533859324afad0b34146ddd9588468309a
+#+system-config.85431dd009068e2c73f36b07f85785f2c831c91b68942fec1400e66faaada686
+#+system-config-rc.37bab16f72b94f41600b7c6dc411477edfb0f81db02affe09df3c8e98f3647c6
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.b9d54c7e22a276026bb7e7053fc02abdb8f55919156724d91b8e8ba41f0908ff
+#+system-config-init.79b5c178326ef49f7f91332144711cfc9bb66ab73ba61191dc483b74812bd6dc
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
#+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089
#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465
@@ -27,7 +27,7 @@
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
#+containers.81f7b1aed1b5f8cd999ff2071678b2f7f10dba18757467855a1eccce5d8a93ab
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
-#+logincaps.ecc2403d9051206f3458dacaaa0a4915b8bc59691be47f21b860cbca7d963fc6
+#+logincaps.f498224a0aba905333935f6ce3f854d4996851d8525ffdc19a08b982d5cd6dae
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
#+curl.77419befc08ac7280bdc98fe2388cde9d88721ec00a30a7f9feb7817610ae58a
#+git.7a4dbe4f09816eab374b3b020321f582a08dce75afaa97f2abeae2a58bcfe0a7
@@ -38,5 +38,5 @@
#+iconv.b537e50837859e5b0fa7cc56ee46ff152c638910b9c817cba957f09631c9aad1
#+libcap.66ba1f95782e8619e1ec2189653a79f3105901a0c25a4ad2ed3694f0bbe292ea
#+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8
-#+ccx-utils.8a15ff362f7e08a2b390a473962a86e57740eb29faaf42d4b066412c3f21f5db
+#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
\ No newline at end of file
diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps
@@ -4,7 +4,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9
#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc
-#+ccx-utils.8a15ff362f7e08a2b390a473962a86e57740eb29faaf42d4b066412c3f21f5db
+#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#@git:8c753d77f710d0ecc4f44e0992f060ed47c61c81:logincaps
: ${JOBS:=1}
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -13,7 +13,7 @@
#+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e
#+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+logincaps.ecc2403d9051206f3458dacaaa0a4915b8bc59691be47f21b860cbca7d963fc6
+#+logincaps.f498224a0aba905333935f6ce3f854d4996851d8525ffdc19a08b982d5cd6dae
#@git:0a1466e946de353d1947a4cdb2210b5699c141dd:system-config
def_prefix() {
@@ -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.4903bb3e1eebf5330816d9b32a1d23e6fa0df7acd6dda56f83119f215bdad068' \
+ 'pthbs_path_containers=/versions/env.0ddf5a745f8e276d9c4e9637ec6acc567a6c5ad313e333336286aeb3b8c13ab9' \
'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.2164db7ea07d1cb2a25be013aa4183533859324afad0b34146ddd9588468309a
+#+system-config-rc.37bab16f72b94f41600b7c6dc411477edfb0f81db02affe09df3c8e98f3647c6
-s6rcdb=/versions/system-config-rc.2164db7ea07d1cb2a25be013aa4183533859324afad0b34146ddd9588468309a/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.37bab16f72b94f41600b7c6dc411477edfb0f81db02affe09df3c8e98f3647c6/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.88cb0bd3be3af080c043322154c2f265e8ac27881ded3fdbc6909bcddf02f9a7
+#+system-config.85431dd009068e2c73f36b07f85785f2c831c91b68942fec1400e66faaada686
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.88cb0bd3be3af080c043322154c2f265e8ac27881ded3fdbc6909bcddf02f9a7/config/s6-rc-source
+src=/versions/system-config.85431dd009068e2c73f36b07f85785f2c831c91b68942fec1400e66faaada686/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
@@ -22,7 +22,7 @@
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
#+containers.81f7b1aed1b5f8cd999ff2071678b2f7f10dba18757467855a1eccce5d8a93ab
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
-#+logincaps.ecc2403d9051206f3458dacaaa0a4915b8bc59691be47f21b860cbca7d963fc6
+#+logincaps.f498224a0aba905333935f6ce3f854d4996851d8525ffdc19a08b982d5cd6dae
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
#+curl.77419befc08ac7280bdc98fe2388cde9d88721ec00a30a7f9feb7817610ae58a
#+git.7a4dbe4f09816eab374b3b020321f582a08dce75afaa97f2abeae2a58bcfe0a7
@@ -33,5 +33,5 @@
#+iconv.b537e50837859e5b0fa7cc56ee46ff152c638910b9c817cba957f09631c9aad1
#+libcap.66ba1f95782e8619e1ec2189653a79f3105901a0c25a4ad2ed3694f0bbe292ea
#+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8
-#+ccx-utils.8a15ff362f7e08a2b390a473962a86e57740eb29faaf42d4b066412c3f21f5db
+#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
\ No newline at end of file
