From bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 28 Jul 2021 23:28:15 +0100 Subject: Convert to new override syntax This is the result of automated script conversion: scripts/contrib/convert-overrides.py converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie --- meta/recipes-bsp/grub/grub-bootconf_1.00.bb | 4 ++-- meta/recipes-bsp/grub/grub-efi_2.06.bb | 14 +++++++------- meta/recipes-bsp/grub/grub2.inc | 16 ++++++++-------- meta/recipes-bsp/grub/grub_2.06.bb | 22 +++++++++++----------- 4 files changed, 28 insertions(+), 28 deletions(-) (limited to 'meta/recipes-bsp/grub') diff --git a/meta/recipes-bsp/grub/grub-bootconf_1.00.bb b/meta/recipes-bsp/grub/grub-bootconf_1.00.bb index 572580313b..151e601fd2 100644 --- a/meta/recipes-bsp/grub/grub-bootconf_1.00.bb +++ b/meta/recipes-bsp/grub/grub-bootconf_1.00.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Grub might require different configuration file for \ different machines." HOMEPAGE = "https://www.gnu.org/software/grub/manual/grub/grub.html#Configuration" -RPROVIDES_${PN} += "virtual/grub-bootconf" +RPROVIDES:${PN} += "virtual/grub-bootconf" inherit grub-efi-cfg @@ -29,4 +29,4 @@ do_install() { install grub-bootconf ${D}${EFI_FILES_PATH}/grub.cfg } -FILES_${PN} = "${EFI_FILES_PATH}/grub.cfg" +FILES:${PN} = "${EFI_FILES_PATH}/grub.cfg" diff --git a/meta/recipes-bsp/grub/grub-efi_2.06.bb b/meta/recipes-bsp/grub/grub-efi_2.06.bb index 287845c507..96e9df88b6 100644 --- a/meta/recipes-bsp/grub/grub-efi_2.06.bb +++ b/meta/recipes-bsp/grub/grub-efi_2.06.bb @@ -4,8 +4,8 @@ require conf/image-uefi.conf GRUBPLATFORM = "efi" -DEPENDS_append = " grub-native" -RDEPENDS_${PN} = "grub-common virtual/grub-bootconf" +DEPENDS:append = " grub-native" +RDEPENDS:${PN} = "grub-common virtual/grub-bootconf" SRC_URI += " \ file://cfg \ @@ -79,13 +79,13 @@ do_deploy() { addtask deploy after do_install before do_build -FILES_${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \ +FILES:${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \ ${datadir}/grub \ ${EFI_FILES_PATH}/${GRUB_IMAGE} \ " # 64-bit binaries are expected for the bootloader with an x32 userland -INSANE_SKIP_${PN}_append_linux-gnux32 = " arch" -INSANE_SKIP_${PN}-dbg_append_linux-gnux32 = " arch" -INSANE_SKIP_${PN}_append_linux-muslx32 = " arch" -INSANE_SKIP_${PN}-dbg_append_linux-muslx32 = " arch" +INSANE_SKIP:${PN}:append:linux-gnux32 = " arch" +INSANE_SKIP:${PN}-dbg:append:linux-gnux32 = " arch" +INSANE_SKIP:${PN}:append:linux-muslx32 = " arch" +INSANE_SKIP:${PN}-dbg:append:linux-muslx32 = " arch" diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index 19294760c4..bb791347dc 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc @@ -30,21 +30,21 @@ CVE_CHECK_WHITELIST += "CVE-2019-14865" DEPENDS = "flex-native bison-native gettext-native" COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|riscv.*)-(linux.*|freebsd.*)' -COMPATIBLE_HOST_armv7a = 'null' -COMPATIBLE_HOST_armv7ve = 'null' +COMPATIBLE_HOST:armv7a = 'null' +COMPATIBLE_HOST:armv7ve = 'null' # configure.ac has code to set this automagically from the target tuple # but the OE freeform one (core2-foo-bar-linux) don't work with that. -GRUBPLATFORM_arm = "efi" -GRUBPLATFORM_aarch64 = "efi" -GRUBPLATFORM_riscv32 = "efi" -GRUBPLATFORM_riscv64 = "efi" +GRUBPLATFORM:arm = "efi" +GRUBPLATFORM:aarch64 = "efi" +GRUBPLATFORM:riscv32 = "efi" +GRUBPLATFORM:riscv64 = "efi" GRUBPLATFORM ??= "pc" inherit autotools gettext texinfo pkgconfig -CFLAGS_remove = "-O2" +CFLAGS:remove = "-O2" EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} \ --disable-grub-mkfont \ @@ -70,7 +70,7 @@ BUILD_LDFLAGS = "" export PYTHON = "python3" -do_configure_prepend() { +do_configure:prepend() { cd ${S} FROM_BOOTSTRAP=1 ${S}/autogen.sh cd ${B} diff --git a/meta/recipes-bsp/grub/grub_2.06.bb b/meta/recipes-bsp/grub/grub_2.06.bb index d4e09faa40..05d462785c 100644 --- a/meta/recipes-bsp/grub/grub_2.06.bb +++ b/meta/recipes-bsp/grub/grub_2.06.bb @@ -1,24 +1,24 @@ require grub2.inc -RDEPENDS_${PN}-common += "${PN}-editenv" -RDEPENDS_${PN} += "${PN}-common" -RDEPENDS_${PN}_class-native = "" +RDEPENDS:${PN}-common += "${PN}-editenv" +RDEPENDS:${PN} += "${PN}-common" +RDEPENDS:${PN}:class-native = "" -RPROVIDES_${PN}-editenv += "${PN}-efi-editenv" +RPROVIDES:${PN}-editenv += "${PN}-efi-editenv" -PROVIDES_append_class-native = " grub-efi-native" +PROVIDES:append:class-native = " grub-efi-native" PACKAGES =+ "${PN}-editenv ${PN}-common" -FILES_${PN}-editenv = "${bindir}/grub-editenv" -FILES_${PN}-common = " \ +FILES:${PN}-editenv = "${bindir}/grub-editenv" +FILES:${PN}-common = " \ ${bindir} \ ${sysconfdir} \ ${sbindir} \ ${datadir}/grub \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -do_install_append () { +do_install:append () { # Avoid conflicts with the EFI package for systems such as arm64 where we # need to build grub and grub-efi but only EFI is supported by removing EFI # from this package. @@ -35,7 +35,7 @@ do_install_append () { {} + } -INSANE_SKIP_${PN} = "arch" -INSANE_SKIP_${PN}-dbg = "arch" +INSANE_SKIP:${PN} = "arch" +INSANE_SKIP:${PN}-dbg = "arch" BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf