buildsys: add explicit DEB_VERSION variable in Makefile

Can be used to generate a package for testing a particular bugfix, or
new version, which can be shared with a small audience, without
reusing the current package version, or bumping to a version that
looks like our released kernels[0].

previously this could be accomplished by setting the PKGREL variable
to the revision and temporary suffix. PKGREL got dropped in:
de18530801 ("bump version to 6.2.16-8")
as each new version we release needs to have a ABI bump anyways (due
to module signing).

[0] e.g. new versions of submodules (ZFS), or packages shared in the
temp-dir of our CDN nodes

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2025-01-22 18:22:49 +01:00 committed by Thomas Lamprecht
parent 7a5e09159f
commit 8f6fe4f2f0
2 changed files with 14 additions and 8 deletions

View File

@ -11,6 +11,7 @@ KREL=1
KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN) KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL) KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)
DEB_VERSION=$(KERNEL_VER)-$(KREL)
EXTRAVERSION=-$(KREL)-pve EXTRAVERSION=-$(KREL)-pve
KVNAME=$(KERNEL_VER)$(EXTRAVERSION) KVNAME=$(KERNEL_VER)$(EXTRAVERSION)
PACKAGE=proxmox-kernel-$(KVNAME) PACKAGE=proxmox-kernel-$(KVNAME)
@ -43,14 +44,14 @@ MODULE_DIRS=$(ZFSDIR)
DIRS=KERNEL_SRC ZFSDIR MODULES DIRS=KERNEL_SRC ZFSDIR MODULES
DSC=proxmox-kernel-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(KREL).dsc DSC=proxmox-kernel-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(KREL).dsc
DST_DEB=$(PACKAGE)_$(KERNEL_VER)-$(KREL)_$(ARCH).deb DST_DEB=$(PACKAGE)_$(DEB_VERSION)_$(ARCH).deb
SIGNED_TEMPLATE_DEB=$(PACKAGE)-signed-template_$(KERNEL_VER)-$(KREL)_$(ARCH).deb SIGNED_TEMPLATE_DEB=$(PACKAGE)-signed-template_$(DEB_VERSION)_$(ARCH).deb
META_DEB=proxmox-kernel-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(KREL)_all.deb META_DEB=proxmox-kernel-$(KERNEL_MAJMIN)_$(DEB_VERSION)_all.deb
HDR_DEB=$(HDRPACKAGE)_$(KERNEL_VER)-$(KREL)_$(ARCH).deb HDR_DEB=$(HDRPACKAGE)_$(DEB_VERSION)_$(ARCH).deb
META_HDR_DEB=proxmox-headers-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(KREL)_all.deb META_HDR_DEB=proxmox-headers-$(KERNEL_MAJMIN)_$(DEB_VERSION)_all.deb
USR_HDR_DEB=proxmox-kernel-libc-dev_$(KERNEL_VER)-$(KREL)_$(ARCH).deb USR_HDR_DEB=proxmox-kernel-libc-dev_$(DEB_VERSION)_$(ARCH).deb
LINUX_TOOLS_DEB=linux-tools-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(KREL)_$(ARCH).deb LINUX_TOOLS_DEB=linux-tools-$(KERNEL_MAJMIN)_$(DEB_VERSION)_$(ARCH).deb
LINUX_TOOLS_DBG_DEB=linux-tools-$(KERNEL_MAJMIN)-dbgsym_$(KERNEL_VER)-$(KREL)_$(ARCH).deb LINUX_TOOLS_DBG_DEB=linux-tools-$(KERNEL_MAJMIN)-dbgsym_$(DEB_VERSION)_$(ARCH).deb
DEBS=$(DST_DEB) $(META_DEB) $(HDR_DEB) $(META_HDR_DEB) $(LINUX_TOOLS_DEB) $(LINUX_TOOLS_DBG_DEB) $(SIGNED_TEMPLATE_DEB) # $(USR_HDR_DEB) DEBS=$(DST_DEB) $(META_DEB) $(HDR_DEB) $(META_HDR_DEB) $(LINUX_TOOLS_DEB) $(LINUX_TOOLS_DBG_DEB) $(SIGNED_TEMPLATE_DEB) # $(USR_HDR_DEB)

5
README
View File

@ -167,6 +167,11 @@ variable in the Makefile, rebuilding the packages and running 'make abiupdate'
(the 'abiupdate' target in 'Makefile' contains the steps for consistently (the 'abiupdate' target in 'Makefile' contains the steps for consistently
updating the repository). updating the repository).
The source package-name is proxmox-kernel-MAJ.MIN, the version of the package
defaults to MAJ.MIN.PATCH-KREL - but this can be adapted to contain a suffix
for test-packages (e.g. ~test01). The version in the Makefile needs to be equal
to the one in debian/changelog.
Watchdog blacklist Watchdog blacklist
------------------ ------------------