From patchwork Mon Jan 26 19:40:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Arnaud Patard (Rtp)" X-Patchwork-Id: 5712521 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 628E1C058D for ; Mon, 26 Jan 2015 20:30:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C8EA9200F3 for ; Mon, 26 Jan 2015 20:30:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6DDA6200E9 for ; Mon, 26 Jan 2015 20:30:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756844AbbAZUaE (ORCPT ); Mon, 26 Jan 2015 15:30:04 -0500 Received: from lebrac.rtp-net.org ([195.154.106.105]:53010 "EHLO lebrac.rtp-net.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756843AbbAZUaE (ORCPT ); Mon, 26 Jan 2015 15:30:04 -0500 Received: by lebrac.rtp-net.org (Postfix, from userid 1000) id AAA2929234; Mon, 26 Jan 2015 21:29:32 +0100 (CET) Message-Id: <20150126194149.088416391@rtp-net.org> User-Agent: quilt/0.63-1 Date: Mon, 26 Jan 2015 20:40:59 +0100 From: Arnaud Patard (Rtp) To: linux-kbuild@vger.kernel.org Cc: maximilian attems , Ben Hutchings , Michal Marek Subject: [PATCHv3 1/1] deb-pkg: Add device tree blobs to the package References: <20150126194058.881319393@rtp-net.org> MIME-Version: 1.0 Content-Disposition: inline; filename=builddeb-install-dtbs-if-needed.patch Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When building a package with make deb-pkg (say, for arm), the dtb files are not added to the package. Given that things are still evolving on arm, it make sense to have them along with the kernel and modules. v3: handle with OF but without dtbs_install. Use $MAKE ... as done everywhere else in the script v2: make use of dtbs_install Signed-off-by: Arnaud Patard --- -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-next/scripts/package/builddeb =================================================================== --- linux-next.orig/scripts/package/builddeb 2015-01-14 13:04:45.845922441 +0100 +++ linux-next/scripts/package/builddeb 2015-01-24 21:39:40.047431257 +0100 @@ -143,6 +143,13 @@ else cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path" fi +if grep -q "^CONFIG_OF=y" .config ; then + # Only some architectures with OF support have this target + if grep -q dtbs_install "${srctree}/arch/$SRCARCH/Makefile"; then + $MAKE KBUILD_SRC= INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install + fi +fi + if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install rm -f "$tmpdir/lib/modules/$version/build"