Do not change anything unless it is one of our machines. COMPATILBE_MACHINE was not required here.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-bsp/grub/grub-efi_2.%.bbappend | 24 ++++++++++++------- .../recipes-bsp/grub/grub_2.%.bbappend | 11 ++++++--- 2 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/meta-morello/recipes-bsp/grub/grub-efi_2.%.bbappend b/meta-morello/recipes-bsp/grub/grub-efi_2.%.bbappend index c03b87c..204c1d2 100644 --- a/meta-morello/recipes-bsp/grub/grub-efi_2.%.bbappend +++ b/meta-morello/recipes-bsp/grub/grub-efi_2.%.bbappend @@ -1,22 +1,30 @@ -inherit deploy nopackages
-COMPATIBLE_MACHINE = "morello" -OUTPUTS_NAME = "grub-efi"
-PROVIDES += "virtual/${OUTPUTS_NAME}" +OUTPUTS_NAME = "grub-efi"
FILESEXTRAPATHS:prepend := "${THISDIR}:"
-GRUB_BUILDIN = " boot chain configfile ext2 fat gzio help linux loadenv \ +GRUB_BUILDIN:morello-soc = " boot chain configfile ext2 fat gzio help linux loadenv \ + lsefi normal ntfs ntfscomp part_gpt part_msdos progress read search \ + search_fs_file search_fs_uuid search_label terminal terminfo \ + " + +GRUB_BUILDIN:morello-fvp = " boot chain configfile ext2 fat gzio help linux loadenv \ lsefi normal ntfs ntfscomp part_gpt part_msdos progress read search \ search_fs_file search_fs_uuid search_label terminal terminfo \ "
-SRC_URI += "file://files/grub-config.cfg" +SRC_URI:append:morello-soc = " file://files/grub-config.cfg" +SRC_URI:append:morello-fvp = " file://files/grub-config.cfg" + +do_deploy:append:morello-soc() { + install -d ${DEPLOYDIR}/${OUTPUTS_NAME} + install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} "${DEPLOYDIR}/${OUTPUTS_NAME}/" + install -m 644 ${WORKDIR}/files/grub-config.cfg "${DEPLOYDIR}/${OUTPUTS_NAME}/grub-config.cfg" +}
-do_deploy() { +do_deploy:append:morello-fvp() { install -d ${DEPLOYDIR}/${OUTPUTS_NAME} install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} "${DEPLOYDIR}/${OUTPUTS_NAME}/" install -m 644 ${WORKDIR}/files/grub-config.cfg "${DEPLOYDIR}/${OUTPUTS_NAME}/grub-config.cfg" } -addtask deploy after do_install before do_build \ No newline at end of file diff --git a/meta-morello/recipes-bsp/grub/grub_2.%.bbappend b/meta-morello/recipes-bsp/grub/grub_2.%.bbappend index a2f232d..05b8f42 100644 --- a/meta-morello/recipes-bsp/grub/grub_2.%.bbappend +++ b/meta-morello/recipes-bsp/grub/grub_2.%.bbappend @@ -1,10 +1,15 @@
-EXTRA_OECONF+="\ +EXTRA_OECONF:append:morello-soc ="\ + --disable-efiemu \ + --enable-dependency-tracking \ + --disable-grub-themes \ + --disable-grub-mount \ + " + +EXTRA_OECONF:append:morello-fvp ="\ --disable-efiemu \ - --disable-werror \ --enable-dependency-tracking \ - --disable-grub-mkfont \ --disable-grub-themes \ --disable-grub-mount \ " \ No newline at end of file