From patchwork Wed Nov 14 22:23:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151129 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6249757ljp; Wed, 14 Nov 2018 14:25:31 -0800 (PST) X-Google-Smtp-Source: AJdET5eqy+F11xJsrcTjh6wgaqghP3ffxS7Z3m7ciscN6/oULo6gUC2RuqdA9a/iaeQDhMa49pt1 X-Received: by 2002:a63:134f:: with SMTP id 15mr3427445pgt.19.1542234331549; Wed, 14 Nov 2018 14:25:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542234331; cv=none; d=google.com; s=arc-20160816; b=q6Tw+yHfsC+pwAuwSII6QqSl5IgEE58BSLfis57LmdtpvlaZ6O6ntlDTZTetfeoFVu 0L09NLiKCattUikPpE0QG3Ew9Etk6eJORcAfgK7sGlRMSX8kl8qR1Wr3mfrN5HUno9rO NO4aEE/+uBCI7KsvTURS0ouY7A34RS6qOY4lJRgvkwAC89c+O5hVIaezrrRBSSl24zAx IWsousX58P4eK7fZJY+rbF6Th55Wum7YYzlPwobnenKf5naodejUvyq4dM4baQox0dI5 CHKDS/0Y0iInTbHdV6Uli81c9YE2b2AnmnPAfv0gtWGoV4DVZIkFkugFG43bEiL+3t07 TETQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=jEPdxzZSskVTvOuOl7KK8o/HoUULfPZ+lyCXLDkazC8=; b=zBJ6ywE3zhVJ/qOKFTQb62xwt1QjcHkgbsLDg+dExjDdpUWM1kpYkxpvxKVzkdLndt qJBSQV19DDMjFlxWdC0e4oF3u9+Os5flWUBLTp99F/HnTStb4ylZK/472F5TxFEL+swx I2fOAMIbL64ZmTQ+9QCpNWzDYfXcLfooBtXJuNBv5m2NScSjXD7OBmuYUad4FeNEs6FM cXHKwcadvA9T565Ksz/T7CBDjbwVipDvwN8wmMdYXEsusGfd54ZpyJh6MZTZ+nc7A3SI mQckGtkxy2GgpBgQQjGOQixUCDgps5wg8cJr7UtJd54hxhH5kqrT9iJphehJKFLyOfdG jSwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XIujG34l; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v13si24435687pgn.355.2018.11.14.14.25.31; Wed, 14 Nov 2018 14:25:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XIujG34l; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388799AbeKOIaU (ORCPT + 32 others); Thu, 15 Nov 2018 03:30:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:37496 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726774AbeKOIaT (ORCPT ); Thu, 15 Nov 2018 03:30:19 -0500 Received: from sasha-vm.mshome.net (unknown [64.114.255.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 100E822527; Wed, 14 Nov 2018 22:25:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234315; bh=0Ts0QyzdxiYbzsgw8If12FeW0yBrnHSXS3cOb//WgMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XIujG34lLnr2Zh1DX8bq1JSG2qU3vvArhNEfLdwrmMZZivf8EOmHytM693nfFx+XF V8+j89RY4gkGPqrO1Q/XoT0hzA7ww6y9c5S5C3/qKqWb8EGCAIfkMQMR3KMolhdR0Y bVm1eHEM3NXCIPnbbyw36O+R6acigADfFM5LFXdo= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Masahiro Yamada , Sasha Levin , linux-kbuild@vger.kernel.org Subject: [PATCH AUTOSEL 4.18 58/59] kbuild: deb-pkg: fix too low build version number Date: Wed, 14 Nov 2018 17:23:30 -0500 Message-Id: <20181114222335.99339-58-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222335.99339-1-sashal@kernel.org> References: <20181114222335.99339-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masahiro Yamada [ 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 Signed-off-by: Masahiro Yamada Tested-by: Doug Smythies Signed-off-by: Sasha Levin --- scripts/package/mkdebian | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 985d72d1ab34..d2c4365c189f 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -56,6 +56,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 @@ -173,10 +174,12 @@ cat < 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