From patchwork Tue Nov 6 04:18:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 150238 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3429833ljp; Mon, 5 Nov 2018 20:19:05 -0800 (PST) X-Google-Smtp-Source: AJdET5cKlCaIkEXJ5WhmcPVe1v4Msz0V/7Knc9lo4g9ivxWWtMjqt/vPRE9XpazY96fz5Kqukhox X-Received: by 2002:a17:902:28e7:: with SMTP id f94-v6mr24887293plb.297.1541477944988; Mon, 05 Nov 2018 20:19:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541477944; cv=none; d=google.com; s=arc-20160816; b=qtvsAuOfsJ1gZTJPrf0o4xtMktJeoiI5hH3bgBAAifc8FpNGz1paWkEJHMw+nECAaz iQFm+1WZ7oLWXFvFMMvoXE8fuHRsgH8cIGdVcCZnw3I9z80AQXauFLMGDBxdVqnNbpuE Kb1dDpvwFZdHuecxHnGhK9YvtMCk7OLKwid5+xX+GadT/Fwb/ihzu4J6Eb0BxsXYZROp BoBQeG+8wciavWrxM8Wiiwm3OLshY2TxFP3DBrHgpsy/lhbnb2h4QXEeTmk+3arZr3Q6 hQKDyhqxtCuLp2/db7nQwqiSwwSAPP+1oWhGBlTRAT8hfoDIjrVzoSACFJ4SJntw8735 Pa0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=EzqAHMsSVEO6RvFBEzGv1+Z7UJwHLm3/xZ9Z3getqyE=; b=zGCaHmWasG3BJIeTocTibXw3MjelfotqfIJvAdHa3a2VGrQP96U9vHO3rgEb3l0UKM gqHH19QzCRAgy2Q4Wyvkp+Eo48z8HNbnf3CqdXSsh4KK+tsw+P6q6Fk/zQLbhlKDFyzR Fr6tWQoqfri0v07TllxDnyJCQLH04VJe2O38ehl5bodThg5me5qqk2CNi2vXO51zhrw9 9SEVgqBVuTW7HCvBPNYeDwxhE6t3A1ekvrs5uusEJPA/jlHhAWrO2o/RQy+q4WolVLfw dUf8TTPaZTV7P1CSpi/nCwFmtuHDPlLvpqBIwhhCqKVuox/3bGIAmBu+69p3kG5PmmkL /flg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b="WT6p/MHj"; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 32-v6si13459258plc.370.2018.11.05.20.19.04; Mon, 05 Nov 2018 20:19:04 -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=@nifty.com header.s=dec2015msa header.b="WT6p/MHj"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729505AbeKFNmP (ORCPT + 32 others); Tue, 6 Nov 2018 08:42:15 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:43919 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728122AbeKFNmP (ORCPT ); Tue, 6 Nov 2018 08:42:15 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id wA64ICCL015516; Tue, 6 Nov 2018 13:18:13 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com wA64ICCL015516 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1541477893; bh=EzqAHMsSVEO6RvFBEzGv1+Z7UJwHLm3/xZ9Z3getqyE=; h=From:To:Cc:Subject:Date:From; b=WT6p/MHjg/gv7RANEmNb+0g0dTEMJV+uZFLaqq9n6VsphrVR6pUuZFYWDbnhbFlfd SN0IHGAdhF/kkVtjCgbsRN2xnLftDpLHtmaOvz8V9cZ6HZxeSajn0oXU3Qi1/qsMRu hKNR2OYuo2xcaKCHhgo6O9Hum64LKq2JmWPfKZY4oRO4VQfBv+L6Yqhs9rt/CkwR8e sfnxLQ8adss1+ASk0d0mlg1sqb5WKx83/0BV490j128MI2vd/wrs11v69JF2WkcXxv mtFluhzjoHKQUDAVxpl4mo3qS7zjS0R1IwXvnr6pdmfuA+4p9xzPd354sep9ZHfZ0t SAjsQFWHcim7g== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Riku Voipio , Ben Hutchings , Doug Smythies , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: deb-pkg: fix too low build version number Date: Tue, 6 Nov 2018 13:18:05 +0900 Message-Id: <1541477885-24875-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- scripts/package/mkdebian | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 663a7f3..edcad61 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 < 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