From patchwork Thu Dec 13 08:07:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 10728139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1AD9D13AF for ; Thu, 13 Dec 2018 08:07:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0ABE829B27 for ; Thu, 13 Dec 2018 08:07:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF6452A220; Thu, 13 Dec 2018 08:07:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CFAC29B27 for ; Thu, 13 Dec 2018 08:07:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726847AbeLMIHQ (ORCPT ); Thu, 13 Dec 2018 03:07:16 -0500 Received: from mail-lf1-f68.google.com ([209.85.167.68]:44761 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726781AbeLMIHQ (ORCPT ); Thu, 13 Dec 2018 03:07:16 -0500 Received: by mail-lf1-f68.google.com with SMTP id z13so814918lfe.11 for ; Thu, 13 Dec 2018 00:07:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5+YmpEGFhLW6f3pd1k5b5x+iGOdK3eyEtvwqrE5KAoQ=; b=fnIucUmrlBIp8jEjh6Mvs8QlvMgSwOX/M6Z9tN+zIumAbDnpsAVfNTRi/LIoWxEfDd f7m5Hq/pONSwEIvjQ7Kz3ovLwP6K7X7/jLYBSd112j9JezzEk5Us6knTqVPZPypqBr4Q k2nZ5keZ0auw4wXQCyFvAtKzvyaNXDPA2j26c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5+YmpEGFhLW6f3pd1k5b5x+iGOdK3eyEtvwqrE5KAoQ=; b=fsAi0plFwRqSfgbvSIi5QP+1/bNN1a5rB5woYm5zSZ574oSLNul7VIHE9FEFDYvliL 5jkobv5KwGF7hDDRK5O01WZN1xd5PRbtKeFTCf5V65TcqTa6llxr/tzDvPJfHGRirs3k +dhTU+bwPw3GtSKdWXSx/GyeyiR+W066CzLUPM1Hq8yWVWsRyFrDDYnlIIk4o1Df1XuP Qr4RGFKqVl3mAWzq6CcwFlcPhuCh5I4m322GpWblbRYsXN5eXQcMmhQk7Jtf5dcyeU6h x6g8a5aMWdg+Ugq5AU/x9L7hb9c0jDzutra/wirbw1YMBVoopREXnl+PwRTkU7q+Y5uf nh3g== X-Gm-Message-State: AA+aEWZnUxHla8Ld+EeaNRAeKAaz0iErDtKUM2y3LtOhoZGFCc2fjlLU 5eCdjDA4bLMPVvQHzoM8NlFlrUZ/jNU= X-Google-Smtp-Source: AFSGD/U2W7+t4ZidPTrkpHAz66XxjZSwcVqnXJ4S4so3OWWbLjBWzCKAWH5DUplk+V81Z2pAwPrW5A== X-Received: by 2002:a19:22c2:: with SMTP id i185mr14433785lfi.2.1544688433674; Thu, 13 Dec 2018 00:07:13 -0800 (PST) Received: from berserk.kos.to (81-197-131-141.elisa-laajakaista.fi. [81.197.131.141]) by smtp.gmail.com with ESMTPSA id a9sm201021lfi.57.2018.12.13.00.07.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 00:07:12 -0800 (PST) From: riku.voipio@linaro.org To: linux-kbuild@vger.kernel.org Cc: yamada.masahiro@socionext.com, manivannan.sadhasivam@linaro.org, debian-kernel@lists.debian.org, Riku Voipio Subject: [PATCH] deb-pkg: generate correct build dependencies Date: Thu, 13 Dec 2018 10:07:11 +0200 Message-Id: <20181213080711.8907-1-riku.voipio@linaro.org> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Riku Voipio bison/flex is now needed always for building since genksyms is always generated. Some build dependencies depend on kernel configuration, enable them as needed: - libelf-dev when UNWINDER_ORC is set - libssl-dev for SYSTEM_TRUSTED_KEYRING Since the libssl-dev is needed for extract_cert binary, denote with :native to install the libssl-dev for the build machines architecture, rather than for the architecture of the kernel being built. Signed-off-by: Riku Voipio Tested-by: Manivannan Sadhasivam --- scripts/package/mkdebian | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index edcad61fe3cd..c858abf4569e 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -134,6 +134,8 @@ fi mkdir -p debian/ echo $debarch > debian/arch +extra_build_depends=", $(if_enabled_echo UNWINDER_ORC libelf-dev)" +extra_build_depends="$extra_build_depends, $(if_enabled_echo SYSTEM_TRUSTED_KEYRING libssl-dev:native)" # Generate a simple changelog template cat < debian/changelog @@ -170,7 +172,7 @@ Source: $sourcename Section: kernel Priority: optional Maintainer: $maintainer -Build-Depends: bc, kmod, cpio +Build-Depends: bc, kmod, cpio, bison, flex $extra_build_depends Homepage: http://www.kernel.org/ Package: $packagename