commit 8f862cb43593a0e56bdd420de005fdf92a88812a
parent 4e03c19532665c407f4c7ae454dfe43b5afde45f
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Fri, 10 Oct 2025 15:50:50 +0000
pull scriptsetup sources from git
Diffstat:
18 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/templates/pkg/confz b/templates/pkg/confz
@@ -1,3 +1,4 @@
+{%- set pkg_source="git" -%}
{% extends "scriptsetup" %}
{% block genlinks_begin %}
x["./command/confz"]=1
diff --git a/templates/pkg/logincaps b/templates/pkg/logincaps
@@ -1,3 +1,4 @@
+{%- set pkg_source="git" -%}
{% extends "scriptsetup" %}
{% block package_deps -%}
#+{{pkg_install_name("execline")}}
diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz
@@ -3,6 +3,7 @@
#+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45
#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5
#+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435
+#@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
# - build script start -
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -6,7 +6,7 @@
#+s6-portable-utils.1118fd2f6ea4b1390c615802d601bd6803cf4545b03a89bed68e36bc2a13087e
#+s6-linux-utils.84f2d6d918b74fffc508df6cee48ed0f25124bd6c09f12558626d27992174226
#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5
-#+confz.f842f5ba2335e36311d73cb5b4bf42a6eb7c9f24eb8d437baaca8c284cf7872f
+#+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db
#+containers.6d877570baf5004da542dc69de47202df1b3d56f6d406db52120493f5c4c99dd
#+xbps.c800a4acd968f595949056f8a302a1e6ee0d960461318dce06c39a235e39b44b
#+zstd.31469429bdd997f0a7a7eeb7dc4aa44b1e88d15227b1711943b136dc14cf753f
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -20,10 +20,10 @@
#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5
#+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435
#+aat.b33fe3833f8ea46ebdb6900ad58529774beb169b76218ce270e3c975bcbfcd43
-#+confz.f842f5ba2335e36311d73cb5b4bf42a6eb7c9f24eb8d437baaca8c284cf7872f
+#+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db
#+containers.6d877570baf5004da542dc69de47202df1b3d56f6d406db52120493f5c4c99dd
#+fileset.0ae777301ccf18194cb4bb828986672c3b4c225faf5f6a4b9969da5329e0394c
-#+logincaps.85bcfdf5d7b8ef6b556dda8717da286c342d6f52e5a79d32cc84379526b71e32
+#+logincaps.0b57fd55080bdfb254593b6e6cc7e34f4fa19cd1622e9bf3368b75587f9cb1ca
#+snaprep.30e9d122c8a1d12f58d81856dd5a79b72d4785bf30bff0e94b3a0f61e6c22238
#+curl.b77362632ee7e28e099c231bbda3b6220cc0cbc62aece9c63f4957cc3f415284
#+git.01a0c1531eb47cb51bf38a4082a0e16caf7be302d04fa24fde800985f8e37773
@@ -38,8 +38,8 @@
#+user-env.27a0b5452d41afaacb1d76c456caa84d85aff599c39ff32b8db694d2550d5b6d
#+strace.40668df6151b4574b553a5923103e07c6ddb344daca606f04edd0ac48e060d55
#+mlog.a882a51752c5081bd671d7d564ea8b5c4502b93c0951cb77a20aa0238c66bc82
-#+system-config.2f5d86c2fbc240e042a8ab358599254c874d470d56e4a82f86237195cb945af1
-#+system-config-rc.821c4d7eef92a2e9231ec620ed87fc20e0988997cae342b4b7d01d1dc0c109a5
+#+system-config.cbe76f854d76b70d866765b3eaa06ee671da5a0c3179f9b7e1dca34c96c10025
+#+system-config-rc.5977d7982e72d1768dce3394a45a06c7fc2ede602b35c8f1cd0b5a7ab5abd7e3
#+system-config-scripts.3c3ea3f86753f1b0e0927ec2875e5b90f388ba2c1f6ed9b69509ac25a7555da6
-#+system-config-init.5c6ee640778758d9afce8c5e8f350c70f28b9a1a55f90f9cf9646c78c144ea1a
+#+system-config-init.1cd011f71485ef511fec0bb735f6daa2fe5e28e384043a7c1e61f0c55967d4e1
#+system-config-zsh.ca45b9086a867eb594d68b32cb4826f747b819c640cb472a6fd1b649b1a1d760
\ No newline at end of file
diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps
@@ -6,6 +6,7 @@
#+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a
#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510
#+ccx-utils.5d4a03d8fac908bceccbb03c49ab3e893b2cf08384226b326a9f6a062b8693fd
+#@git:52261504e78293b651e73a518834c5c75d0b3bf6:logincaps
# - build script start -
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -14,7 +14,7 @@
#+s6.f852407c0b0743b39e769f67ffcaaabeb17233500699e2219937aed7b9774cc6
#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5
#+system-config-scripts.3c3ea3f86753f1b0e0927ec2875e5b90f388ba2c1f6ed9b69509ac25a7555da6
-#+logincaps.85bcfdf5d7b8ef6b556dda8717da286c342d6f52e5a79d32cc84379526b71e32
+#+logincaps.0b57fd55080bdfb254593b6e6cc7e34f4fa19cd1622e9bf3368b75587f9cb1ca
#@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config
@@ -50,7 +50,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.afb93bb8d4f1fa6247b36a8e669a63894f4034e06b6d99288b0832469d190ab4' \
+ 'pthbs_path_containers=/home/ccx/versions/env.b39c35eb22cfa209d97388e907b4db89d89ce8f946f96edeab408a9445dbcf9c' \
'pthbs_path_mdevd=/home/ccx/versions/env.51ab0c0e64ff93066325f8e4bcab80b46b317ef9b15abe28670e767ec96baca2' \
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
@@ -6,7 +6,7 @@
#+s6-portable-utils.1118fd2f6ea4b1390c615802d601bd6803cf4545b03a89bed68e36bc2a13087e
#+s6-linux-init.a6dbfc71babdb9506c53cad385c613f13a602885c2db0a5db609a86ecc687bac
#+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a
-#+system-config-rc.821c4d7eef92a2e9231ec620ed87fc20e0988997cae342b4b7d01d1dc0c109a5
+#+system-config-rc.5977d7982e72d1768dce3394a45a06c7fc2ede602b35c8f1cd0b5a7ab5abd7e3
# - build script start -
@@ -29,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f
"s6-quote" "$prefix/deps/command/$name"
}
-s6rcdb=/home/ccx/versions/system-config-rc.821c4d7eef92a2e9231ec620ed87fc20e0988997cae342b4b7d01d1dc0c109a5/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.5977d7982e72d1768dce3394a45a06c7fc2ede602b35c8f1cd0b5a7ab5abd7e3/config/s6-rc-db
# Generate init (${dest} must not exist but parent dir does)
mkdir -p "$pthbs_destdir//home/ccx/versions"
diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc
@@ -4,7 +4,7 @@
#+busybox-diffutils.963ce6582575680763337552764b6a3c1be781d9fada1d52aa2d04fadeb229d0
#+s6-rc.4709b0b39ae84f7a1efa984a66237c0f6133cec32466acdf0a139e2ef142f5ee
#+fileset.0ae777301ccf18194cb4bb828986672c3b4c225faf5f6a4b9969da5329e0394c
-#+system-config.2f5d86c2fbc240e042a8ab358599254c874d470d56e4a82f86237195cb945af1
+#+system-config.cbe76f854d76b70d866765b3eaa06ee671da5a0c3179f9b7e1dca34c96c10025
# - build script start -
@@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'system-config-rc'
-src=/home/ccx/versions/system-config.2f5d86c2fbc240e042a8ab358599254c874d470d56e4a82f86237195cb945af1/config/s6-rc-source
+src=/home/ccx/versions/system-config.cbe76f854d76b70d866765b3eaa06ee671da5a0c3179f9b7e1dca34c96c10025/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,10 +20,10 @@
#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5
#+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435
#+aat.b33fe3833f8ea46ebdb6900ad58529774beb169b76218ce270e3c975bcbfcd43
-#+confz.f842f5ba2335e36311d73cb5b4bf42a6eb7c9f24eb8d437baaca8c284cf7872f
+#+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db
#+containers.6d877570baf5004da542dc69de47202df1b3d56f6d406db52120493f5c4c99dd
#+fileset.0ae777301ccf18194cb4bb828986672c3b4c225faf5f6a4b9969da5329e0394c
-#+logincaps.85bcfdf5d7b8ef6b556dda8717da286c342d6f52e5a79d32cc84379526b71e32
+#+logincaps.0b57fd55080bdfb254593b6e6cc7e34f4fa19cd1622e9bf3368b75587f9cb1ca
#+snaprep.30e9d122c8a1d12f58d81856dd5a79b72d4785bf30bff0e94b3a0f61e6c22238
#+curl.b77362632ee7e28e099c231bbda3b6220cc0cbc62aece9c63f4957cc3f415284
#+git.01a0c1531eb47cb51bf38a4082a0e16caf7be302d04fa24fde800985f8e37773
diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz
@@ -3,6 +3,7 @@
#+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d
#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6
#+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0
+#@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
# - build script start -
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -6,7 +6,7 @@
#+s6-portable-utils.f4a82103130cfcc49f440896a006e18566297bd1eaec89689a29869958a3982b
#+s6-linux-utils.825109564ccf0b423888de36d9946db0453a95ffbce5970d994da9007f8a34cd
#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6
-#+confz.6c689831a997a5168324e95a9d953bba7aeb44bda06cf540e3bc5f5ec085344a
+#+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd
#+containers.a62adec44acb4061ad3050cc9cdd412c02607cff5b7401e0c013cdad36ebca6a
#+xbps.7e8a9a3746e363f5897183fa19a00a1ba4230822591552d2769a8771065d2b6f
#+zstd.0c21eeca000c0fc1b714595d83cc5210adfa581edcf45820b95cb5921c46fcc4
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -20,10 +20,10 @@
#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6
#+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0
#+aat.26c64faca6c93aec6a952f93e4084d75104efe6f7c7fe589fdf2b4a2c8e73bd8
-#+confz.6c689831a997a5168324e95a9d953bba7aeb44bda06cf540e3bc5f5ec085344a
+#+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd
#+containers.a62adec44acb4061ad3050cc9cdd412c02607cff5b7401e0c013cdad36ebca6a
#+fileset.9a68fe7ea04ef898f33a980e9f0cb36e4e309c0d2f855b5d979063738432f51b
-#+logincaps.c5239eb8fee45f1ac9a198599e4283abadda94b9af85406542b8653949e4b717
+#+logincaps.a67bba67b1e5e55ab2358bdefb29c0493d16dd72cb05571b87fbc1a215878bca
#+snaprep.faf160dbb290f4b2a5f9b6605820a8f59b9534344c3b3b430c1cdf1a336a8a8f
#+curl.7d12db521501148254cee062ca7489c9381330bb81fcfb28239e7846987a5db8
#+git.f01264e188e8d5c54cf4fce7f662f01ad1b1e8558e305368277e2521f7b6945d
@@ -38,8 +38,8 @@
#+user-env.cdccc52b50fbacaeea62161170c6e3b770fa8dcd6a6e46af363cbbe451f6b5a4
#+strace.f9dbe83d3eaac5f19c4d7b3971928e97af25794472024ea02b4fd20ef5d977c2
#+mlog.7a615a6cd358a942b7d328b13562fc11cb3c82d2933f3de7fa727db87d48e6c2
-#+system-config.8134a338f2777f84a507fd17b680e97783ed2dfe2880c2183f4491bd60f9ec00
-#+system-config-rc.23787933e2aa75ed0079bd772b6e53cd7fcc8165b063005c990cf7601a0ef65b
+#+system-config.b4dc2d22a5c8915d96884d791dd47f1a4ad2d323efed0db5b55bfbb0d84049a5
+#+system-config-rc.ca208822f655b41fd9461620ef64976844025c8beb250509990b0b7531f493da
#+system-config-scripts.cbbd7e8b35c682d147057f2cd95a07b8735fe7422d41ed17dd2851d215e38137
-#+system-config-init.0c75317ea8ca5ef948149a687d23399776e8e1d3586858be73692e0155ee1588
+#+system-config-init.4fac27148c81eed89f0dcd8dcb168210d3f41cc608ccbfaebdc1f996511e8a3d
#+system-config-zsh.2395a0ac100619f08b05c21044f60208ef3fcb135a9302047c299e6d7ee2a6b1
\ No newline at end of file
diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps
@@ -6,6 +6,7 @@
#+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab
#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f
#+ccx-utils.020204071392f91013fe10d159d85b96ce1cfcf6b0666afd324594dfefdf3b0a
+#@git:52261504e78293b651e73a518834c5c75d0b3bf6:logincaps
# - build script start -
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -14,7 +14,7 @@
#+s6.e2ee6b1e77f60e714bd5e81d709b65a07b24dbbd9af559918a598ef82523a8c5
#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6
#+system-config-scripts.cbbd7e8b35c682d147057f2cd95a07b8735fe7422d41ed17dd2851d215e38137
-#+logincaps.c5239eb8fee45f1ac9a198599e4283abadda94b9af85406542b8653949e4b717
+#+logincaps.a67bba67b1e5e55ab2358bdefb29c0493d16dd72cb05571b87fbc1a215878bca
#@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config
@@ -50,7 +50,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.d2d935a9033d8c8344b9c0e34d58bfea3be72d8d8cf2ae75e41f18ee14848897' \
+ 'pthbs_path_containers=/versions/env.567631dcea630ee152a317d4fdf18656144d615fb1542847bbacd91131be1da0' \
'pthbs_path_mdevd=/versions/env.5efd9db39293775a765dd3ca79798f1d6d991d82daea54a5bef5fffce4509f66' \
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
@@ -6,7 +6,7 @@
#+s6-portable-utils.f4a82103130cfcc49f440896a006e18566297bd1eaec89689a29869958a3982b
#+s6-linux-init.07931b00ba7cfaca6877d09e985caf229cbd20c34f35b30754a35b9d19762b56
#+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab
-#+system-config-rc.23787933e2aa75ed0079bd772b6e53cd7fcc8165b063005c990cf7601a0ef65b
+#+system-config-rc.ca208822f655b41fd9461620ef64976844025c8beb250509990b0b7531f493da
# - build script start -
@@ -29,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f
"s6-quote" "$prefix/deps/command/$name"
}
-s6rcdb=/versions/system-config-rc.23787933e2aa75ed0079bd772b6e53cd7fcc8165b063005c990cf7601a0ef65b/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.ca208822f655b41fd9461620ef64976844025c8beb250509990b0b7531f493da/config/s6-rc-db
# Generate init (${dest} must not exist but parent dir does)
mkdir -p "$pthbs_destdir//versions"
diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc
@@ -4,7 +4,7 @@
#+busybox-diffutils.38ca9e723dfa24bd5cc2281952ff03c7dd312918a28dc0619b9816a293b5c8f5
#+s6-rc.6785af4c10f0e833235def47f34d88b8ac76fa2116f63d3bff478fb78de38b04
#+fileset.9a68fe7ea04ef898f33a980e9f0cb36e4e309c0d2f855b5d979063738432f51b
-#+system-config.8134a338f2777f84a507fd17b680e97783ed2dfe2880c2183f4491bd60f9ec00
+#+system-config.b4dc2d22a5c8915d96884d791dd47f1a4ad2d323efed0db5b55bfbb0d84049a5
# - build script start -
@@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'system-config-rc'
-src=/versions/system-config.8134a338f2777f84a507fd17b680e97783ed2dfe2880c2183f4491bd60f9ec00/config/s6-rc-source
+src=/versions/system-config.b4dc2d22a5c8915d96884d791dd47f1a4ad2d323efed0db5b55bfbb0d84049a5/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,10 +20,10 @@
#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6
#+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0
#+aat.26c64faca6c93aec6a952f93e4084d75104efe6f7c7fe589fdf2b4a2c8e73bd8
-#+confz.6c689831a997a5168324e95a9d953bba7aeb44bda06cf540e3bc5f5ec085344a
+#+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd
#+containers.a62adec44acb4061ad3050cc9cdd412c02607cff5b7401e0c013cdad36ebca6a
#+fileset.9a68fe7ea04ef898f33a980e9f0cb36e4e309c0d2f855b5d979063738432f51b
-#+logincaps.c5239eb8fee45f1ac9a198599e4283abadda94b9af85406542b8653949e4b717
+#+logincaps.a67bba67b1e5e55ab2358bdefb29c0493d16dd72cb05571b87fbc1a215878bca
#+snaprep.faf160dbb290f4b2a5f9b6605820a8f59b9534344c3b3b430c1cdf1a336a8a8f
#+curl.7d12db521501148254cee062ca7489c9381330bb81fcfb28239e7846987a5db8
#+git.f01264e188e8d5c54cf4fce7f662f01ad1b1e8558e305368277e2521f7b6945d
