mrrl

commit 59c03d66acb8e755dbd6d0f5e47cb81a1ab8f5d8
parent aaf4c972d2b7e94fba1a02f21fcd3d65b5e8359b
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Thu, 29 May 2025 13:56:20 +0000

Use correct version during install process

Diffstat:
M
templates/linux
 | 
2
+-
M
variants/ccx-x86_64/linux-qemu-guest
 | 
2
+-
M
variants/ccx-x86_64/vm.environment
 | 
4
++--
M
variants/root-x86_64/linux-qemu-guest
 | 
2
+-
M
variants/root-x86_64/vm.environment
 | 
4
++--

5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/templates/linux b/templates/linux
@@ -47,7 +47,7 @@ mv Documentation/* "$installdir/doc/linux"
 $2 == "boot" { link($0); next }
 {% endblock -%}
 {% block genlinks_begin %}
-	kernel_name="6.1.34"
+	kernel_name="{{ patch_version|default(tarball_version + ".0") }}"
 	x["./boot/vmlinuz"]=1
 	x["./boot/System.map"]=1
 	x["./lib/modules/" kernel_name "/modules.alias"]=1
diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest
@@ -39,7 +39,7 @@ mv Documentation/* "$installdir/doc/linux"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
 BEGIN {
-	kernel_name="6.1.34"
+	kernel_name=""
 	x["./boot/vmlinuz"]=1
 	x["./boot/System.map"]=1
 	x["./lib/modules/" kernel_name "/modules.alias"]=1
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.73b3a66be26bb0c0efa211f1782c4a8d6998a9e8c56176d899512b3336bd1715-
\ No newline at end of file
+#+linux-qemu-guest.bc9de25524008107440dd6c01860bc83e3fb5198100675984047f91156e79cc1+
\ No newline at end of file
diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest
@@ -39,7 +39,7 @@ mv Documentation/* "$installdir/doc/linux"
 cd "$pthbs_destdir/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
 BEGIN {
-	kernel_name="6.1.34"
+	kernel_name=""
 	x["./boot/vmlinuz"]=1
 	x["./boot/System.map"]=1
 	x["./lib/modules/" kernel_name "/modules.alias"]=1
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.55c250a7b6dbfc1b71b4d8f6983502c2a2dc606b50025483996f9e0d719a42bc-
\ No newline at end of file
+#+linux-qemu-guest.986858f3ca3732df51271430bde700c6238ea13c2a9e0f0398e8821c8e306814+
\ No newline at end of file