mrrl

Minimal Reliable Reproducible Linux
git clone https://ccx.te2000.cz/git/mrrl
Log | Files | Refs | Submodules | README

commit 5eeafa25e177ff10ff1f1a3febb73d1dd8a46fc0
parent 937c2badbe347ebd8df91a4bf579152dbaed1414
Author: ccx <ccx@te2000.cz>
Date:   Sun,  2 Nov 2025 13:47:10 +0000

Revert to using default kernel module location

Diffstat:
Mtemplates/pkg/system-config | 2+-
Mvariants/ccx-x86_64/default.environment | 6+++---
Mvariants/ccx-x86_64/system-config | 2+-
Mvariants/ccx-x86_64/system-config-init | 4++--
Mvariants/ccx-x86_64/system-config-rc | 4++--
Mvariants/root-x86_64/default.environment | 6+++---
Mvariants/root-x86_64/system-config | 2+-
Mvariants/root-x86_64/system-config-init | 4++--
Mvariants/root-x86_64/system-config-rc | 4++--
9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/templates/pkg/system-config b/templates/pkg/system-config @@ -20,7 +20,7 @@ #+{{pkg_install_name("zsh")}} #+{{pkg_install_name("system-config-scripts")}} #+{{pkg_install_name("logincaps")}} -#+{{pkg_install_name("busybox:modutils")}} +#+{{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,9 +40,9 @@ #+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339 #+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 -#+system-config.ad610b088401a7133c1449386f11600e6a016ed74abdc751cdf3a245cc121fe6 -#+system-config-rc.a9d498ceec91dcabe7028d7d2f03f25b22a4100c30ffbfc7adc11d7184a3f336 +#+system-config.85b18497c63d417c4ef6c827c477b314bc8161032a21c57b6340cfb5d9d9aa3a +#+system-config-rc.38183756d5943ddd931669373134d7954b79c7830585c84daee3e58cd918911b #+system-config-scripts.6080239044e6d330a6ea9e01625ca9d04971775d95bfc60a336235e0a4b1d743 -#+system-config-init.b964421460a4866e2fa7c403ff3f2e515e1d1cf40bec6ecaa9bb48f1df3bdb18 +#+system-config-init.d33cd532ac2202ff310521a963d1986340cd390b614a58c901c9edb84403a964 #+system-config-zsh.44342c96638209b72ed90af329e3f90445dd1c5f6ca837b3d735833a48d8dd34 #+busybox-modutils.4b75849c60eb1dc2a0435cd9072816ef60dd80565ff6892d1b00cc664656ec87 \ No newline at end of file diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -16,7 +16,7 @@ #+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 #+system-config-scripts.6080239044e6d330a6ea9e01625ca9d04971775d95bfc60a336235e0a4b1d743 #+logincaps.de7defec936b2f4498a2010578eb507abfa6f48d6c51d0b64a9ada67cce50335 -#+busybox.9231d8d9390327e0f99ebfdc49efdab27d0797f0c20f7349981add284eae635c +#+busybox-modutils.4b75849c60eb1dc2a0435cd9072816ef60dd80565ff6892d1b00cc664656ec87 #@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.945ba0fbba6153923f5a761abc154568d30fc1db69b26f03ead9fe248f87d351 #+s6-linux-init.30ee852e07291b5f3c94ed4037e403122037366bcc655a87f5527f1813332d62 #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+system-config-rc.a9d498ceec91dcabe7028d7d2f03f25b22a4100c30ffbfc7adc11d7184a3f336 +#+system-config-rc.38183756d5943ddd931669373134d7954b79c7830585c84daee3e58cd918911b # - build script start - @@ -32,7 +32,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.a9d498ceec91dcabe7028d7d2f03f25b22a4100c30ffbfc7adc11d7184a3f336/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.38183756d5943ddd931669373134d7954b79c7830585c84daee3e58cd918911b/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.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+s6-rc.77ee4f3326027d4463fb531273c8b42b4d8f6fabba2d075e15e18eb2cb2a8c50 #+fileset.c9ce28ff816e023243d76d1bcb4d2b732f6b1f89c0cb9df15c1fd73880896a07 -#+system-config.ad610b088401a7133c1449386f11600e6a016ed74abdc751cdf3a245cc121fe6 +#+system-config.85b18497c63d417c4ef6c827c477b314bc8161032a21c57b6340cfb5d9d9aa3a # - build script start - @@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.ad610b088401a7133c1449386f11600e6a016ed74abdc751cdf3a245cc121fe6/config/s6-rc-source +src=/home/ccx/versions/system-config.85b18497c63d417c4ef6c827c477b314bc8161032a21c57b6340cfb5d9d9aa3a/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,9 +40,9 @@ #+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398 #+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0 #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 -#+system-config.ff02d7d1cabf82754daeb9770c7dabc9a0c0c33d8d508606ea4657f9968782fc -#+system-config-rc.41e53afb56aa4bf9754770b13d26d74aa1d51887934703cf0de6bad161e7a71e +#+system-config.6a7b108b1c4f4d1c71e2d43fceac30f1724e4728968395c0ffae119375b68524 +#+system-config-rc.f195ae3ca842cf1421012883b80b03e2d31c16ea2445a4899365620f1de0eebd #+system-config-scripts.c533391a1fcb035cbc2e4bad71f1dc5c40ed8b2c37d0dcd2cc7929c1dea80b5f -#+system-config-init.52e9e7916bdf7755e2bf39fcd9a22244e3c171c3bad68b4d421a2ed9cbba1985 +#+system-config-init.7fc2b1ce3fcf08657fc7c687eac63f0158adf59ca2d33aa594e59416b2916aa0 #+system-config-zsh.62c3518c0b26bb74a5913e7c6a89e60e0ac9ac138cddde75a74828713d3b7b37 #+busybox-modutils.ebb7b2cc2e280cc5c68f2c7ccd8dd75304de57061e314de8459057fb2b7c0209 \ No newline at end of file diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -16,7 +16,7 @@ #+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 #+system-config-scripts.c533391a1fcb035cbc2e4bad71f1dc5c40ed8b2c37d0dcd2cc7929c1dea80b5f #+logincaps.507ec1380a0988547542ae0ad146daffd92e08ab8faf964323c28f430edcc406 -#+busybox.660c27fd0ce7b80248bee14d25b8f2115c408f87721d4f07a5ac9d5d360b3a56 +#+busybox-modutils.ebb7b2cc2e280cc5c68f2c7ccd8dd75304de57061e314de8459057fb2b7c0209 #@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.07e8ff4d2d45a743ec810d3e27268460d201bafbb0a765756da09179758d4b0d #+s6-linux-init.e17bf07f726729c579bb12c1d25dad4bb263f96509f7ea852bb44d50737d0b4d #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+system-config-rc.41e53afb56aa4bf9754770b13d26d74aa1d51887934703cf0de6bad161e7a71e +#+system-config-rc.f195ae3ca842cf1421012883b80b03e2d31c16ea2445a4899365620f1de0eebd # - build script start - @@ -32,7 +32,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.41e53afb56aa4bf9754770b13d26d74aa1d51887934703cf0de6bad161e7a71e/config/s6-rc-db +s6rcdb=/versions/system-config-rc.f195ae3ca842cf1421012883b80b03e2d31c16ea2445a4899365620f1de0eebd/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.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+s6-rc.9416ba0fe405fc2a019beeee1b35a666324184886c12b89deb929c515ca06183 #+fileset.8d3627d93e7b4c33483589e8602b462d3fcd31d6f38adde5ee53c024197c7286 -#+system-config.ff02d7d1cabf82754daeb9770c7dabc9a0c0c33d8d508606ea4657f9968782fc +#+system-config.6a7b108b1c4f4d1c71e2d43fceac30f1724e4728968395c0ffae119375b68524 # - build script start - @@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.ff02d7d1cabf82754daeb9770c7dabc9a0c0c33d8d508606ea4657f9968782fc/config/s6-rc-source +src=/versions/system-config.6a7b108b1c4f4d1c71e2d43fceac30f1724e4728968395c0ffae119375b68524/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/"