Remove kernel release from kernel version
This change removes the kernel release from the full kernel version. This is used by Proxmox to identify differences in the kernel ABI. However, since this project does not track these changes, we remove the kernel release number altogether.
This commit is contained in:
parent
1a5b2830d0
commit
efb8844e8c
2 changed files with 2 additions and 5 deletions
2
debian/rules
vendored
2
debian/rules
vendored
|
@ -62,7 +62,7 @@ override_dh_auto_build:
|
||||||
KCFLAGS="${PVE_KERNEL_CFLAGS}" \
|
KCFLAGS="${PVE_KERNEL_CFLAGS}" \
|
||||||
EXTRAVERSION="${EXTRAVERSION}" \
|
EXTRAVERSION="${EXTRAVERSION}" \
|
||||||
LOCALVERSION="${LOCALVERSION}" \
|
LOCALVERSION="${LOCALVERSION}" \
|
||||||
KBUILD_BUILD_VERSION_TIMESTAMP="${KVNAME} ${PVE_BUILD_PROFILE} (${PKG_DATE})"
|
KBUILD_BUILD_VERSION_TIMESTAMP="PVE Edge ${DEB_VERSION} ${PVE_BUILD_PROFILE} (${PKG_DATE})"
|
||||||
# ZFS
|
# ZFS
|
||||||
dh_auto_configure -D ${ZFS_SRC} -- CC="${PVE_ZFS_CC}" --with-config=kernel --with-linux=$(realpath ${KERNEL_SRC}) --with-linux-obj=$(realpath ${KERNEL_SRC})
|
dh_auto_configure -D ${ZFS_SRC} -- CC="${PVE_ZFS_CC}" --with-config=kernel --with-linux=$(realpath ${KERNEL_SRC}) --with-linux-obj=$(realpath ${KERNEL_SRC})
|
||||||
dh_auto_build -D ${ZFS_SRC}
|
dh_auto_build -D ${ZFS_SRC}
|
||||||
|
|
5
debian/rules.d/common.mk
vendored
5
debian/rules.d/common.mk
vendored
|
@ -2,9 +2,6 @@
|
||||||
KERNEL_MAJMIN=$(shell ./scripts/version.sh -n)
|
KERNEL_MAJMIN=$(shell ./scripts/version.sh -n)
|
||||||
KERNEL_VER=$(shell ./scripts/version.sh -L)
|
KERNEL_VER=$(shell ./scripts/version.sh -L)
|
||||||
|
|
||||||
# Increment KERNEL_RELEASE if the ABI changes (abicheck target in debian/rules)
|
|
||||||
KERNEL_RELEASE=1
|
|
||||||
|
|
||||||
## Debian package information
|
## Debian package information
|
||||||
PKG_RELEASE=$(shell ./scripts/version.sh -r)
|
PKG_RELEASE=$(shell ./scripts/version.sh -r)
|
||||||
PKG_DATE:=$(shell dpkg-parsechangelog -SDate)
|
PKG_DATE:=$(shell dpkg-parsechangelog -SDate)
|
||||||
|
@ -29,7 +26,7 @@ PVE_KERNEL_CC ?= ${CC}
|
||||||
PVE_ZFS_CC ?= ${CC}
|
PVE_ZFS_CC ?= ${CC}
|
||||||
|
|
||||||
### Debian package names
|
### Debian package names
|
||||||
EXTRAVERSION=-${KERNEL_RELEASE}-${PKG_BUILD_FLAVOR}
|
EXTRAVERSION=-${PKG_BUILD_FLAVOR}
|
||||||
KVNAME=${KERNEL_VER}${EXTRAVERSION}
|
KVNAME=${KERNEL_VER}${EXTRAVERSION}
|
||||||
|
|
||||||
PVE_KERNEL_PKG=pve-kernel-${KVNAME}
|
PVE_KERNEL_PKG=pve-kernel-${KVNAME}
|
||||||
|
|
Loading…
Reference in a new issue