grub-efi-native: fix build failure on 32bit host
v2 cover grub-efi-native: fix build failure on 32bit host
From: Jackie Huang <[email protected]>
v2 comments:
1. make the allow-a-compilation-without-mcmodel-large.patch into a standalone commit
2. remove RDEPENDS for grub-efi-native
3. the reason why I put them in 3 files is:
For grub-efi-native, it needs to determine the target arch and the target STAGING_LIBDIR (used for do_mkimage to generate the target EFI binary) before inherit native class, if we make them into one bb and use BBCLASSEXTEND, seems no chance to do that, so grub-efi-native need to be a standalone bb, and the inc is to avoid duplicating contents.
--
The following changes since commit eac8cb7cacab7f2fb392128aa5ebc2046ca4a793:
kbd: Fix stdarg related errors on uclibc (2013-11-08 17:31:17 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib jhuang0/d_grub-efi_1109_0
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_grub-efi_1109_0
Jackie Huang (2):
grub-efi-native: fix build failure on 32bit host
grub-efi: allow compilation without large model support
...allow-a-compilation-without-mcmodel-large.patch | 69 ++++++++++++++++++++++ meta/recipes-bsp/grub/grub-efi-native_2.00.bb | 54 ++++------------- meta/recipes-bsp/grub/grub-efi.inc | 43 ++++++++++++++ meta/recipes-bsp/grub/grub-efi_2.00.bb | 11 ++++ 4 files changed, 134 insertions(+), 43 deletions(-) create mode 100644 meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch create mode 100644 meta/recipes-bsp/grub/grub-efi.inc create mode 100644 meta/recipes-bsp/grub/grub-efi_2.00.bb
Signature · 1 line
1.8.3
PATCH v2 1/2 grub-efi-native: fix build failure on 32bit host
From: Jackie Huang <[email protected]>
grub-efi-native builds grub with efi platform, then run "grub-mkimage" command with built in cfg and modules to generate an EFI binary for the target, and deploys it.
It works fine when build on 64bit host, but when we build x86-64 target on 32bit host, it fails to build 64bit grub, even if it builds, the 64bit binary "grub-mkimage" would fail to run to generate EFI.
So the solution is:
Add a target package grub-efi and grub-efi-native depends on it, grub-efi-native will be back to real native, then run "grub-mkimage" command with modules in sysroot populated by grub-efi to generate the EFI binary for target.
--- meta/recipes-bsp/grub/grub-efi-native_2.00.bb | 54 ++++++--------------------- meta/recipes-bsp/grub/grub-efi.inc | 42 +++++++++++++++++++++ meta/recipes-bsp/grub/grub-efi_2.00.bb | 11 ++++++ 3 files changed, 64 insertions(+), 43 deletions(-) create mode 100644 meta/recipes-bsp/grub/grub-efi.inc create mode 100644 meta/recipes-bsp/grub/grub-efi_2.00.bb
meta/recipes-bsp/grub/grub-efi-native_2.00.bb +11 -43
@@ -1,47 +1,20 @@ -SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader" +require grub-efi.inc -DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \ -intended to unify bootloading across x86 operating systems. In \ -addition to loading the Linux kernel, it implements the Multiboot \ -standard, which allows for flexible loading of multiple boot images. \ -This recipe builds an EFI binary for the target. It does not install \ -or package anything, it only deploys a target-arch GRUB EFI image." +# do_mkimage needs grub modules for the target to generate the correct +# EFI binary, so depends on the target package 'grub-efi' to compile +# the necessary modules. +DEPENDS += "grub-efi" -HOMEPAGE = "http://www.gnu.org/software/grub/" -SECTION = "bootloaders" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -# FIXME: We should be able to optionally drop freetype as a dependency -DEPENDS = "autogen-native" -RDEPENDS_${PN} = "diffutils freetype" -PR = "r2" +PR = "${INC_PR}.0" # Native packages do not normally rebuild when the target changes. # Ensure this is built once per HOST-TARGET pair. PN := "grub-efi-${TRANSLATED_TARGET_ARCH}-native" -SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ - file://cfg \ - file://grub-2.00-fpmath-sse-387-fix.patch \ - file://grub-2.00-fix-enable_execute_stack-check.patch \ - file://grub-2.00-disable-help2man.patch \ - file://check-if-liblzma-is-disabled.patch \ - file://grub-no-unused-result.patch \ - file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ - file://fix-issue-with-flex-2.5.37.patch \ - " -SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" -SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" - -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' - -S = "${WORKDIR}/grub-${PV}" - # Determine the target arch for the grub modules before the native class -# clobbers TARGET_ARCH. +# clobbers TARGET_ARCH and STAGING_LIBDIR. ORIG_TARGET_ARCH := "${TARGET_ARCH}" +ORIG_STAGING_LIBDIR := "${STAGING_LIBDIR}" python __anonymous () { import re target = d.getVar('ORIG_TARGET_ARCH', True)
@@ -57,19 +30,14 @@ python __anonymous () { d.setVar("GRUB_IMAGE", grubimage) } -inherit autotools -inherit gettext inherit native inherit deploy -EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \ - --target=${GRUB_TARGET} --enable-efiemu=no --program-prefix='' \ - --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" - do_mkimage() { # 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/ \ + # built in cfg file provided via this recipe and modules dir + # populated by grub-efi + ./grub-mkimage -c ../cfg -p /EFI/BOOT -d ${ORIG_STAGING_LIBDIR}/grub-efi/${GRUB_TARGET}-efi \ -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \ boot linux ext2 fat serial part_msdos part_gpt normal efi_gop iso9660 search }
meta/recipes-bsp/grub/grub-efi.inc new file +42 -0
42 lines not on this page · raw message
meta/recipes-bsp/grub/grub-efi_2.00.bb new file +11 -0
@@ -0,0 +1,11 @@ +require grub-efi.inc + +RDEPENDS_${PN} = "diffutils freetype" + +PR = "${INC_PR}.0" +FILES_${PN}-dbg += "${libdir}/${BPN}/${TARGET_ARCH}-efi/.debug" + +do_install_append () { + mv ${D}${libdir}/grub ${D}${libdir}/${BPN} + mv ${D}${datadir}/grub ${D}${datadir}/${BPN} +}
Signature · 1 line
1.8.3
PATCH v2 2/2 grub-efi: allow compilation without large model support
In reply to [email protected]From: Jackie Huang <[email protected]>
-mcmodel=large is not supported by gcc with version lower than 4.4, but we don't need to use memory over 4GiB, so add a patch to allow compilation without large model support.
--- ...allow-a-compilation-without-mcmodel-large.patch | 69 ++++++++++++++++++++++ meta/recipes-bsp/grub/grub-efi.inc | 1 + 2 files changed, 70 insertions(+) create mode 100644 meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch
meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch new file +69 -0
@@ -0,0 +1,69 @@ +From 0cea0e4266214da1f11e812834f5d5c47a6e04e6 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <[email protected]> +Date: Tue, 5 Nov 2013 07:23:32 -0500 +Subject: [PATCH] Allow a compilation without -mcmodel=large + +* kern/efi/mm.c (grub_efi_allocate_pages): don't allocate >4GiB + when compiled without -mcmodel=large + (filter_memory_map): remove memory post 4 GiB when compiled + without -mcmodel=large +* configure.ac: add -DMCMODEL_SMALL=1 to TARGET_CFLAGS when + -mcmodel=large isn't supported + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Jackie Huang <[email protected]> +--- + configure.ac | 4 +++- + grub-core/kern/efi/mm.c | 6 +++--- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 319d063..ee72fee 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -567,7 +567,9 @@ if test "$target_cpu"-"$platform" = x86_64-efi; then + [grub_cv_cc_mcmodel=no]) + ]) + if test "x$grub_cv_cc_mcmodel" = xno; then +- AC_MSG_ERROR([-mcmodel=large not supported. Upgrade your gcc.]) ++ CFLAGS="$SAVED_CFLAGS -m64 -DMCMODEL_SMALL=1" ++ TARGET_CFLAGS="$TARGET_CFLAGS -DMCMODEL_SMALL=1" ++ AC_MSG_WARN([-mcmodel=large not supported. You won't be able to use the memory over 4GiB. Upgrade your gcc.]) + else + TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large" + fi +diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c +index a2edc84..c67dd13 100644 +--- a/grub-core/kern/efi/mm.c ++++ b/grub-core/kern/efi/mm.c +@@ -62,7 +62,7 @@ grub_efi_allocate_pages (grub_efi_physical_address_t address, + return 0; + #endif + +-#if 1 ++#if defined (MCMODEL_SMALL) + if (address == 0) + { + type = GRUB_EFI_ALLOCATE_MAX_ADDRESS; +@@ -305,7 +305,7 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map, + desc = NEXT_MEMORY_DESCRIPTOR (desc, desc_size)) + { + if (desc->type == GRUB_EFI_CONVENTIONAL_MEMORY +-#if 1 ++#if defined (MCMODEL_SMALL) + && desc->physical_start <= 0xffffffff + #endif + && desc->physical_start + PAGES_TO_BYTES (desc->num_pages) > 0x100000 +@@ -321,7 +321,7 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map, + desc->physical_start = 0x100000; + } + +-#if 1 ++#if defined (MCMODEL_SMALL) + if (BYTES_TO_PAGES (filtered_desc->physical_start) + + filtered_desc->num_pages + > BYTES_TO_PAGES (0x100000000LL)) +-- +1.7.1 +
meta/recipes-bsp/grub/grub-efi.inc +1 -0
@@ -26,6 +26,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ file://grub-no-unused-result.patch \ file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ file://fix-issue-with-flex-2.5.37.patch \ + file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \ " SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"
Signature · 1 line
1.8.3
Quoted 47 lines · On 11/08/2013 11:56 PM, [email protected] wrote:
From: Jackie Huang <[email protected]>
grub-efi-native builds grub with efi platform, then run "grub-mkimage" command with built in cfg and modules to generate an EFI binary for the target, and deploys it.
It works fine when build on 64bit host, but when we build x86-64 target on 32bit host, it fails to build 64bit grub, even if it builds, the 64bit binary "grub-mkimage" would fail to run to generate EFI.
So the solution is:
Add a target package grub-efi and grub-efi-native depends on it, grub-efi-native will be back to real native, then run "grub-mkimage" command with modules in sysroot populated by grub-efi to generate the EFI binary for target.Signed-off-by Jackie Huang <[email protected]>--- meta/recipes-bsp/grub/grub-efi-native_2.00.bb | 54 ++++++--------------------- meta/recipes-bsp/grub/grub-efi.inc | 42 +++++++++++++++++++++ meta/recipes-bsp/grub/grub-efi_2.00.bb | 11 ++++++ 3 files changed, 64 insertions(+), 43 deletions(-)create mode 100644 meta/recipes-bsp/grub/grub-efi.inc create mode 100644 meta/recipes-bsp/grub/grub-efi_2.00.bb
meta/recipes-bsp/grub/grub-efi-native_2.00.bb +5
-9@@ -1,47 +1,20 @@ -SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader" +require grub-efi.inc -DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \ -intended to unify bootloading across x86 operating systems. In \ -addition to loading the Linux kernel, it implements the Multiboot \ -standard, which allows for flexible loading of multiple boot images. \ -This recipe builds an EFI binary for the target. It does not install \ -or package anything, it only deploys a target-arch GRUB EFI image." +# do_mkimage needs grub modules for the target to generate the correct +# EFI binary, so depends on the target package 'grub-efi' to compile +# the necessary modules. +DEPENDS += "grub-efi" -HOMEPAGE = "http://www.gnu.org/software/grub/" -SECTION = "bootloaders"
meta/recipes-bsp/grub/grub-efi-native_2.00.bb line 9
Quoted 10 lines
meta/recipes-bsp/grub/grub-efi-native_2.00.bb +1
-8- -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -# FIXME: We should be able to optionally drop freetype as a dependency -DEPENDS = "autogen-native" -RDEPENDS_${PN} = "diffutils freetype" -PR = "r2" +PR = "${INC_PR}.0"
Don't need the INC_PR
Quoted 67 lines
meta/recipes-bsp/grub/grub-efi-native_2.00.bb +5
-26# Native packages do not normally rebuild when the target changes. # Ensure this is built once per HOST-TARGET pair. PN := "grub-efi-${TRANSLATED_TARGET_ARCH}-native" -SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ - file://cfg \ - file://grub-2.00-fpmath-sse-387-fix.patch \ - file://grub-2.00-fix-enable_execute_stack-check.patch \ - file://grub-2.00-disable-help2man.patch \ - file://check-if-liblzma-is-disabled.patch \ - file://grub-no-unused-result.patch \ - file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ - file://fix-issue-with-flex-2.5.37.patch \ - " -SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" -SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" - -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' - -S = "${WORKDIR}/grub-${PV}" - # Determine the target arch for the grub modules before the native class -# clobbers TARGET_ARCH. +# clobbers TARGET_ARCH and STAGING_LIBDIR. ORIG_TARGET_ARCH := "${TARGET_ARCH}" +ORIG_STAGING_LIBDIR := "${STAGING_LIBDIR}" python __anonymous () { import re target = d.getVar('ORIG_TARGET_ARCH', True)@@ -57,19 +30,14 @@ python __anonymous () { d.setVar("GRUB_IMAGE", grubimage) } -inherit autotools -inherit gettext inherit native inherit deploy -EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \ - --target=${GRUB_TARGET} --enable-efiemu=no --program-prefix='' \ - --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" - do_mkimage() { # 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/ \ + # built in cfg file provided via this recipe and modules dir + # populated by grub-efi + ./grub-mkimage -c ../cfg -p /EFI/BOOT -d ${ORIG_STAGING_LIBDIR}/grub-efi/${GRUB_TARGET}-efi \ -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \ boot linux ext2 fat serial part_msdos part_gpt normal efi_gop iso9660 search }meta/recipes-bsp/grub/grub-efi.inc new file +9
-0@@ -0,0 +1,42 @@ +SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader" + +DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \ +intended to unify bootloading across x86 operating systems. In \ +addition to loading the Linux kernel, it implements the Multiboot \ +standard, which allows for flexible loading of multiple boot images. \ +This recipe builds an EFI binary for the target. It does not install \ +or package anything, it only deploys a target-arch GRUB EFI image." +
meta/recipes-bsp/grub/grub-efi.inc line 19
Quoted 10 lines
meta/recipes-bsp/grub/grub-efi.inc new file +10
-0+HOMEPAGE = "http://www.gnu.org/software/grub/" +SECTION = "bootloaders" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +# FIXME: We should be able to optionally drop freetype as a dependency +DEPENDS = "autogen-native flex-native" +INC_PR = "r2" +
Should just be PR = "r2" and shared by both.
Quoted 29 lines
meta/recipes-bsp/grub/grub-efi.inc new file +23
-0+SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ + file://cfg \ + file://grub-2.00-fpmath-sse-387-fix.patch \ + file://grub-2.00-fix-enable_execute_stack-check.patch \ + file://grub-2.00-disable-help2man.patch \ + file://check-if-liblzma-is-disabled.patch \ + file://grub-no-unused-result.patch \ + file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ + file://fix-issue-with-flex-2.5.37.patch \ + " +SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" +SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" + +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' + +S = "${WORKDIR}/grub-${PV}" + +inherit autotools +inherit gettext + +EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \ + --enable-efiemu=no --program-prefix='' \ + --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no"meta/recipes-bsp/grub/grub-efi_2.00.bb new file +0
-0
meta/recipes-bsp/grub/grub-efi_2.00.bb line 5
Quoted 5 lines
meta/recipes-bsp/grub/grub-efi_2.00.bb new file +5
-0@@ -0,0 +1,11 @@ +require grub-efi.inc + +RDEPENDS_${PN} = "diffutils freetype" + +PR = "${INC_PR}.0"
I am not sure you need to extend PR here since we are working to get rid of PR in general, just leave the PR="r2" in the new .inc file.
meta/recipes-bsp/grub/grub-efi_2.00.bb line 7
Quoted 2 lines
meta/recipes-bsp/grub/grub-efi_2.00.bb new file +2
-0+FILES_${PN}-dbg += "${libdir}/${BPN}/${TARGET_ARCH}-efi/.debug" +
I am not sure if this is doing the right thing, as I am getting QA errors regarding where debug files are going, but this may need to be GRUB-TARGET. This is just an example of one:
ERROR: QA Issue: non debug package contains .debug directory: grub-efi path /work/core2-poky-linux/grub-efi/2.00-r2.0/packages-split/grub-efi/usr/lib/grub-efi/i386-efi/.debug/part_bsd.module
ERROR: QA run found fatal errors. Please consider fixing them.
ERROR: Function failed: do_package_qa
Quoted 5 lines
meta/recipes-bsp/grub/grub-efi_2.00.bb new file +4
-0+do_install_append () { + mv ${D}${libdir}/grub ${D}${libdir}/${BPN} + mv ${D}${datadir}/grub ${D}${datadir}/${BPN} +}
Quoted 191 lines · Saul Wold
Quoted 50 lines · On 11/08/2013 11:56 PM, [email protected] wrote:
From: Jackie Huang <[email protected]>
grub-efi-native builds grub with efi platform, then run "grub-mkimage" command with built in cfg and modules to generate an EFI binary for the target, and deploys it.
It works fine when build on 64bit host, but when we build x86-64 target on 32bit host, it fails to build 64bit grub, even if it builds, the 64bit binary "grub-mkimage" would fail to run to generate EFI.
So the solution is:
Add a target package grub-efi and grub-efi-native depends on it, grub-efi-native will be back to real native, then run "grub-mkimage" command with modules in sysroot populated by grub-efi to generate the EFI binary for target.Signed-off-by Jackie Huang <[email protected]>--- meta/recipes-bsp/grub/grub-efi-native_2.00.bb | 54 ++++++--------------------- meta/recipes-bsp/grub/grub-efi.inc | 42 +++++++++++++++++++++ meta/recipes-bsp/grub/grub-efi_2.00.bb | 11 ++++++ 3 files changed, 64 insertions(+), 43 deletions(-)create mode 100644 meta/recipes-bsp/grub/grub-efi.inc create mode 100644 meta/recipes-bsp/grub/grub-efi_2.00.bb
meta/recipes-bsp/grub/grub-efi-native_2.00.bb +5
-9@@ -1,47 +1,20 @@ -SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader" +require grub-efi.inc -DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \ -intended to unify bootloading across x86 operating systems. In \ -addition to loading the Linux kernel, it implements the Multiboot \ -standard, which allows for flexible loading of multiple boot images. \ -This recipe builds an EFI binary for the target. It does not install \ -or package anything, it only deploys a target-arch GRUB EFI image." +# do_mkimage needs grub modules for the target to generate the correct +# EFI binary, so depends on the target package 'grub-efi' to compile +# the necessary modules. +DEPENDS += "grub-efi" -HOMEPAGE = "http://www.gnu.org/software/grub/" -SECTION = "bootloaders"meta/recipes-bsp/grub/grub-efi-native_2.00.bb line 9
Quoted 10 lines
meta/recipes-bsp/grub/grub-efi-native_2.00.bb +1
-8- -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -# FIXME: We should be able to optionally drop freetype as a dependency -DEPENDS = "autogen-native" -RDEPENDS_${PN} = "diffutils freetype" -PR = "r2" +PR = "${INC_PR}.0"Don't need the
INC_PRQuoted 74 lines
meta/recipes-bsp/grub/grub-efi-native_2.00.bb +0
-12# Native packages do not normally rebuild when the target changes. # Ensure this is built once per HOST-TARGET pair. PN := "grub-efi-${TRANSLATED_TARGET_ARCH}-native" -SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ - file://cfg \ - file://grub-2.00-fpmath-sse-387-fix.patch \ - file://grub-2.00-fix-enable_execute_stack-check.patch \ - file://grub-2.00-disable-help2man.patch \ - file://check-if-liblzma-is-disabled.patch \ - file://grub-no-unused-result.patch \ - file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ - file://fix-issue-with-flex-2.5.37.patch \ - " -SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" -SRC_URI[sha256sum] ="
65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"meta/recipes-bsp/grub/grub-efi-native_2.00.bb +0
-5- -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' - -S = "${WORKDIR}/grub-${PV}" - # Determine the target arch for the grub modules before the nativeclass
meta/recipes-bsp/grub/grub-efi-native_2.00.bb +5
-11-# clobbers TARGET_ARCH. +# clobbers TARGET_ARCH and STAGING_LIBDIR. ORIG_TARGET_ARCH := "${TARGET_ARCH}" +ORIG_STAGING_LIBDIR := "${STAGING_LIBDIR}" python __anonymous () { import re target = d.getVar('ORIG_TARGET_ARCH', True)@@ -57,19 +30,14 @@ python __anonymous () { d.setVar("GRUB_IMAGE", grubimage) } -inherit autotools -inherit gettext inherit native inherit deploy -EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \ - --target=${GRUB_TARGET} --enable-efiemu=no --program-prefix='' \ - --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" - do_mkimage() { # 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/ \ + # built in cfg file provided via this recipe and modules dir + # populated by grub-efi + ./grub-mkimage -c ../cfg -p /EFI/BOOT -d ${ORIG_STAGING_LIBDIR}/grub-efi/${GRUB_TARGET}-efi \ -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \ boot linux ext2 fat serial part_msdos part_gptnormal
efi_gopiso9660 search
}meta/recipes-bsp/grub/grub-efi.inc new file +9
-0@@ -0,0 +1,42 @@ +SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader" + +DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \ +intended to unify bootloading across x86 operating systems. In \ +addition to loading the Linux kernel, it implements the Multiboot \ +standard, which allows for flexible loading of multiple boot images. \ +This recipe builds an EFI binary for the target. It does not install \ +or package anything, it only deploys a target-arch GRUB EFI image." +meta/recipes-bsp/grub/grub-efi.inc line 19
Quoted 10 lines
meta/recipes-bsp/grub/grub-efi.inc new file +10
-0+HOMEPAGE = "http://www.gnu.org/software/grub/" +SECTION = "bootloaders" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +# FIXME: We should be able to optionally drop freetype as a dependency +DEPENDS = "autogen-native flex-native" +INC_PR = "r2" +Should just be PR = "r2" and shared by both.
Quoted 32 lines
meta/recipes-bsp/grub/grub-efi.inc new file +12
-0+SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ + file://cfg \ + file://grub-2.00-fpmath-sse-387-fix.patch \ + file://grub-2.00-fix-enable_execute_stack-check.patch \ + file://grub-2.00-disable-help2man.patch \ + file://check-if-liblzma-is-disabled.patch \ + file://grub-no-unused-result.patch \ + file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ + file://fix-issue-with-flex-2.5.37.patch \ + " +SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" +SRC_URI[sha256sum] ="
65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"meta/recipes-bsp/grub/grub-efi.inc new file +11
-1+ +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' + +S = "${WORKDIR}/grub-${PV}" + +inherit autotools +inherit gettext + +EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \ + --enable-efiemu=no --program-prefix='' \ + --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no"meta/recipes-bsp/grub/grub-efi_2.00.bb new file +0
-0meta/recipes-bsp/grub/grub-efi_2.00.bb line 5
Quoted 5 lines
meta/recipes-bsp/grub/grub-efi_2.00.bb new file +5
-0@@ -0,0 +1,11 @@ +require grub-efi.inc + +RDEPENDS_${PN} = "diffutils freetype" + +PR = "${INC_PR}.0"I am not sure you need to extend PR here since we are working to get rid of PR in general, just leave the PR="r2" in the new .inc file.
Quoted 6 lines
meta/recipes-bsp/grub/grub-efi_2.00.bb line 7
Quoted 2 lines
meta/recipes-bsp/grub/grub-efi_2.00.bb new file +2
-0+FILES_${PN}-dbg += "${libdir}/${BPN}/${TARGET_ARCH}-efi/.debug" +I am not sure if this is doing the right thing, as I am getting QA errors regarding where debug files are going, but this may need to be GRUB-TARGET. This is just an example of one:
Yes, you are right, the TARGET_ARCH is not correct for this, I will fix this and the PR issue, thanks!
Thanks,
Jackie
Quoted 15 lines
ERROR: QA Issue: non debug package contains .debug directory: grub-efi
path /work/core2-poky-linux/grub-efi/2.00-r2.0/packages-split/grub-efi/usr/lib/grub-efi/i386-efi/.debug/part_bsd.moduleERROR: QA run found fatal errors. Please consider fixing them.
ERROR: Function failed:do_package_qaQuoted 5 lines
meta/recipes-bsp/grub/grub-efi_2.00.bb new file +4
-0+do_install_append () { + mv ${D}${libdir}/grub ${D}${libdir}/${BPN} + mv ${D}${datadir}/grub ${D}${datadir}/${BPN} +}
Signature · 5 lines
Jackie Huang WIND RIVER | China Development Center MSN:[email protected] Tel: +86 8477 8594 Mobile: +86 138 1027 4745
Quoted 15 lines · On 11/14/2013 9:58 AM, jhuang0 wrote:
Quoted 12 lines · Saul Wold
Quoted 11 lines · On 11/08/2013 11:56 PM, [email protected] wrote:
From: Jackie Huang <[email protected]>
grub-efi-native builds grub with efi platform, then run "grub-mkimage" command with built in cfg and modules to generate an EFI binary for the target, and deploys it.
It works fine when build on 64bit host, but when we build x86-64 target on 32bit host, it fails to build 64bit grub, even if it builds, the 64bit binary "grub-mkimage" would fail to run to generate EFI.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
So the solution is:
Add a target package grub-efi and grub-efi-native depends on it, grub-efi-native will be back to real native, then run "grub-mkimage" command with modules in sysroot populated by grub-efi to generate the EFI binary for target.
We had a discussion about this and think that it's odd to generate target image in a native package, I will drop this and come up a solution to do this in the target package.
Thanks,
Jackie
Quoted 206 lines
Quoted 176 lines
Quoted 39 lines
Signed-off-by Jackie Huang <[email protected]>--- meta/recipes-bsp/grub/grub-efi-native_2.00.bb | 54 ++++++--------------------- meta/recipes-bsp/grub/grub-efi.inc | 42 +++++++++++++++++++++ meta/recipes-bsp/grub/grub-efi_2.00.bb | 11 ++++++ 3 files changed, 64 insertions(+), 43 deletions(-)create mode 100644 meta/recipes-bsp/grub/grub-efi.inc create mode 100644 meta/recipes-bsp/grub/grub-efi_2.00.bb
meta/recipes-bsp/grub/grub-efi-native_2.00.bb +5
-12@@ -1,47 +1,20 @@ -SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader" +require grub-efi.inc -DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \ -intended to unify bootloading across x86 operating systems. In \ -addition to loading the Linux kernel, it implements the Multiboot \ -standard, which allows for flexible loading of multiple boot images. \ -This recipe builds an EFI binary for the target. It does not install \ -or package anything, it only deploys a target-arch GRUB EFI image." +# do_mkimage needs grub modules for the target to generate the correct +# EFI binary, so depends on the target package 'grub-efi' to compile +# the necessary modules. +DEPENDS += "grub-efi" -HOMEPAGE = "http://www.gnu.org/software/grub/" -SECTION = "bootloaders" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM ="file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
meta/recipes-bsp/grub/grub-efi-native_2.00.bb line 8
Quoted 6 lines
meta/recipes-bsp/grub/grub-efi-native_2.00.bb +1
-5- -# FIXME: We should be able to optionally drop freetype as a dependency -DEPENDS = "autogen-native" -RDEPENDS_${PN} = "diffutils freetype" -PR = "r2" +PR = "${INC_PR}.0"Don't need the
INC_PRQuoted 80 lines
# Native packages do not normally rebuild when the target changes. # Ensure this is built once per HOST-TARGET pair. PN := "grub-efi-${TRANSLATED_TARGET_ARCH}-native"meta/recipes-bsp/grub/grub-efi-native_2.00.bb +0
-12-SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ - file://cfg \ - file://grub-2.00-fpmath-sse-387-fix.patch \ - file://grub-2.00-fix-enable_execute_stack-check.patch \ - file://grub-2.00-disable-help2man.patch \ - file://check-if-liblzma-is-disabled.patch \ - file://grub-no-unused-result.patch \ - file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ - file://fix-issue-with-flex-2.5.37.patch \ - " -SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" -SRC_URI[sha256sum] ="
65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"meta/recipes-bsp/grub/grub-efi-native_2.00.bb +0
-5- -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' - -S = "${WORKDIR}/grub-${PV}" - # Determine the target arch for the grub modules before the nativeclass
meta/recipes-bsp/grub/grub-efi-native_2.00.bb +5
-11-# clobbers TARGET_ARCH. +# clobbers TARGET_ARCH and STAGING_LIBDIR. ORIG_TARGET_ARCH := "${TARGET_ARCH}" +ORIG_STAGING_LIBDIR := "${STAGING_LIBDIR}" python __anonymous () { import re target = d.getVar('ORIG_TARGET_ARCH', True)@@ -57,19 +30,14 @@ python __anonymous () { d.setVar("GRUB_IMAGE", grubimage) } -inherit autotools -inherit gettext inherit native inherit deploy -EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \ - --target=${GRUB_TARGET} --enable-efiemu=no --program-prefix='' \ - --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" - do_mkimage() { # 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/ \ + # built in cfg file provided via this recipe and modules dir + # populated by grub-efi + ./grub-mkimage -c ../cfg -p /EFI/BOOT -d ${ORIG_STAGING_LIBDIR}/grub-efi/${GRUB_TARGET}-efi \ -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \ boot linux ext2 fat serial part_msdos part_gptnormal
efi_gopiso9660 search
}meta/recipes-bsp/grub/grub-efi.inc new file +14
-0@@ -0,0 +1,42 @@ +SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader" + +DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \ +intended to unify bootloading across x86 operating systems. In \ +addition to loading the Linux kernel, it implements the Multiboot \ +standard, which allows for flexible loading of multiple boot images. \ +This recipe builds an EFI binary for the target. It does not install \ +or package anything, it only deploys a target-arch GRUB EFI image." + +HOMEPAGE = "http://www.gnu.org/software/grub/" +SECTION = "bootloaders" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM ="file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
meta/recipes-bsp/grub/grub-efi.inc line 19
Quoted 5 lines
meta/recipes-bsp/grub/grub-efi.inc new file +5
-0+ +# FIXME: We should be able to optionally drop freetype as a dependency +DEPENDS = "autogen-native flex-native" +INC_PR = "r2" +Should just be PR = "r2" and shared by both.
Quoted 32 lines
meta/recipes-bsp/grub/grub-efi.inc new file +12
-0+SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ + file://cfg \ + file://grub-2.00-fpmath-sse-387-fix.patch \ + file://grub-2.00-fix-enable_execute_stack-check.patch \ + file://grub-2.00-disable-help2man.patch \ + file://check-if-liblzma-is-disabled.patch \ + file://grub-no-unused-result.patch \ + file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ + file://fix-issue-with-flex-2.5.37.patch \ + " +SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" +SRC_URI[sha256sum] ="
65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"meta/recipes-bsp/grub/grub-efi.inc new file +11
-1+ +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' + +S = "${WORKDIR}/grub-${PV}" + +inherit autotools +inherit gettext + +EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \ + --enable-efiemu=no --program-prefix='' \ + --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no"meta/recipes-bsp/grub/grub-efi_2.00.bb new file +0
-0meta/recipes-bsp/grub/grub-efi_2.00.bb line 5
Quoted 5 lines
meta/recipes-bsp/grub/grub-efi_2.00.bb new file +5
-0@@ -0,0 +1,11 @@ +require grub-efi.inc + +RDEPENDS_${PN} = "diffutils freetype" + +PR = "${INC_PR}.0"I am not sure you need to extend PR here since we are working to get rid of PR in general, just leave the PR="r2" in the new .inc file.
Quoted 6 lines
meta/recipes-bsp/grub/grub-efi_2.00.bb line 7
Quoted 2 lines
meta/recipes-bsp/grub/grub-efi_2.00.bb new file +2
-0+FILES_${PN}-dbg += "${libdir}/${BPN}/${TARGET_ARCH}-efi/.debug" +I am not sure if this is doing the right thing, as I am getting QA errors regarding where debug files are going, but this may need to be GRUB-TARGET. This is just an example of one:
Yes, you are right, the
TARGET_ARCHis not correct for this, I will fix this and the PR issue, thanks!Thanks,
JackieQuoted 16 lines
ERROR: QA Issue: non debug package contains .debug directory: grub-efi
path /work/core2-poky-linux/grub-efi/2.00-r2.0/packages-split/grub-efi/usr/lib/grub-efi/i386-efi/.debug/part_bsd.moduleERROR: QA run found fatal errors. Please consider fixing them.
ERROR: Function failed:do_package_qaQuoted 5 lines
meta/recipes-bsp/grub/grub-efi_2.00.bb new file +4
-0+do_install_append () { + mv ${D}${libdir}/grub ${D}${libdir}/${BPN} + mv ${D}${datadir}/grub ${D}${datadir}/${BPN} +}
Signature · 5 lines
Jackie Huang WIND RIVER | China Development Center MSN:[email protected] Tel: +86 8477 8594 Mobile: +86 138 1027 4745