Commit d5615e47 authored Nov 07, 2018 by Rob Herring Committed by Masahiro Yamada Nov 11, 2018

builddeb: Fix inclusion of dtbs in debian package



Commit 37c8a5fa ("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: 37c8a5fa ("kbuild: consolidate Devicetree dtb build rules")
Reported-by: Nuno Gonçalves <nunojpg@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

parent 8ef14c2c

scripts/package/builddeb

+2 −2

Original line number	Diff line number	Diff line
		@@ -83,9 +83,9 @@ else
		fi
		cp "$($MAKE -s -f $srctree/Makefile 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

Admin message