mrrl

commit 18862121a751b0dd442e7accea815034e01a0358
parent 47e2a180fb845f15adbe08a94c7f805435f58312
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Wed,  8 Oct 2025 16:13:52 +0000

Remove dangling symlinks from kernel module directory

Diffstat:
M
commitlist.sha1
 | 
1
-
M
templates/linux
 | 
3
+++
M
variants/ccx-x86_64/kernel.environment
 | 
4
++--
M
variants/ccx-x86_64/linux
 | 
3
+++
M
variants/ccx-x86_64/linux-qemu-guest
 | 
3
+++
M
variants/ccx-x86_64/vm.environment
 | 
4
++--
M
variants/root-x86_64/kernel.environment
 | 
4
++--
M
variants/root-x86_64/linux
 | 
3
+++
M
variants/root-x86_64/linux-qemu-guest
 | 
3
+++
M
variants/root-x86_64/vm.environment
 | 
4
++--

10 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -362,7 +362,6 @@ c6aef8098d37a1773439117a5674bfc8662ef62b  sources/confz
 5d2b98a3c54b6f142b80773e4a18dea3749bfea6  sources/containers
 6f1870365d2a7e410b48f3fe633d6f1b658738ba  sources/containers
 8ec212c9411088ad7e116e330d6a33f68c539678  sources/containers
-9d7df00c7658524d1a576f78cb0571b89b5ed801  sources/containers
 e8dfe8dcb4396ac0f12f0d0017f9836fa113e3a6  sources/containers
 94422be00da71ff44c8ad1fe3455587c62ca29d3  sources/easyseccomp
 02de9565862052afc290b6848b4ebd799d8f9f37  sources/execline
diff --git a/templates/linux b/templates/linux
@@ -43,6 +43,9 @@ mv Documentation/* "$installdir/doc/linux"
 	INSTALL_MOD_STRIP=1 \
 	INSTALL_PATH="$installdir/boot" \
 	INSTALL_DTBS_PATH="$installdir/boot/dtbs"
+# remove dangling symlinks
+module_dir="$installdir/kernel/lib/{{ assertion(patch_version|default(tarball_version + ".0", True)) }}"
+rm -f "$module_dir/build" "$module_dir/source"
 {% endblock %}
 {% block rules %}
 $2 == "boot" { link($0); next }
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.3653fbebe3137ee4e1a0192c7c7a137ddb410240820c603aa38292bcf1afcadd-
\ No newline at end of file
+#+linux.487fada98d36f471116dd5e8e029b4239310732876618890468b93af31461a45+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -38,6 +38,9 @@ mv Documentation/* "$installdir/doc/linux"
 	INSTALL_MOD_STRIP=1 \
 	INSTALL_PATH="$installdir/boot" \
 	INSTALL_DTBS_PATH="$installdir/boot/dtbs"
+# remove dangling symlinks
+module_dir="$installdir/kernel/lib/6.1.34"
+rm -f "$module_dir/build" "$module_dir/source"
 
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest
@@ -36,6 +36,9 @@ mv Documentation/* "$installdir/doc/linux"
 	INSTALL_MOD_STRIP=1 \
 	INSTALL_PATH="$installdir/boot" \
 	INSTALL_DTBS_PATH="$installdir/boot/dtbs"
+# remove dangling symlinks
+module_dir="$installdir/kernel/lib/6.15.0"
+rm -f "$module_dir/build" "$module_dir/source"
 
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
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.f1e8c822b8e7d4989e8f9228ae7b48185c70c4a92a63af456ac0fddd14b5c149-
\ No newline at end of file
+#+linux-qemu-guest.a0ce9d3e0bc85eb9c1ede1abf756225563a1a06a1379282c1e46f9f8e1abdf82+
\ 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.a1916e6a49114f3c7f5ff4dd87fe7c0cd50fa606d1eaecaee2305507104e9a17-
\ No newline at end of file
+#+linux.84104240d6ce9ad78ae47f75295846b8df4c814a92876feecc85b1353fbdf7ab+
\ No newline at end of file
diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux
@@ -38,6 +38,9 @@ mv Documentation/* "$installdir/doc/linux"
 	INSTALL_MOD_STRIP=1 \
 	INSTALL_PATH="$installdir/boot" \
 	INSTALL_DTBS_PATH="$installdir/boot/dtbs"
+# remove dangling symlinks
+module_dir="$installdir/kernel/lib/6.1.34"
+rm -f "$module_dir/build" "$module_dir/source"
 
 cd "$pthbs_destdir/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest
@@ -36,6 +36,9 @@ mv Documentation/* "$installdir/doc/linux"
 	INSTALL_MOD_STRIP=1 \
 	INSTALL_PATH="$installdir/boot" \
 	INSTALL_DTBS_PATH="$installdir/boot/dtbs"
+# remove dangling symlinks
+module_dir="$installdir/kernel/lib/6.15.0"
+rm -f "$module_dir/build" "$module_dir/source"
 
 cd "$pthbs_destdir/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
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.4e28d117609798dc7cbe9bfbff41f1a83daeca3b1c856b00246566b510862f63-
\ No newline at end of file
+#+linux-qemu-guest.53703f06d382fef096f49347dcf90801229243afd71c5afea6850a74ec109bef+
\ No newline at end of file