From patchwork Wed Jan 2 09:23:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 10746171 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 8507A6C2 for ; Wed, 2 Jan 2019 09:23:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 750172854A for ; Wed, 2 Jan 2019 09:23:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57563284B1; Wed, 2 Jan 2019 09:23:09 +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 C33C1284B1 for ; Wed, 2 Jan 2019 09:23:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728972AbfABJXI (ORCPT ); Wed, 2 Jan 2019 04:23:08 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:42510 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729041AbfABJXI (ORCPT ); Wed, 2 Jan 2019 04:23:08 -0500 Received: by mail-lj1-f193.google.com with SMTP id l15-v6so26468094lja.9 for ; Wed, 02 Jan 2019 01:23:06 -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=zo54gBxg99BNZlwuurUpj+VphHur219VRga10ffdbug=; b=DbXrLLw+7pBW/DXOPdzpNWi0Bgh1Oh5ttfH1GthtYGm56Z0BkxZYXYDOqDhbXTbGbi 6xGP85zMltMSMlKVpIz2+94jGY8lUGAwdcwW6RjhH/82rkVUQzpVFkDH+fbk4tEdMHt0 jTet7eieJGMCnf6jcZBeP54G47kBeiwKJBY1I= 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=zo54gBxg99BNZlwuurUpj+VphHur219VRga10ffdbug=; b=AZxyMGAtJHzTDYmK/bWol1VXHvi3SGS1n/ERzvJXE+omMylcqzLCpUjyKhYhKNFvbI +8rWSJbF9QCRpGP+TpQekm3Lj3jyFAPzhUnm+ELTZqSJXHt5cSWX3pQEpeEPUXy1eGLu Oacng54pYn7L57OWAXf/qpZWeOtVnN5+LmtTJnyvXPG058PI0A+xGHtA6qbb6R3r16UJ ExkJZPVyMRc3R5dF0JnTXp5oO7wWRLYE3Ab5HgaMAeTMOVQ+DlTSRDayJfjMANbJskeH CmqB5veovcRDhzioPJW6PYRRFcacAk+cRXyXp5P5r+b9S5YlYs3dtj6DHUdkSiSBiy7o FUsw== X-Gm-Message-State: AJcUukeXKN7BnQM9rnHcfgDWIIa9+BTYus9RIxzlstjDpRD7q3kKcHi0 dNeGbW4+ii9BOxGz3orxySl8SQcwfC0= X-Google-Smtp-Source: ALg8bN7pjNQZaWAkW1uHlvuhZEuHCcGq/+Y9/0bxCToiaLInD2CP5CurfNCXv/+UrQQd1rJwsv/QjQ== X-Received: by 2002:a2e:131a:: with SMTP id 26-v6mr182953ljt.107.1546420985676; Wed, 02 Jan 2019 01:23:05 -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 x16sm9845696lff.26.2019.01.02.01.23.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jan 2019 01:23:04 -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 v2] deb-pkg: generate correct build dependencies Date: Wed, 2 Jan 2019 11:23:04 +0200 Message-Id: <20190102092304.27262-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 for kconfig. 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. Tested-by: Manivannan Sadhasivam Signed-off-by: Riku Voipio Reviewed-by: Ben Hutchings Acked-by: maximilian attems --- v2: commit message updated --- 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