From patchwork Wed Nov 7 14:36:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 150397 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5244027ljp; Wed, 7 Nov 2018 06:36:52 -0800 (PST) X-Google-Smtp-Source: AJdET5d+53LECXJYOXe9g/Q3YT6/5yjj5mPYCc/T+ghsijzBo8VhVk77TDYfO6BQXuorLjLmP1WZ X-Received: by 2002:a17:902:7445:: with SMTP id e5-v6mr482938plt.126.1541601412822; Wed, 07 Nov 2018 06:36:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541601412; cv=none; d=google.com; s=arc-20160816; b=rtJFnI4YtAX2iOV5QpH4wQozc3x/ZnLKhG8whxRmfdWeO9fSRbMAkeqdK3bHw2AEqi UqF0JyRL9Q2Ra9/99Li+PYRR7Y1PM9lKpeL/Tchv/VxAbDDlVbYX5+GIX+UBbtW58CWy QRzs1Caz0jDTIb+po0GfDpvHgqzuNGuGhV1IgfqK8Xgv+DldX4VDLHBKZaeTHyEHG7Bq 2poO4wAwqltUZ3cn4kaLX2QAz1srs/QoEqO8yxb8QvsOuDOKcg5/TuVNFiWMlqlu4Oen MepdiELSJ0a3ULYUryurGd9qfcvo4h4Sis3unqkgjB5hHZhGslUZxe80ZpOU2togiNU+ 9P8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=VouxqWOT6eWXICQeIhzscdfQgU1z4wiPv+oBxIzj5Dw=; b=IPzMc22wL8UG9L4E0cD4L+gl+jhK5CkTObLmlzxJ3eqRmsn7GzJc9X2lhns+imH1k6 daE6yH9L4vKd985McmE1rHf6gJb5bOa5IdW/2FvJoIMWbBX6K4wZcWZQ12KlE4iCTO7w c3eQIajJm6XYc3U4XDfhz5Z4Sy0B77T00s9Y3jVMlSSTV422pw9bxYB/g+9pM2Nywyq0 2PPQVlMz6LLhgA6ll8y8a6MtWZ3JiKTE9uu5mdns8yRzmVGQF0fHu34Q+6xyh0vvDdHQ qnZYT4qE4sVit3ObUGOFz64/NlbnOy89QdUW+JtMUalXe4C1piDN+2lPL6DPicexwI8v HKDA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (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 u7si760745pgg.357.2018.11.07.06.36.52; Wed, 07 Nov 2018 06:36:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726752AbeKHAH1 (ORCPT + 6 others); Wed, 7 Nov 2018 19:07:27 -0500 Received: from mail-ot1-f66.google.com ([209.85.210.66]:35612 "EHLO mail-ot1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726670AbeKHAH1 (ORCPT ); Wed, 7 Nov 2018 19:07:27 -0500 Received: by mail-ot1-f66.google.com with SMTP id 81so14954381otj.2; Wed, 07 Nov 2018 06:36:49 -0800 (PST) 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=VouxqWOT6eWXICQeIhzscdfQgU1z4wiPv+oBxIzj5Dw=; b=dg7og95nAxOp0T3kfl3fu8nHHQkhX0AEpoQA4luRkxRjJjorviQBi9awYq/Wl+f338 6i/iCeSv20Ykad1qkkYuzhJQj7HQJF3Y7RsE90u7LgjIZFLP7O+n3U/bUhtg3XwIigQD lH4Y4xAlr3XOyGiYETDWYQFsUoY0Qk8XMzXUs90w/DIaPyfi70mLMfWSbwTs11I8+/9m xlbLjuXTxXfc0IdiaNQ3O6RW4ibD3gxn30vHBgwoWhSn8KEOIG0AeJ9+WpbLHIs88bKq Xa66Y0VX9j0oH6DDy2NRZBA4Mw5dyFGNoD4JbWmXh6ZfK1irIgHQ2cLCIPoTHuSo4dbC EX/w== X-Gm-Message-State: AGRZ1gI6UplMKKZkDkB0B0Shqq9+W/pkRz2PUp/0thjbUgNB/5TPch9b /7sO+KD9h4GhDJaTR8BVQxP18OQ= X-Received: by 2002:a9d:26ec:: with SMTP id i41mr264773otd.29.1541601408740; Wed, 07 Nov 2018 06:36:48 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id x92sm278265ota.55.2018.11.07.06.36.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 06:36:47 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Masahiro Yamada , Michal Marek , linux-kbuild@vger.kernel.org, =?utf-8?q?Nuno_Gon=C3=A7alves?= Subject: [PATCH] builddeb: Fix inclusion of dtbs in debian package Date: Wed, 7 Nov 2018 08:36:46 -0600 Message-Id: <20181107143646.27675-1-robh@kernel.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Commit 37c8a5fafa3b ("kbuild: consolidate Devicetree dtb build rules") moved the location of 'dtbs_install' target which caused dtbs to not be installed when building debian package with 'bindeb-pkg' target. Update the builddeb script to use the same logic that determines if there's a 'dtbs_install' target which is presence of the arch dts directory. Also, use CONFIG_OF_EARLY_FLATTREE instead of CONFIG_OF as that's a better indication of whether we are building dtbs. This commit will also have the side effect of installing dtbs on any arch that has dts files. Previously, it was dependent on whether the arch defined 'dtbs_install'. Fixes: 37c8a5fafa3b ("kbuild: consolidate Devicetree dtb build rules") Reported-by: Nuno Gonçalves Cc: Masahiro Yamada Cc: Michal Marek Cc: linux-kbuild@vger.kernel.org Signed-off-by: Rob Herring --- scripts/package/builddeb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.19.1 diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 90c9a8ac7adb..594b626d83d6 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -83,9 +83,9 @@ else fi cp "$($MAKE -s image_name)" "$tmpdir/$installed_image_path" -if grep -q "^CONFIG_OF=y" $KCONFIG_CONFIG ; then +if grep -q "^CONFIG_OF_EARLY_FLATTREE=y" $KCONFIG_CONFIG ; then # Only some architectures with OF support have this target - if grep -q dtbs_install "${srctree}/arch/$SRCARCH/Makefile"; then + if [ -d "${srctree}/arch/$SRCARCH/boot/dts" ]; then $MAKE KBUILD_SRC= INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install fi fi