diff mbox

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

Message ID 20131107151746.950612598@rtp-net.org (mailing list archive)
State New, archived
Headers show

Commit Message

Arnaud Patard (Rtp) Nov. 7, 2013, 3:17 p.m. UTC
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>
---



--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Ben Hutchings Nov. 8, 2013, 2:36 p.m. UTC | #1
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
> 
>
Michal Marek Nov. 12, 2013, 12:52 p.m. UTC | #2
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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