| From b6a35eb1d428cb7b005b7354de21357833b39db0 Mon Sep 17 00:00:00 2001 |
| From: Masahiro Yamada <yamada.masahiro@socionext.com> |
| Date: Tue, 6 Nov 2018 13:18:05 +0900 |
| Subject: kbuild: deb-pkg: fix too low build version number |
| |
| [ Upstream commit bbcde0a7241261cd0ca8d8e6b94a4113a4b71443 ] |
| |
| Since commit b41d920acff8 ("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: b41d920acff8 ("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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| scripts/package/mkdebian | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian |
| index 663a7f343b42..edcad61fe3cd 100755 |
| --- a/scripts/package/mkdebian |
| +++ b/scripts/package/mkdebian |
| @@ -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 |
| -- |
| 2.17.1 |
| |
