deb-pkg: Add device tree blobs to the package

PATCH Superseded Arnaud Patard (Rtp) 2 participants 2 messages Jan 26, 2015 – Jan 28, 2015 1 message not in the archive Kbuild

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Arnaud Patard (Rtp)

author

2015-01-26 20:30 UTC #1 lore raw

PATCH v3 1/1 deb-pkg: Add device tree blobs to the package

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 <[email protected]>

---

scripts/package/builddeb +7 -0

Index: linux-next/scripts/package/builddeb
===================================================================
@@ -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"

Ben Hutchings

2015-01-28 00:22 UTC #2 lore raw

Quoted 16 lines · Arnaud Patard

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 <[email protected]>
---
Index: linux-next/scripts/package/builddeb
===================================================================

scripts/package/builddeb 2015-01-24 21:39:40.047431257 +0100 else · line 146

Quoted 4 lines

scripts/package/builddeb 2015-01-24 21:39:40.047431257 +0100 renamed from scripts/package/builddeb 2015-01-14 13:04:45.845922441 +0100 +1 -0
@@ -143,6 +143,13 @@ else
        cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
 fi
 
+if grep -q "^CONFIG_OF=y" .config ; then

Use $KCONFIG_CONFIG not .config.

Ben.

Quoted 10 lines

scripts/package/builddeb 2015-01-24 21:39:40.047431257 +0100 renamed from scripts/package/builddeb 2015-01-14 13:04:45.845922441 +0100 +6 -0

+       # 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"

Signature · 2 lines

Ben Hutchings
Teamwork is essential - it allows you to blame someone else.