UBUNTU: [Packaging] override KERNELRELEASE instead of KERNELVERSION
It is wrong to override KERNELVERSION, as doing so does not ensure the expected KERNELRELEASE. KERNELRELEASE is the essential part and must agree with debian/control because it results in the 'uname -r' in the compiled kernel. scripts/setlocalversion may append additional strings depending on CONFIG options and localversion* files. For example, if there exists 'localversion' file in the top directory, scripts/setlocalversion will append a string written in it. This must not happen. Debian kernel [1] and the upstream kernel [2] correctly override KERNELRELEASE. Let's fix Ubuntu kernel now. [1]: https://salsa.debian.org/kernel-team/linux/-/blob/debian/6.5.10-1/debian/rules.real#L141 [2]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/scripts/package/debian/rules?id=v6.7-rc3#n18 Signed-off-by: Masahiro Yamada <masahiro.yamada@canonical.com> Acked-by: Agathe Porte <agathe.porte@canonical.com> Acked-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> (fixed up subject line as per Emil's comment) Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
This commit is contained in:
committed by
Paolo Pisati
parent
508589c829
commit
9f45e866d3
Vendored
+1
-2
@@ -230,10 +230,9 @@ kmake = make ARCH=$(build_arch) \
|
||||
HOSTCC=$(HOSTCC) \
|
||||
CC=$(CROSS_COMPILE)$(gcc) \
|
||||
BINDGEN=bindgen-0.65 \
|
||||
KERNELVERSION=$(abi_release)-$(target_flavour) \
|
||||
KERNELRELEASE=$(abi_release)-$(target_flavour) \
|
||||
CONFIG_DEBUG_SECTION_MISMATCH=y \
|
||||
KBUILD_BUILD_VERSION="$(uploadnum)" \
|
||||
LOCALVERSION= localver-extra= \
|
||||
CFLAGS_MODULE="-DPKG_ABI=$(abinum)" \
|
||||
PYTHON=$(PYTHON)
|
||||
ifneq ($(LOCAL_ENV_CC),)
|
||||
|
||||
Reference in New Issue
Block a user