| Message ID | 20150203121648.046396044@rtp-net.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 2015-02-03 at 13:16 +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. > > v4: Use $KCONFIG_CONFIG > 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> Reviewed-by: Ben Hutchings <ben@decadent.org.uk> > --- > > 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-28 09:25:15.298796403 +0100 > @@ -143,6 +143,13 @@ else > cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path" > fi > > +if grep -q "^CONFIG_OF=y" $KCONFIG_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" >
On Tue, Feb 03, 2015 at 01:16:33PM +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. > > v4: Use $KCONFIG_CONFIG > 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> > --- the patch seems to apply to current linus with Hunk #1 succeeded at 143 with fuzz 1. acked. -- 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
Dne 22.4.2015 v 23:55 maximilian attems napsal(a): > On Tue, Feb 03, 2015 at 01:16:33PM +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. >> >> v4: Use $KCONFIG_CONFIG >> 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> >> --- > > the patch seems to apply to current linus with > Hunk #1 succeeded at 143 with fuzz 1. > > acked. Applied to kbuild.git#misc now, sorry for the delay. 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
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-28 09:25:15.298796403 +0100 @@ -143,6 +143,13 @@ else cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path" fi +if grep -q "^CONFIG_OF=y" $KCONFIG_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"
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. v4: Use $KCONFIG_CONFIG 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> --- -- 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