Commit bbcde0a7 authored Nov 06, 2018 by Masahiro Yamada

kbuild: deb-pkg: fix too low build version number



Since commit b41d920a ("kbuild: deb-pkg: split generating packaging
and build"), the build version of the kernel contained in a deb package
is too low by 1.

Prior to the bad commit, the kernel was built first, then the number
in .version file was read out, and written into the debian control file.

Now, the debian control file is created before the kernel is actually
compiled, which is causing the version number mismatch.

Let the mkdebian script pass KBUILD_BUILD_VERSION=${revision} to require
the build system to use the specified version number.

Fixes: b41d920a ("kbuild: deb-pkg: split generating packaging and build")
Reported-by: Doug Smythies <dsmythies@telus.net>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Doug Smythies <dsmythies@telus.net>

parent 6bbe4385

scripts/package/mkdebian

+5 −2

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ set_debarch() {
		version=$KERNELRELEASE
		if [ -n "$KDEB_PKGVERSION" ]; then
		packageversion=$KDEB_PKGVERSION
		revision=${packageversion##*-}
		else
		revision=$(cat .version 2>/dev/null\|\|echo 1)
		packageversion=$version-$revision
		@@ -205,10 +206,12 @@ cat <<EOF > debian/rules
		#!$(command -v $MAKE) -f

		build:
		\$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} KBUILD_SRC=
		\$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
		KBUILD_BUILD_VERSION=${revision} KBUILD_SRC=

		binary-arch:
		\$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} KBUILD_SRC= intdeb-pkg
		\$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
		KBUILD_BUILD_VERSION=${revision} KBUILD_SRC= intdeb-pkg

		clean:
		rm -rf debian/*tmp debian/files

Admin message