[PATCHv3 1/1] deb-pkg: Add device tree blobs to the package

[PATCHv3 1/1] deb-pkg: Add device tree blobs to the package

[Arnaud Patard]

[-- Attachment #1: builddeb-install-dtbs-if-needed.patch --]
[-- Type: text/plain, Size: 1200 bytes --]

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 <arnaud.patard@rtp-net.org>
---

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"

Re: [PATCHv3 1/1] deb-pkg: Add device tree blobs to the package

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1528 bytes --]

On Mon, 2015-01-26 at 20:40 +0100, Arnaud Patard wrote:
> 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 <arnaud.patard@rtp-net.org>
> ---
> 
> 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

Use $KCONFIG_CONFIG not .config.

Ben.

> +       # 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
Teamwork is essential - it allows you to blame someone else.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]