commit bc659d4f43cee2c940369b45dc2727157d32a312
parent 20a0b1636d883b186dd30838f22873df8252dc00
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Wed, 8 Oct 2025 14:35:21 +0000
Remove busybox modutils, fix module dir symlink
Diffstat:
11 files changed, 20 insertions(+), 40 deletions(-)
diff --git a/filelist.sha256 b/filelist.sha256
@@ -20,7 +20,7 @@ d11f6b21c61b4274e182eb888883a8ba8acdbf820dcc7a6d82a7d9fc2fd2836d files/alpine-d
a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b files/argp-standalone-1.5.0-configure.tar
1d9bd69b7a9a90f27db72629ceb4faaab2aab470103b77b5abd335c6f8bd0f35 files/argv0exec-amd64
8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9 files/argv0exec.c
-e81557d01115c246b88d9138281a6d16e484acb0581d396e6c03b02a378dcc1d files/busybox.config
+85d5bf54c6fdccae84f8a27f10bea1464244065b9426d6c069c4d31c0121dee4 files/busybox.config
955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab files/busybox.config.1_12_0-8342-gaa4d303a3
9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2 files/busybox_bootstrap.config
a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540 files/c_rehash.c
diff --git a/files/busybox.config b/files/busybox.config
@@ -571,32 +571,12 @@ CONFIG_TUNE2FS=y
# Linux Module Utilities
#
# CONFIG_MODPROBE_SMALL is not set
-CONFIG_DEPMOD=y
-CONFIG_INSMOD=y
-CONFIG_LSMOD=y
-CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-CONFIG_MODINFO=y
-CONFIG_MODPROBE=y
-CONFIG_FEATURE_MODPROBE_BLACKLIST=y
-CONFIG_RMMOD=y
-
-#
-# Options common to multiple modutils
-#
-CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
-CONFIG_FEATURE_MODUTILS_ALIAS=y
-CONFIG_FEATURE_MODUTILS_SYMBOLS=y
-CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+CONFIG_DEPMOD=n
+CONFIG_INSMOD=n
+CONFIG_LSMOD=n
+CONFIG_MODINFO=n
+CONFIG_MODPROBE=n
+CONFIG_RMMOD=n
#
# Linux System Utilities
diff --git a/templates/linux b/templates/linux
@@ -51,7 +51,7 @@ function mod_path(s) {
sub("^[.]/kernel/lib/", "./kernel/", s)
return s
}
-$2 == "kernel" && $2 == "lib" && $3 == "modules" { link(mod_path($0)) }
+$2 == "kernel" && $3 == "lib" && $4 == "modules" { link(mod_path($0)) }
{% endblock -%}
{% block genlinks_begin %}
kernel_name="{{ assertion(patch_version|default(tarball_version + ".0", True)) }}"
diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment
@@ -1,2 +1,2 @@
#!/usr/bin/env pthbs-build
-#+linux.c7eaebc2133d424c056431c3d26b6107c290e1870986dc4a47df63bd1affe87e-
\ No newline at end of file
+#+linux.316ab5d21dd88bdaaa2315cb6107c0bbf3fb29f4a4e6433831763f10a7ecf72d+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -74,7 +74,7 @@ function mod_path(s) {
sub("^[.]/kernel/lib/", "./kernel/", s)
return s
}
-$2 == "kernel" && $2 == "lib" && $3 == "modules" { link(mod_path($0)) }
+$2 == "kernel" && $3 == "lib" && $4 == "modules" { link(mod_path($0)) }
$2 == "command" { link($0); next }
$2 == "bin" { link(s1("command", $0)); next }
diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest
@@ -72,7 +72,7 @@ function mod_path(s) {
sub("^[.]/kernel/lib/", "./kernel/", s)
return s
}
-$2 == "kernel" && $2 == "lib" && $3 == "modules" { link(mod_path($0)) }
+$2 == "kernel" && $3 == "lib" && $4 == "modules" { link(mod_path($0)) }
$2 == "command" { link($0); next }
$2 == "bin" { link(s1("command", $0)); next }
diff --git a/variants/ccx-x86_64/vm.environment b/variants/ccx-x86_64/vm.environment
@@ -1,2 +1,2 @@
#!/usr/bin/env pthbs-build
-#+linux-qemu-guest.0b8db497da90cc37ffc37f8adc5357be4b3a94af0491054aa111ec4a4625a302-
\ No newline at end of file
+#+linux-qemu-guest.96e9b54283c8456f22be331b3c2bbca900821789cd2e10b01120ee9ac1e3c1ff+
\ No newline at end of file
diff --git a/variants/root-x86_64/kernel.environment b/variants/root-x86_64/kernel.environment
@@ -1,2 +1,2 @@
#!/usr/bin/env pthbs-build
-#+linux.e9af280c07ccd11a4bd9bc60e317fd0a915426802d29f7fe29aef4c587e658cf-
\ No newline at end of file
+#+linux.eb87ad2f72f0f12eb6755fadce11a38794af80c4287992b4715209193cc20928+
\ No newline at end of file
diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux
@@ -74,7 +74,7 @@ function mod_path(s) {
sub("^[.]/kernel/lib/", "./kernel/", s)
return s
}
-$2 == "kernel" && $2 == "lib" && $3 == "modules" { link(mod_path($0)) }
+$2 == "kernel" && $3 == "lib" && $4 == "modules" { link(mod_path($0)) }
$2 == "command" { link($0); next }
$2 == "bin" { link(s1("command", $0)); next }
diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest
@@ -72,7 +72,7 @@ function mod_path(s) {
sub("^[.]/kernel/lib/", "./kernel/", s)
return s
}
-$2 == "kernel" && $2 == "lib" && $3 == "modules" { link(mod_path($0)) }
+$2 == "kernel" && $3 == "lib" && $4 == "modules" { link(mod_path($0)) }
$2 == "command" { link($0); next }
$2 == "bin" { link(s1("command", $0)); next }
diff --git a/variants/root-x86_64/vm.environment b/variants/root-x86_64/vm.environment
@@ -1,2 +1,2 @@
#!/usr/bin/env pthbs-build
-#+linux-qemu-guest.535f5031e7ac0b6d3c836db891371abc2c25cf51e6abbfd764700c673dd78cb2-
\ No newline at end of file
+#+linux-qemu-guest.a33237fc08eb850190a9e254bfc57a804363aa427b885d865f004f8ae387ed8a+
\ No newline at end of file
