diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2023-03-13 05:07:27 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2023-03-15 15:15:07 +0900 |
| commit | 7a531c21f83d7c62825d00bee3a76c1ccfb5de9f (patch) | |
| tree | c96a175a48f4cc212b43d4a3ce72b30e3bfd9990 /scripts/package | |
| parent | 2fd6c4553c962ec7ea8a60c0a3632c7e984800f0 (diff) | |
| download | linux-stable-7a531c21f83d7c62825d00bee3a76c1ccfb5de9f.tar.gz linux-stable-7a531c21f83d7c62825d00bee3a76c1ccfb5de9f.tar.bz2 linux-stable-7a531c21f83d7c62825d00bee3a76c1ccfb5de9f.zip | |
kbuild: deb-pkg: do not take KERNELRELEASE from the source version
KERNELRELEASE does not need to match the package version in changelog.
Rather, it conventially matches what is called 'ABINAME', which is a
part of the binary package names.
Both are the same by default, but the former might be overridden by
KDEB_PKGVERSION. In this case, the resulting package would not boot
because /lib/modules/$(uname -r) does not point the module directory.
Partially revert 3ab18a625ce4 ("kbuild: deb-pkg: improve the usability
of source package").
Reported-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Fixes: 3ab18a625ce4 ("kbuild: deb-pkg: improve the usability of source package")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Tested-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Diffstat (limited to 'scripts/package')
| -rwxr-xr-x | scripts/package/deb-build-option | 9 | ||||
| -rwxr-xr-x | scripts/package/mkdebian | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/package/deb-build-option b/scripts/package/deb-build-option index b079b0d121d4..bd53624318f2 100755 --- a/scripts/package/deb-build-option +++ b/scripts/package/deb-build-option @@ -8,9 +8,8 @@ if [ -z "${CROSS_COMPILE}${cross_compiling}" -a "${DEB_HOST_ARCH}" != "${DEB_BUI fi version=$(dpkg-parsechangelog -S Version) -version_upstream="${version%-*}" -debian_revision="${version#${version_upstream}}" -debian_revision="${debian_revision#*-}" +debian_revision="${version##*-}" -echo KERNELRELEASE=${version_upstream} -echo KBUILD_BUILD_VERSION=${debian_revision} +if [ "${version}" != "${debian_revision}" ]; then + echo KBUILD_BUILD_VERSION=${debian_revision} +fi diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index c6fbfb9f74ba..31b050368cd0 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -244,6 +244,7 @@ KERNELRELEASE = ${KERNELRELEASE} build-indep: build-arch: \$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} \ + KERNELRELEASE=\$(KERNELRELEASE) \ \$(shell \$(srctree)/scripts/package/deb-build-option) \ olddefconfig all |