diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-bsp/grub | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub')
-rw-r--r-- | meta/recipes-bsp/grub/grub-bootconf_1.00.bb | 4 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub-efi_2.06.bb | 14 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 16 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub_2.06.bb | 22 |
4 files changed, 28 insertions, 28 deletions
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 \ | |||
5 | different machines." | 5 | different machines." |
6 | HOMEPAGE = "https://www.gnu.org/software/grub/manual/grub/grub.html#Configuration" | 6 | HOMEPAGE = "https://www.gnu.org/software/grub/manual/grub/grub.html#Configuration" |
7 | 7 | ||
8 | RPROVIDES_${PN} += "virtual/grub-bootconf" | 8 | RPROVIDES:${PN} += "virtual/grub-bootconf" |
9 | 9 | ||
10 | inherit grub-efi-cfg | 10 | inherit grub-efi-cfg |
11 | 11 | ||
@@ -29,4 +29,4 @@ do_install() { | |||
29 | install grub-bootconf ${D}${EFI_FILES_PATH}/grub.cfg | 29 | install grub-bootconf ${D}${EFI_FILES_PATH}/grub.cfg |
30 | } | 30 | } |
31 | 31 | ||
32 | FILES_${PN} = "${EFI_FILES_PATH}/grub.cfg" | 32 | 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 | |||
4 | 4 | ||
5 | GRUBPLATFORM = "efi" | 5 | GRUBPLATFORM = "efi" |
6 | 6 | ||
7 | DEPENDS_append = " grub-native" | 7 | DEPENDS:append = " grub-native" |
8 | RDEPENDS_${PN} = "grub-common virtual/grub-bootconf" | 8 | RDEPENDS:${PN} = "grub-common virtual/grub-bootconf" |
9 | 9 | ||
10 | SRC_URI += " \ | 10 | SRC_URI += " \ |
11 | file://cfg \ | 11 | file://cfg \ |
@@ -79,13 +79,13 @@ do_deploy() { | |||
79 | 79 | ||
80 | addtask deploy after do_install before do_build | 80 | addtask deploy after do_install before do_build |
81 | 81 | ||
82 | FILES_${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \ | 82 | FILES:${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \ |
83 | ${datadir}/grub \ | 83 | ${datadir}/grub \ |
84 | ${EFI_FILES_PATH}/${GRUB_IMAGE} \ | 84 | ${EFI_FILES_PATH}/${GRUB_IMAGE} \ |
85 | " | 85 | " |
86 | 86 | ||
87 | # 64-bit binaries are expected for the bootloader with an x32 userland | 87 | # 64-bit binaries are expected for the bootloader with an x32 userland |
88 | INSANE_SKIP_${PN}_append_linux-gnux32 = " arch" | 88 | INSANE_SKIP:${PN}:append:linux-gnux32 = " arch" |
89 | INSANE_SKIP_${PN}-dbg_append_linux-gnux32 = " arch" | 89 | INSANE_SKIP:${PN}-dbg:append:linux-gnux32 = " arch" |
90 | INSANE_SKIP_${PN}_append_linux-muslx32 = " arch" | 90 | INSANE_SKIP:${PN}:append:linux-muslx32 = " arch" |
91 | INSANE_SKIP_${PN}-dbg_append_linux-muslx32 = " arch" | 91 | 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" | |||
30 | DEPENDS = "flex-native bison-native gettext-native" | 30 | DEPENDS = "flex-native bison-native gettext-native" |
31 | 31 | ||
32 | COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|riscv.*)-(linux.*|freebsd.*)' | 32 | COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|riscv.*)-(linux.*|freebsd.*)' |
33 | COMPATIBLE_HOST_armv7a = 'null' | 33 | COMPATIBLE_HOST:armv7a = 'null' |
34 | COMPATIBLE_HOST_armv7ve = 'null' | 34 | COMPATIBLE_HOST:armv7ve = 'null' |
35 | 35 | ||
36 | # configure.ac has code to set this automagically from the target tuple | 36 | # configure.ac has code to set this automagically from the target tuple |
37 | # but the OE freeform one (core2-foo-bar-linux) don't work with that. | 37 | # but the OE freeform one (core2-foo-bar-linux) don't work with that. |
38 | 38 | ||
39 | GRUBPLATFORM_arm = "efi" | 39 | GRUBPLATFORM:arm = "efi" |
40 | GRUBPLATFORM_aarch64 = "efi" | 40 | GRUBPLATFORM:aarch64 = "efi" |
41 | GRUBPLATFORM_riscv32 = "efi" | 41 | GRUBPLATFORM:riscv32 = "efi" |
42 | GRUBPLATFORM_riscv64 = "efi" | 42 | GRUBPLATFORM:riscv64 = "efi" |
43 | GRUBPLATFORM ??= "pc" | 43 | GRUBPLATFORM ??= "pc" |
44 | 44 | ||
45 | inherit autotools gettext texinfo pkgconfig | 45 | inherit autotools gettext texinfo pkgconfig |
46 | 46 | ||
47 | CFLAGS_remove = "-O2" | 47 | CFLAGS:remove = "-O2" |
48 | 48 | ||
49 | EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} \ | 49 | EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} \ |
50 | --disable-grub-mkfont \ | 50 | --disable-grub-mkfont \ |
@@ -70,7 +70,7 @@ BUILD_LDFLAGS = "" | |||
70 | 70 | ||
71 | export PYTHON = "python3" | 71 | export PYTHON = "python3" |
72 | 72 | ||
73 | do_configure_prepend() { | 73 | do_configure:prepend() { |
74 | cd ${S} | 74 | cd ${S} |
75 | FROM_BOOTSTRAP=1 ${S}/autogen.sh | 75 | FROM_BOOTSTRAP=1 ${S}/autogen.sh |
76 | cd ${B} | 76 | 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 @@ | |||
1 | require grub2.inc | 1 | require grub2.inc |
2 | 2 | ||
3 | RDEPENDS_${PN}-common += "${PN}-editenv" | 3 | RDEPENDS:${PN}-common += "${PN}-editenv" |
4 | RDEPENDS_${PN} += "${PN}-common" | 4 | RDEPENDS:${PN} += "${PN}-common" |
5 | RDEPENDS_${PN}_class-native = "" | 5 | RDEPENDS:${PN}:class-native = "" |
6 | 6 | ||
7 | RPROVIDES_${PN}-editenv += "${PN}-efi-editenv" | 7 | RPROVIDES:${PN}-editenv += "${PN}-efi-editenv" |
8 | 8 | ||
9 | PROVIDES_append_class-native = " grub-efi-native" | 9 | PROVIDES:append:class-native = " grub-efi-native" |
10 | 10 | ||
11 | PACKAGES =+ "${PN}-editenv ${PN}-common" | 11 | PACKAGES =+ "${PN}-editenv ${PN}-common" |
12 | FILES_${PN}-editenv = "${bindir}/grub-editenv" | 12 | FILES:${PN}-editenv = "${bindir}/grub-editenv" |
13 | FILES_${PN}-common = " \ | 13 | FILES:${PN}-common = " \ |
14 | ${bindir} \ | 14 | ${bindir} \ |
15 | ${sysconfdir} \ | 15 | ${sysconfdir} \ |
16 | ${sbindir} \ | 16 | ${sbindir} \ |
17 | ${datadir}/grub \ | 17 | ${datadir}/grub \ |
18 | " | 18 | " |
19 | ALLOW_EMPTY_${PN} = "1" | 19 | ALLOW_EMPTY:${PN} = "1" |
20 | 20 | ||
21 | do_install_append () { | 21 | do_install:append () { |
22 | # Avoid conflicts with the EFI package for systems such as arm64 where we | 22 | # Avoid conflicts with the EFI package for systems such as arm64 where we |
23 | # need to build grub and grub-efi but only EFI is supported by removing EFI | 23 | # need to build grub and grub-efi but only EFI is supported by removing EFI |
24 | # from this package. | 24 | # from this package. |
@@ -35,7 +35,7 @@ do_install_append () { | |||
35 | {} + | 35 | {} + |
36 | } | 36 | } |
37 | 37 | ||
38 | INSANE_SKIP_${PN} = "arch" | 38 | INSANE_SKIP:${PN} = "arch" |
39 | INSANE_SKIP_${PN}-dbg = "arch" | 39 | INSANE_SKIP:${PN}-dbg = "arch" |
40 | 40 | ||
41 | BBCLASSEXTEND = "native nativesdk" | 41 | BBCLASSEXTEND = "native nativesdk" |