[PATCH] kbuild: builddeb: Include dtbs in the Debian package built by "make deb-pkg"

[PATCH] kbuild: builddeb: Include dtbs in the Debian package built by "make deb-pkg"

[Karsten Merker]

Native Debian kernel packages include any dtbs that were generated
during the kernel build process in /usr/lib/${packagename}.
Do the same for Debian packages built by scripts/package/builddeb
(executed by the "deb-pkg" target).

Signed-off-by: Karsten Merker <merker@debian.org>
---
 scripts/package/builddeb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 88dbf23..944b560 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -143,6 +143,11 @@ else
 	cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
 fi
 
+# If dtbs have been built for this arch, include them in the package
+if [ -d "arch/$ARCH/boot/dts" ]; then
+  find "arch/$ARCH/boot/dts" -iname '*.dtb' -exec sh -c "mkdir -p '$tmpdir/usr/lib/$packagename'; cp '{}' '$tmpdir/usr/lib/$packagename/'" \;
+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"
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in

Re: [PATCH] kbuild: builddeb: Include dtbs in the Debian package built by "make deb-pkg"

[Riku Voipio]

Hi,

On 20 June 2015 at 17:48, Karsten Merker <merker@debian.org> wrote:
> Native Debian kernel packages include any dtbs that were generated
> during the kernel build process in /usr/lib/${packagename}.
> Do the same for Debian packages built by scripts/package/builddeb
> (executed by the "deb-pkg" target).

This change has already been submitted in a few variations and is now
headed to next kernel version:

https://git.kernel.org/cgit/linux/kernel/git/mmarek/kbuild.git/commit/?h=misc&id=ca2a9d2cf6cf3dd852c3926ac7e30ee774da4638

> Signed-off-by: Karsten Merker <merker@debian.org>
> ---
>  scripts/package/builddeb | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index 88dbf23..944b560 100755
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -143,6 +143,11 @@ else
>         cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
>  fi
>
> +# If dtbs have been built for this arch, include them in the package
> +if [ -d "arch/$ARCH/boot/dts" ]; then
> +  find "arch/$ARCH/boot/dts" -iname '*.dtb' -exec sh -c "mkdir -p '$tmpdir/usr/lib/$packagename'; cp '{}' '$tmpdir/usr/lib/$packagename/'" \;
> +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"
> --
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in

Re: [PATCH] kbuild: builddeb: Include dtbs in the Debian package built by "make deb-pkg"

[Karsten Merker]

On Mon, Jun 22, 2015 at 09:04:43AM +0300, Riku Voipio wrote:
> On 20 June 2015 at 17:48, Karsten Merker <merker@debian.org> wrote:
> > Native Debian kernel packages include any dtbs that were generated
> > during the kernel build process in /usr/lib/${packagename}.
> > Do the same for Debian packages built by scripts/package/builddeb
> > (executed by the "deb-pkg" target).
> 
> This change has already been submitted in a few variations and is now
> headed to next kernel version:
> 
> https://git.kernel.org/cgit/linux/kernel/git/mmarek/kbuild.git/commit/?h=misc&id=ca2a9d2cf6cf3dd852c3926ac7e30ee774da4638

Ooops - sorry for the noise...

Regards,
Karsten
-- 
Gem. Par. 28 Abs. 4 Bundesdatenschutzgesetz widerspreche ich der Nutzung
sowie der Weitergabe meiner personenbezogenen Daten für Zwecke der
Werbung sowie der Markt- oder Meinungsforschung.
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in