diff options
Diffstat (limited to 'poky/meta/recipes-bsp')
| -rw-r--r-- | poky/meta/recipes-bsp/grub/grub-efi_2.06.bb | 15 | ||||
| -rw-r--r-- | poky/meta/recipes-bsp/grub/grub2.inc | 2 | ||||
| -rw-r--r-- | poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb | 2 | ||||
| -rw-r--r-- | poky/meta/recipes-bsp/usbutils/usbutils_014.bb | 3 |
4 files changed, 18 insertions, 4 deletions
diff --git a/poky/meta/recipes-bsp/grub/grub-efi_2.06.bb b/poky/meta/recipes-bsp/grub/grub-efi_2.06.bb index df5f23e22e..9857e8e036 100644 --- a/poky/meta/recipes-bsp/grub/grub-efi_2.06.bb +++ b/poky/meta/recipes-bsp/grub/grub-efi_2.06.bb @@ -46,11 +46,21 @@ EXTRA_OECONF += "--enable-efiemu=no" do_mkimage() { cd ${B} + + GRUB_MKIMAGE_MODULES="${GRUB_BUILDIN}" + + # If 'all' is included in GRUB_BUILDIN we will include all available grub2 modules + if [ "${@ bb.utils.contains('GRUB_BUILDIN', 'all', 'True', 'False', d)}" = "True" ]; then + bbdebug 1 "Including all available modules" + # Get the list of all .mod files in grub-core build directory + GRUB_MKIMAGE_MODULES=$(find ${B}/grub-core/ -type f -name "*.mod" -exec basename {} .mod \;) + fi + # 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 ${EFIDIR} -d ./grub-core/ \ + grub-mkimage -v -c ../cfg -p ${EFIDIR} -d ./grub-core/ \ -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} \ - ${GRUB_BUILDIN} + ${GRUB_MKIMAGE_MODULES} } addtask mkimage before do_install after do_compile @@ -70,6 +80,7 @@ do_install() { install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} ${D}${EFI_FILES_PATH}/${GRUB_IMAGE} } +# To include all available modules, add 'all' to GRUB_BUILDIN GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \ efi_gop iso9660 configfile search loadenv test" diff --git a/poky/meta/recipes-bsp/grub/grub2.inc b/poky/meta/recipes-bsp/grub/grub2.inc index ba0596c938..45852ab9b1 100644 --- a/poky/meta/recipes-bsp/grub/grub2.inc +++ b/poky/meta/recipes-bsp/grub/grub2.inc @@ -28,6 +28,8 @@ SRC_URI[sha256sum] = "23b64b4c741569f9426ed2e3d0e6780796fca081bee4c99f62aa3f53ae # Applies only to RHEL CVE_CHECK_IGNORE += "CVE-2019-14865" +# Applies only to SUSE +CVE_CHECK_IGNORE += "CVE-2021-46705" DEPENDS = "flex-native bison-native gettext-native" diff --git a/poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb b/poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb index fa9e3d4894..6d4be76bab 100644 --- a/poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb +++ b/poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb @@ -22,7 +22,7 @@ UPSTREAM_CHECK_URI = "http://www.ngolde.de/libacpi.html" inherit lib_package -COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)' +COMPATIBLE_HOST = '(x86_64|i.86|aarch64).*-(linux|freebsd.*)' CFLAGS += "-fPIC" EXTRA_OEMAKE = '-e MAKEFLAGS= STRIP="echo"' diff --git a/poky/meta/recipes-bsp/usbutils/usbutils_014.bb b/poky/meta/recipes-bsp/usbutils/usbutils_014.bb index 828eb4d36f..e728f1a190 100644 --- a/poky/meta/recipes-bsp/usbutils/usbutils_014.bb +++ b/poky/meta/recipes-bsp/usbutils/usbutils_014.bb @@ -20,7 +20,8 @@ inherit autotools pkgconfig update-alternatives ALTERNATIVE:${PN} = "lsusb" ALTERNATIVE_PRIORITY = "100" -# The binaries are mostly GPLv2+ apart from lsusb.py which is GPLv2 or v3. +# The binaries are mostly GPL-2.0-or-later apart from lsusb.py which is +# GPL-2.0-only or GPL-3.0-only. LICENSE:${PN} = "GPL-2.0-or-later" LICENSE:${PN}-python = "GPL-2.0-only | GPL-3.0-only" |