[pve-devel] [PATCH kernel-meta 1/3] build: remove dead code

[pve-devel] [PATCH kernel-meta 1/3] build: remove dead code

[Fabian Grünbichler]

these are leftover from when this was built during the kernel build..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 Makefile     | 1 -
 debian/rules | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/Makefile b/Makefile
index cbdacbc..eb0cfb0 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,6 @@ $(BUILD_DIR): debian
 	rm -rf $@ $@.tmp
 	mkdir $@.tmp
 	cp -a debian $@.tmp/
-	cd $@.tmp; debian/rules debian/control
 	echo "git clone git://git.proxmox.com/git/pve-kernel-meta.git\\ngit checkout $(GITVERSION)" > $@.tmp/debian/SOURCE
 	mv $@.tmp $@
 
diff --git a/debian/rules b/debian/rules
index 3dd1bc8..cb304a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-debian/control: $(wildcard debian/*.in)
-	sed -e 's/@KERNEL_ABI@/${KERNEL_ABI}/g' < debian/postrm.in > debian/pve-kernel-${KERNEL_VER}.postrm
-	sed -e 's/@KERNEL_ABI@/${KERNEL_ABI}/g' -e 's/@KERNEL_VER@/${KERNEL_VER}/g' < debian/postinst.in > debian/pve-kernel-${KERNEL_VER}.postinst
-	sed -e 's/@KERNEL_ABI@/${KERNEL_ABI}/g' -e 's/@KERNEL_VER@/${KERNEL_VER}/g' < debian/control.in > debian/control
-
 %:
 	dh $@
 
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH kernel-meta 2/3] rules: add check for kernel version consistency

[Fabian Grünbichler]

postinst and d/control should refer to the same version, fail the build
otherwise. the build failure will be fixed with the next commit.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 debian/rules | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index cb304a5..8bca11a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,16 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
+
+KERNEL_VER=6.17
+
+build: debian/check-no-old-kver.stamp
+
+debian/check-no-old-kver.stamp: debian/control
+	grep "proxmox-kernel-${KERNEL_VER}" debian/control
+	grep "vmlinuz-${KERNEL_VER}" debian/*.postinst
+	touch $@
 
 %:
 	dh $@
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH kernel-meta 3/3] fix #7140: postinst: generate correct 6.17 symlinks

[Fabian Grünbichler]

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 debian/proxmox-default-kernel.postinst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/proxmox-default-kernel.postinst b/debian/proxmox-default-kernel.postinst
index 67f179b..f8ef18a 100755
--- a/debian/proxmox-default-kernel.postinst
+++ b/debian/proxmox-default-kernel.postinst
@@ -7,8 +7,8 @@ case "$1" in
   configure)
     # setup kernel links for installation CD (rescue boot)
     mkdir -p /boot/pve || true
-    ln -sf /boot/pve/vmlinuz-6.14 /boot/pve/vmlinuz || true
-    ln -sf /boot/pve/initrd.img-6.14 /boot/pve/initrd.img || true
+    ln -sf /boot/pve/vmlinuz-6.17 /boot/pve/vmlinuz || true
+    ln -sf /boot/pve/initrd.img-6.17 /boot/pve/initrd.img || true
     ;;
 esac
 
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH kernel-meta 1/3] build: remove dead code

[Thomas Lamprecht]

On Mon, 15 Dec 2025 10:35:12 +0100, Fabian Grünbichler wrote:
> these are leftover from when this was built during the kernel build..
> 
> 

Applied, thanks!

[1/3] build: remove dead code
      commit: 716d612f0c8c8d1777c711fddd2409f9fb57ed43
[2/3] rules: add check for kernel version consistency
      commit: 9eec9c0d9635b2c525bd7846a2d8022ccea8a083
[3/3] fix #7140: postinst: generate correct 6.17 symlinks
      commit: f8b7c413305934ef5eb7d9b09c709de86e4b135b


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel