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

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

[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.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
---

Index: linux-next/scripts/package/builddeb
===================================================================
--- linux-next.orig/scripts/package/builddeb	2013-11-06 12:51:49.548299578 +0100
+++ linux-next/scripts/package/builddeb	2013-11-06 12:52:24.152298055 +0100
@@ -140,6 +140,10 @@ if [ -e $KBUILD_IMAGE ]; then
 else
 	cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
 fi
+if grep -q "^CONFIG_OF=y" .config ; then
+	mkdir -p "$tmpdir/usr/lib/$packagename"
+	find arch/$ARCH -name *.dtb -exec cp {} "$tmpdir/usr/lib/$packagename" \;
+fi
 
 if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
 	INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install

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

[Ben Hutchings]

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

On Thu, 2013-11-07 at 16:17 +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.
> 
> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
> ---
> 
> Index: linux-next/scripts/package/builddeb
> ===================================================================
> --- linux-next.orig/scripts/package/builddeb	2013-11-06 12:51:49.548299578 +0100
> +++ linux-next/scripts/package/builddeb	2013-11-06 12:52:24.152298055 +0100
> @@ -140,6 +140,10 @@ if [ -e $KBUILD_IMAGE ]; then
>  else
>  	cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
>  fi
> +if grep -q "^CONFIG_OF=y" .config ; then
> +	mkdir -p "$tmpdir/usr/lib/$packagename"
> +	find arch/$ARCH -name *.dtb -exec cp {} "$tmpdir/usr/lib/$packagename" \;
> +fi

I would quote the '*.dtb'.  Otherwise I think this is reasonable.

Ben.

>  if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
>  	INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install
> 
> 

-- 
Ben Hutchings
Horngren's Observation:
                   Among economists, the real world is often a special case.

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

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

[Michal Marek]

On 8.11.2013 15:36, Ben Hutchings wrote:
> On Thu, 2013-11-07 at 16:17 +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.
>>
>> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
>> ---
>>
>> Index: linux-next/scripts/package/builddeb
>> ===================================================================
>> --- linux-next.orig/scripts/package/builddeb	2013-11-06 12:51:49.548299578 +0100
>> +++ linux-next/scripts/package/builddeb	2013-11-06 12:52:24.152298055 +0100
>> @@ -140,6 +140,10 @@ if [ -e $KBUILD_IMAGE ]; then
>>  else
>>  	cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
>>  fi
>> +if grep -q "^CONFIG_OF=y" .config ; then
>> +	mkdir -p "$tmpdir/usr/lib/$packagename"
>> +	find arch/$ARCH -name *.dtb -exec cp {} "$tmpdir/usr/lib/$packagename" \;
>> +fi
> 
> I would quote the '*.dtb'.  Otherwise I think this is reasonable.

Good catch. Arnaud, can you send a v2 with this fix?

Thanks,
Michal