commit 9589262a8476d65460ab91863734cbf563b9c680
parent 3602b2314f9772fb8c11756f415917c5bfb91656
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sun, 12 Oct 2025 12:41:49 +0000
include modutils in system-config
Diffstat:
10 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -2271,7 +2271,6 @@ fe6a7178c290979b822e287014f7c2f93aa0a732 sources/skalibs
ff066bd37e692daadc573fbd3ef622c3f1e8ec6a sources/skalibs
e9d8af262eb5e25536ea9778e3ed57aebb55488c sources/snaprep
0a1466e946de353d1947a4cdb2210b5699c141dd sources/system-config
-cdeb78362ceacd8087b1d04ef26573cb115b7844 sources/system-config
ddb20e067ab184cd18ee8b88d74044dfeeaaad4c sources/system-config
f9d071a4c5870d42d00d0ca496efac527388e6f4 sources/system-config
dc793695cc0632a808af9d4415f3b0cf0f4dfba2 sources/system-config-scripts
diff --git a/templates/pkg/system-config b/templates/pkg/system-config
@@ -20,6 +20,7 @@
#+{{pkg_install_name("zsh")}}
#+{{pkg_install_name("system-config-scripts")}}
#+{{pkg_install_name("logincaps")}}
+#+{{pkg_install_name("busybox:modutils")}}
{% endblock %}
{% block build_and_install -%}
err_notfound() {
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -40,8 +40,8 @@
#+mlog.f6bd339c239d4e1b7bfe5a337a914ecd7b30795063ec94bce2847b8ad825c0b3
#+findutils.acabe096cf8a4c328d4edd1b2d0bc2edf3b5207af56e582f77806ddbbf6dd2c1
#+nawk.7a9a6aeeddfdfce14fd07c84b51c3429fc3de7ef6e37ff73f9dee2ed8299a0c6
-#+system-config.25d77b8e08a997513f1fe9ade4ee66a3593f4b4d61501dd1802d22d9eb5b42ca
-#+system-config-rc.f1a10fd67f766de7098d415d1763963d303405890e5f7f348c550b6990513463
+#+system-config.8a3b6b805729a2f92deb6d7d12f23351f123673efbb8fe1b84b9191daeaa5f62
+#+system-config-rc.5c2dee1067b3c194d04183c10ad02628abaeae2a37d2077b9a45b9281f52e00c
#+system-config-scripts.a54759d4f335bd14d0739a8b91412f1ce5302d65013e587018ec1bcf5363b16a
-#+system-config-init.50300c1e5a0ff583429ec057df98f90fd6a03480e6f42b138673a253ab12c6f3
+#+system-config-init.a52550a9c494a7cf033b78b95a237a843d470d491a312d1fabda4ed1343d1ea7
#+system-config-zsh.3f24324efe84089cac74c52a6324952a793cd304f29ea46e4f28fb00c8c35df7
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -16,6 +16,7 @@
#+zsh.6277c49780ae0b25f96dff77eed5f1611c37839208eeebc6f9e33214076adf9e
#+system-config-scripts.a54759d4f335bd14d0739a8b91412f1ce5302d65013e587018ec1bcf5363b16a
#+logincaps.6fba3875853a621f094d6c4d79428225eb9bb7dde1e801c15e41faf407d96ea6
+#+busybox.cfefa180f012b4a02421bba490d1d82dc7516f72025e2e0828195d2f8a7f2321
#@git:ddb20e067ab184cd18ee8b88d74044dfeeaaad4c:system-config
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -7,7 +7,7 @@
#+s6-portable-utils.5534529a48c31580917b6612a7531e8ef3b638f5423cc7c117f3b071d54051aa
#+s6-linux-init.370b116a128899247e59ff60d4a636090b81361b7abb0ec9b5d0e5aeb567d075
#+execline.e7a749921b4a04631cc69f2189ac67401545d9873cdeb7813aa392e8ebd11558
-#+system-config-rc.f1a10fd67f766de7098d415d1763963d303405890e5f7f348c550b6990513463
+#+system-config-rc.5c2dee1067b3c194d04183c10ad02628abaeae2a37d2077b9a45b9281f52e00c
# - build script start -
@@ -30,7 +30,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.f1a10fd67f766de7098d415d1763963d303405890e5f7f348c550b6990513463/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.5c2dee1067b3c194d04183c10ad02628abaeae2a37d2077b9a45b9281f52e00c/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
@@ -5,7 +5,7 @@
#+busybox-diffutils.1aa76d52d9aa0d4541fde1ed8cac30606ca4ec9985ce43454ffc7cd60ab1a0be
#+s6-rc.0d683e0fe121aed629c65833a03a2060db1cc6ed0028fe4f1b28ee6380867a68
#+fileset.ef68ca573cfec23b65e7ed7447d08f037147067bbb24f17c3e33a6db8423c8a1
-#+system-config.25d77b8e08a997513f1fe9ade4ee66a3593f4b4d61501dd1802d22d9eb5b42ca
+#+system-config.8a3b6b805729a2f92deb6d7d12f23351f123673efbb8fe1b84b9191daeaa5f62
# - build script start -
@@ -14,7 +14,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'system-config-rc'
-src=/home/ccx/versions/system-config.25d77b8e08a997513f1fe9ade4ee66a3593f4b4d61501dd1802d22d9eb5b42ca/config/s6-rc-source
+src=/home/ccx/versions/system-config.8a3b6b805729a2f92deb6d7d12f23351f123673efbb8fe1b84b9191daeaa5f62/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/default.environment b/variants/root-x86_64/default.environment
@@ -40,8 +40,8 @@
#+mlog.ccfb3c3a0ae18af9411bffe67e03b6dee0df9427906bd028635bce7208f9fc8f
#+findutils.dece147f2921d0477c8aec1d431a3b18e1198e7ad81b06b51368f561ee311e4b
#+nawk.6f65756dfd9fd32f6b702d0659871036b39b90591b8c8f739874371552169a73
-#+system-config.d9c5048f3ad1c86cc2a742cf763dbc6419c325b4dafde8ace7fd724913db7873
-#+system-config-rc.e766d50df3c54298f9bb61c0f11e1f6b8b1a8c3af2edddac48b0f67ec79fe430
+#+system-config.5aab04c62c5f380a071c1b891e333fddf57b5c65f098cd6ffd8285d367f61c56
+#+system-config-rc.50bf5144c0a1c56312836bbea7c244331c553b99cc5abab9548b21673eb3c66d
#+system-config-scripts.5ade8006267d5dd6f2fa7be80dc04f8396ed6e6da6abd1d23eaaee1f237ba341
-#+system-config-init.99dda35705c144271ae38fb9ed5ec0ad8df0d5b5b6d5f47848eda96f04e22ffa
+#+system-config-init.e98eeb06c526f3130b0cd057b0dd4b38afca079f460214b28c52a863a1a5ca0c
#+system-config-zsh.2f424f7007ce63719a484ba88a797dba7ae43a63408eb4ebd0dc8d7b252fccc1
\ No newline at end of file
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -16,6 +16,7 @@
#+zsh.7c13416fc1ac50a94f56784b0104a517ca6abd5016b3dbdc9c6a426300a42525
#+system-config-scripts.5ade8006267d5dd6f2fa7be80dc04f8396ed6e6da6abd1d23eaaee1f237ba341
#+logincaps.fcfd153059c3379d55362ef644fdf955e7ac46eff367d71764d169759f154b82
+#+busybox.2fc781342919549fb8bcb0f966b3a2d0f3a54f5d8c10f4d03962654d8f766321
#@git:ddb20e067ab184cd18ee8b88d74044dfeeaaad4c:system-config
diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init
@@ -7,7 +7,7 @@
#+s6-portable-utils.2a35e10fc49989ff11cab6f9c8ff1ce2e07000d2ec36296cbc1236f9eb6b6305
#+s6-linux-init.b686a32f757913770efafac4666d1be98cea4a76838f7d79e646dd63ac67d507
#+execline.12affe71ab57cb7af1ded3d020f86f17da85e43f90ba29f285bdc99b4033b709
-#+system-config-rc.e766d50df3c54298f9bb61c0f11e1f6b8b1a8c3af2edddac48b0f67ec79fe430
+#+system-config-rc.50bf5144c0a1c56312836bbea7c244331c553b99cc5abab9548b21673eb3c66d
# - build script start -
@@ -30,7 +30,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.e766d50df3c54298f9bb61c0f11e1f6b8b1a8c3af2edddac48b0f67ec79fe430/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.50bf5144c0a1c56312836bbea7c244331c553b99cc5abab9548b21673eb3c66d/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
@@ -5,7 +5,7 @@
#+busybox-diffutils.7c9e0bee30fb6332bf7fa171c534c15d5d7d4fb0702c8f3cad054b4c34cd52ab
#+s6-rc.55862e01a106b3a786dfdadbca91ae5847fe7858a1b01c2bc1b30251b9d37c0b
#+fileset.1971823cad4993996adf72ab25c1201795c7af2f47abf0fbbbef93f748dcc2aa
-#+system-config.d9c5048f3ad1c86cc2a742cf763dbc6419c325b4dafde8ace7fd724913db7873
+#+system-config.5aab04c62c5f380a071c1b891e333fddf57b5c65f098cd6ffd8285d367f61c56
# - build script start -
@@ -14,7 +14,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'system-config-rc'
-src=/versions/system-config.d9c5048f3ad1c86cc2a742cf763dbc6419c325b4dafde8ace7fd724913db7873/config/s6-rc-source
+src=/versions/system-config.5aab04c62c5f380a071c1b891e333fddf57b5c65f098cd6ffd8285d367f61c56/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
