commit 0ca699c58e829366676248a1bcddc11143813fd4
parent e64f2137c85f2605f3d56e4e7e4acd8720fd1b51
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Fri, 10 Oct 2025 13:44:03 +0000
fix modules path
Diffstat:
11 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/templates/linux b/templates/linux
@@ -55,7 +55,7 @@ mv Documentation/* "${dest}/doc/linux"
INSTALL_DTBS_PATH="${dest}/boot/dtbs"
# remove dangling symlinks
-module_dir="${dest}/kernel/lib/{{ assertion(patch_version|default(tarball_version + ".0", True)) }}"
+module_dir="${dest}/kernel/lib/modules/{{ assertion(patch_version|default(tarball_version + ".0", True)) }}"
rm -f "$module_dir/build" "$module_dir/source"
ls -lhA "$module_dir"
diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils
@@ -1,5 +1,5 @@
#!/usr/bin/env pthbs-build
-#+linux.3eba6bc4e52372c395d9bc6bbbbf2fece7b271eda1f7ed261a52ad8f86efb8ea
+#+linux.e80cbb0096f9264f14472f7da979ea1606969974efcaf3a3dfc3aac555556dc0
#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510
#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0
#+busybox.95e47e8860cf7e55e06683c45e714cb5157f2b5586b90532ad0696266b0565b1
@@ -17,7 +17,7 @@ export CFLAGS="-D_GNU_SOURCE"
export LDFLAGS="-static"
# TODO: indirection via deps directory/symlink
cat >>.config <<EOF
-CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.3eba6bc4e52372c395d9bc6bbbbf2fece7b271eda1f7ed261a52ad8f86efb8ea"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.e80cbb0096f9264f14472f7da979ea1606969974efcaf3a3dfc3aac555556dc0"
EOF
diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment
@@ -1,3 +1,3 @@
#!/usr/bin/env pthbs-build
-#+linux.3eba6bc4e52372c395d9bc6bbbbf2fece7b271eda1f7ed261a52ad8f86efb8ea
-#+busybox.c679be76b7c551234ae8ebb2809b7bb99bba6710950ffdb433211e7dba119848-
\ No newline at end of file
+#+linux.e80cbb0096f9264f14472f7da979ea1606969974efcaf3a3dfc3aac555556dc0
+#+busybox.5fd749cdb7c9efdafe6fc855a40d750a80dd8b5960b536b2c05ab74decf05aa8+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -51,7 +51,7 @@ mv Documentation/* "${dest}/doc/linux"
INSTALL_DTBS_PATH="${dest}/boot/dtbs"
# remove dangling symlinks
-module_dir="${dest}/kernel/lib/6.1.34"
+module_dir="${dest}/kernel/lib/modules/6.1.34"
rm -f "$module_dir/build" "$module_dir/source"
ls -lhA "$module_dir"
diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest
@@ -49,7 +49,7 @@ mv Documentation/* "${dest}/doc/linux"
INSTALL_DTBS_PATH="${dest}/boot/dtbs"
# remove dangling symlinks
-module_dir="${dest}/kernel/lib/6.15.0"
+module_dir="${dest}/kernel/lib/modules/6.15.0"
rm -f "$module_dir/build" "$module_dir/source"
ls -lhA "$module_dir"
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.c156c96149205b96ff7504abab5501e8e662fcfa90cced740997fa89b7c70e57-
\ No newline at end of file
+#+linux-qemu-guest.36cfee12fea97968a1d9c1c175bb9f1e7b8f581152023cb67dabf1a4a059958a+
\ No newline at end of file
diff --git a/variants/root-x86_64/busybox:modutils b/variants/root-x86_64/busybox:modutils
@@ -1,5 +1,5 @@
#!/usr/bin/env pthbs-build
-#+linux.45161781077d30cfbe18c61380fb4045e2e8286b7d4992b0fca37299a18b1168
+#+linux.91b88f19e87347c2337c06eadfd19e044d5c60031daa78a96ca76bd1f8c66c80
#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f
#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15
#+busybox.2526c34c97fd930f1ab4798292308fa8f146dbdaca63c001cd94b6293991c621
@@ -17,7 +17,7 @@ export CFLAGS="-D_GNU_SOURCE"
export LDFLAGS="-static"
# TODO: indirection via deps directory/symlink
cat >>.config <<EOF
-CONFIG_DEFAULT_MODULES_DIR="/versions/linux.45161781077d30cfbe18c61380fb4045e2e8286b7d4992b0fca37299a18b1168"
+CONFIG_DEFAULT_MODULES_DIR="/versions/linux.91b88f19e87347c2337c06eadfd19e044d5c60031daa78a96ca76bd1f8c66c80"
EOF
diff --git a/variants/root-x86_64/kernel.environment b/variants/root-x86_64/kernel.environment
@@ -1,3 +1,3 @@
#!/usr/bin/env pthbs-build
-#+linux.45161781077d30cfbe18c61380fb4045e2e8286b7d4992b0fca37299a18b1168
-#+busybox.4bd4b9efcfa10dc6ac0d738e9cefc793bf279027b74a22a07c73449636207988-
\ No newline at end of file
+#+linux.91b88f19e87347c2337c06eadfd19e044d5c60031daa78a96ca76bd1f8c66c80
+#+busybox.6df6468b96993aa14960733342c4f0d3b4f3e52421380d4c847e65c23a6e89ef+
\ No newline at end of file
diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux
@@ -51,7 +51,7 @@ mv Documentation/* "${dest}/doc/linux"
INSTALL_DTBS_PATH="${dest}/boot/dtbs"
# remove dangling symlinks
-module_dir="${dest}/kernel/lib/6.1.34"
+module_dir="${dest}/kernel/lib/modules/6.1.34"
rm -f "$module_dir/build" "$module_dir/source"
ls -lhA "$module_dir"
diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest
@@ -49,7 +49,7 @@ mv Documentation/* "${dest}/doc/linux"
INSTALL_DTBS_PATH="${dest}/boot/dtbs"
# remove dangling symlinks
-module_dir="${dest}/kernel/lib/6.15.0"
+module_dir="${dest}/kernel/lib/modules/6.15.0"
rm -f "$module_dir/build" "$module_dir/source"
ls -lhA "$module_dir"
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.caa1cab665f8d4dfa804bcf99c08751b4a4e23f81eac84a637a82ebab920bce7-
\ No newline at end of file
+#+linux-qemu-guest.870ad543b26f1b45664ef4f351470f201ac06eca73061c226f370c54f22241c6+
\ No newline at end of file
