ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

kbuild: deb-pkg: do not take KERNELRELEASE from the source version

Browse Source 
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 3ab18a625c ("kbuild: deb-pkg: improve the usability
of source package").

Reported-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Fixes: 3ab18a625c ("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>
This commit is contained in:
Masahiro Yamada
2023-03-13 05:07:27 +09:00
parent 2fd6c4553c
commit 7a531c21f8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/package/deb-build-option
View File

@@ -8,9 +8,8 @@ if [ -z "${CROSS_COMPILE}${cross_compiling}" -a "${DEB_HOST_ARCH}" != "${DEB_BUI
fi fi
version=$(dpkg-parsechangelog -S Version) version=$(dpkg-parsechangelog -S Version)
version_upstream="${version%-*}" debian_revision="${version##*-}"
debian_revision="${version#${version_upstream}}"
debian_revision="${debian_revision#*-}"
echo KERNELRELEASE=${version_upstream} if [ "${version}" != "${debian_revision}" ]; then
echo KBUILD_BUILD_VERSION=${debian_revision} echo KBUILD_BUILD_VERSION=${debian_revision}
fi

1
scripts/package/mkdebian
View File

@@ -244,6 +244,7 @@ KERNELRELEASE = ${KERNELRELEASE}
build-indep: build-indep:
build-arch: build-arch:
\$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} \ \$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} \
KERNELRELEASE=\$(KERNELRELEASE) \
\$(shell \$(srctree)/scripts/package/deb-build-option) \ \$(shell \$(srctree)/scripts/package/deb-build-option) \
olddefconfig all olddefconfig all