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

[Ben Hutchings <ben@decadent.org.uk>]

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

On Tue, 2015-01-20 at 00:13 +0100, Arnaud Patard wrote:
> Ben Hutchings <ben@decadent.org.uk> writes:
> 
> > [Please submit patches inline.]
> 
> I've no way to control the way quilt is sending mails.
> 
> >
> > On Wed, 2015-01-14 at 13:32 +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.
> >> 
> >> 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-14 13:19:26.121883720 +0100
> >> @@ -143,6 +143,10 @@ else
> >>         cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
> >>  fi
> >>  
> >> +if grep -q "^CONFIG_OF=y" .config ; then
> >> +       make INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install
> >> +fi
> >
> > Only arm and arm64 support that target.  You should maybe run something
> > like 'make -n dtbs_install >/dev/null 2>&1' first to check that the
> > target is defined.
> 
> There's a 'set -e' on top of the script so using make -n will likely
> result in the script failing, which wouldn't be so nice imho.
[...]

That's why you use it with the if statement:

# Only some architectures with OF support have this target
if make -n dtbs_install >/dev/null 2>&1; then
	make INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install
fi

Ben.

-- 
Ben Hutchings
Larkinson's Law: All laws are basically false.

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