Skip to contentSkip to conversation

deb-pkg: Add device tree blobs to the package

PATCH In review Arnaud Patard (Rtp) 4 participants 4 messages Feb 3, 2015 – May 20, 2015 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH v4 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.

v4: Use $KCONFIG_CONFIG
v3: handle with OF but without dtbs_install.
Use $MAKE ... as done everywhere else in the script
v2: make use of dtbs_install

---

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" $KCONFIG_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"
Reviewed-by on v4 1/1
#1 lore raw
Quoted 10 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.

v4: Use $KCONFIG_CONFIG
v3: handle with OF but without dtbs_install.
Use $MAKE ... as done everywhere else in the script
v2: make use of dtbs_install

Quoted 21 lines

---

Index: linux-next/scripts/package/builddeb
===================================================================

scripts/package/builddeb 2015-01-28 09:25:15.298796403 +0100 renamed from scripts/package/builddeb 2015-01-14 13:04:45.845922441 +0100 +7 -0
@@ -143,6 +143,13 @@ else
        cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
 fi
 
+if grep -q "^CONFIG_OF=y" $KCONFIG_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"
Signature · 3 lines
Ben Hutchings
Hoare's Law of Large Problems:
        Inside every large problem is a small problem struggling to get out.
#2 lore raw
In reply to Arnaud Patard (Rtp)
Quoted 11 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.

v4: Use $KCONFIG_CONFIG
v3: handle with OF but without dtbs_install.
Use $MAKE ... as done everywhere else in the script
v2: make use of dtbs_install

---

the patch seems to apply to current linus with
Hunk #1 succeeded at 143 with fuzz 1.

acked.

#3 lore raw

Dne 22.4.2015 v 23:55 maximilian attems napsal(a):

Quoted 10 lines · Arnaud Patard
Quoted 9 lines

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.

v4: Use $KCONFIG_CONFIG
v3: handle with OF but without dtbs_install.
Use $MAKE ... as done everywhere else in the script
v2: make use of dtbs_install

Quoted 7 lines
Quoted 2 lines

---

the patch seems to apply to current linus with
Hunk #1 succeeded at 143 with fuzz 1.

acked.

Applied to kbuild.git#misc now, sorry for the delay.

Michal