| Message ID | 1426258527-2329-5-git-send-email-naresh.bhat@linaro.org |
|---|---|
| State | New |
| Headers | show |
Hi Richard, Thank you very much. On 13 March 2015 at 21:35, Richard Purdie < richard.purdie@linuxfoundation.org> wrote: > On Fri, 2015-03-13 at 20:25 +0530, Naresh Bhat wrote: > > Update the grub git recipe with the following actions for native and > target > > - Base class extend to native > > - do_configure_prepend > > - do_install_append > > - do_mkimage native > > - do_deploy > > > > Signed-off-by: Naresh Bhat <naresh.bhat@linaro.org> > > --- > > meta/recipes-bsp/grub/grub_git.bb | 48 > +++++++++++++++++++++++++++++++------ > > 1 file changed, 41 insertions(+), 7 deletions(-) > > This commit message isn't up to the job. You listed some things you > changed but didn't say why these are necessary or how this helps. My apologies, I will try to update more description. > Some > of the changes in here may be better split up a bit too, there seems to > be a lot going on. > I will appreciate if you point me to the changes which needs to be split up. I will definitely try to split up in my next series. > > > diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/ > grub_git.bb > > index 3ab675b..a5ab649 100644 > > --- a/meta/recipes-bsp/grub/grub_git.bb > > +++ b/meta/recipes-bsp/grub/grub_git.bb > > @@ -8,6 +8,7 @@ DEFAULT_PREFERENCE_arm = "1" > > PV = "2.00+${SRCPV}" > > SRCREV = "87de66d9d83446ecddb29cfbdf7369102c8e209e" > > SRC_URI = "git://git.savannah.gnu.org/grub.git \ > > + file://cfg \ > > file://grub-2.00-fpmath-sse-387-fix.patch \ > > file://autogen.sh-exclude-pc.patch \ > > file://grub-2.00-add-oe-kernel.patch \ > > @@ -18,7 +19,7 @@ S = "${WORKDIR}/git" > > > > COMPATIBLE_HOST = > '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)' > > > > -inherit autotools gettext texinfo > > +inherit autotools-brokensep gettext texinfo deploy > > Why do we need brokensep? It appears to work at the moment? > > > PACKAGECONFIG ??= "" > > PACKAGECONFIG[grub-mount] = > "--enable-grub-mount,--disable-grub-mount,fuse" > > @@ -31,24 +32,57 @@ GRUBPLATFORM_arm = "uboot" > > GRUBPLATFORM_aarch64 = "efi" > > GRUBPLATFORM ??= "pc" > > > > +CACHED_CONFIGUREVARS += "ac_cv_path_HELP2MAN=" > > EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} --disable-grub-mkfont > --program-prefix="" \ > > --enable-liblzma=no --enable-device-mapper=no > --enable-libzfs=no" > > > > +export ac_cv_path_HELP2MAN="" > > + > > You need both an export and a CACHED_CONFIGUREVARS? > I am not very sure. I will check and update. Thanks for pointing. > > do_configure_prepend() { > > - ( cd ${S} > > - ${S}/autogen.sh ) > > + ./autogen.sh > > +} > > This is probably why you now need brokensep. Why change the above? > Yes, this is the reason I need brokensep. The recipe fails to build on our luvOS distribution. > > > + > > +do_install_append_class-native() { > > + install -m 755 -D grub-mkimage ${D}${bindir} > > } > > > > -do_install_append () { > > - install -d ${D}${sysconfdir}/grub.d > > - > > +do_install_append_class-target() { > > + # Search for the grub.cfg on the local boot media by using the > > + # built in cfg file provided via this recipe > > + grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \ > > + -O ${GRUB_TARGET}-${GRUBPLATFORM} -o ./${GRUB_IMAGE} \ > > + boot linux ext2 fat serial part_msdos part_gpt \ > > + normal efi_gop iso9660 search efinet tftp all_video chain \ > > + gfxmenu jpeg gfxterm > > + > > + install -m 0755 -D ${B}/${GRUB_IMAGE} ${D}${bindir} > > +} > > + > > +GRUB_TARGET_aarch64 = "arm64" > > +GRUB_IMAGE_aarch64 = "grubaa64.efi" > > What about the x86 case? > Right now the recipe builds for PC on x86 architecture. On x86 architecture it is required to update. > > > +do_mkimage_class-native() { > > + : > > } > > > > +do_deploy() { > > + install -m 0755 -D ${B}/${GRUB_IMAGE} ${DEPLOYDIR} > > +} > > + > > +do_deploy_class-native() { > > + : > > +} > > + > > +addtask deploy after do_install before do_build > > Why do we need to start deploying grub? > Probably I need to split up here. Let me check > > > # debugedit chokes on bare metal binaries > > INHIBIT_PACKAGE_DEBUG_SPLIT = "1" > > > > -RDEPENDS_${PN} = "diffutils freetype" > > +RDEPENDS_${PN}_class-target = "diffutils freetype" > > FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug" > > > > INSANE_SKIP_${PN} = "arch" > > INSANE_SKIP_${PN}-dbg = "arch" > > + > > +DEPENDS_class-target += "grub-native" > > Why? > My mistake, If I understand properly the native recipe get build in first place. There is no need to add depends. > > > +BBCLASSEXTEND = "native" > > Cheers, > > Richard > >
diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb index 3ab675b..a5ab649 100644 --- a/meta/recipes-bsp/grub/grub_git.bb +++ b/meta/recipes-bsp/grub/grub_git.bb @@ -8,6 +8,7 @@ DEFAULT_PREFERENCE_arm = "1" PV = "2.00+${SRCPV}" SRCREV = "87de66d9d83446ecddb29cfbdf7369102c8e209e" SRC_URI = "git://git.savannah.gnu.org/grub.git \ + file://cfg \ file://grub-2.00-fpmath-sse-387-fix.patch \ file://autogen.sh-exclude-pc.patch \ file://grub-2.00-add-oe-kernel.patch \ @@ -18,7 +19,7 @@ S = "${WORKDIR}/git" COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)' -inherit autotools gettext texinfo +inherit autotools-brokensep gettext texinfo deploy PACKAGECONFIG ??= "" PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse" @@ -31,24 +32,57 @@ GRUBPLATFORM_arm = "uboot" GRUBPLATFORM_aarch64 = "efi" GRUBPLATFORM ??= "pc" +CACHED_CONFIGUREVARS += "ac_cv_path_HELP2MAN=" EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} --disable-grub-mkfont --program-prefix="" \ --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" +export ac_cv_path_HELP2MAN="" + do_configure_prepend() { - ( cd ${S} - ${S}/autogen.sh ) + ./autogen.sh +} + +do_install_append_class-native() { + install -m 755 -D grub-mkimage ${D}${bindir} } -do_install_append () { - install -d ${D}${sysconfdir}/grub.d - +do_install_append_class-target() { + # Search for the grub.cfg on the local boot media by using the + # built in cfg file provided via this recipe + grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \ + -O ${GRUB_TARGET}-${GRUBPLATFORM} -o ./${GRUB_IMAGE} \ + boot linux ext2 fat serial part_msdos part_gpt \ + normal efi_gop iso9660 search efinet tftp all_video chain \ + gfxmenu jpeg gfxterm + + install -m 0755 -D ${B}/${GRUB_IMAGE} ${D}${bindir} +} + +GRUB_TARGET_aarch64 = "arm64" +GRUB_IMAGE_aarch64 = "grubaa64.efi" + +do_mkimage_class-native() { + : } +do_deploy() { + install -m 0755 -D ${B}/${GRUB_IMAGE} ${DEPLOYDIR} +} + +do_deploy_class-native() { + : +} + +addtask deploy after do_install before do_build + # debugedit chokes on bare metal binaries INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -RDEPENDS_${PN} = "diffutils freetype" +RDEPENDS_${PN}_class-target = "diffutils freetype" FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug" INSANE_SKIP_${PN} = "arch" INSANE_SKIP_${PN}-dbg = "arch" + +DEPENDS_class-target += "grub-native" +BBCLASSEXTEND = "native"
Update the grub git recipe with the following actions for native and target - Base class extend to native - do_configure_prepend - do_install_append - do_mkimage native - do_deploy Signed-off-by: Naresh Bhat <naresh.bhat@linaro.org> --- meta/recipes-bsp/grub/grub_git.bb | 48 +++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 7 deletions(-)