summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@bootlin.com>2021-09-01 11:20:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-01 18:48:47 +0100
commite6365c9f52041e72ba667258384b988d9cb87ce3 (patch)
treebabb528dbe0389b6bbc32c04fa97a988bb29d428
parent1326991282e7cec57bc8e19377e2c376cf267f67 (diff)
downloadpoky-e6365c9f52041e72ba667258384b988d9cb87ce3.tar.gz
meta: stop using "virtual/" in RPROVIDES and RDEPENDS
Fixes [YOCTO #14538] Recipes shouldn't use the "virtual/" string in RPROVIDES and RDEPENDS. That's confusing because "virtual/" has no special meaning in RPROVIDES and RDEPENDS (unlike in PROVIDES and DEPENDS). Instead, using "virtual-" instead of "virtual/" as already done in the glibc recipe. (From OE-Core rev: 93ac180d8c389f16964bce8bd5538d9389e970e6) Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/grub/grub-bootconf_1.00.bb2
-rw-r--r--meta/recipes-bsp/grub/grub-efi_2.06.bb2
-rw-r--r--meta/recipes-core/systemd/systemd-boot_249.3.bb2
-rw-r--r--meta/recipes-core/systemd/systemd-bootconf_1.00.bb2
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-bsp/grub/grub-bootconf_1.00.bb b/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
index 151e601fd2..783e30bf38 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 \
5different machines." 5different machines."
6HOMEPAGE = "https://www.gnu.org/software/grub/manual/grub/grub.html#Configuration" 6HOMEPAGE = "https://www.gnu.org/software/grub/manual/grub/grub.html#Configuration"
7 7
8RPROVIDES:${PN} += "virtual/grub-bootconf" 8RPROVIDES:${PN} += "virtual-grub-bootconf"
9 9
10inherit grub-efi-cfg 10inherit grub-efi-cfg
11 11
diff --git a/meta/recipes-bsp/grub/grub-efi_2.06.bb b/meta/recipes-bsp/grub/grub-efi_2.06.bb
index 96e9df88b6..a8cc209a02 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.06.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.06.bb
@@ -5,7 +5,7 @@ require conf/image-uefi.conf
5GRUBPLATFORM = "efi" 5GRUBPLATFORM = "efi"
6 6
7DEPENDS:append = " grub-native" 7DEPENDS:append = " grub-native"
8RDEPENDS:${PN} = "grub-common virtual/grub-bootconf" 8RDEPENDS:${PN} = "grub-common virtual-grub-bootconf"
9 9
10SRC_URI += " \ 10SRC_URI += " \
11 file://cfg \ 11 file://cfg \
diff --git a/meta/recipes-core/systemd/systemd-boot_249.3.bb b/meta/recipes-core/systemd/systemd-boot_249.3.bb
index af2be162a3..b3d4e31e08 100644
--- a/meta/recipes-core/systemd/systemd-boot_249.3.bb
+++ b/meta/recipes-core/systemd/systemd-boot_249.3.bb
@@ -46,7 +46,7 @@ python __anonymous () {
46 46
47FILES:${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}" 47FILES:${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}"
48 48
49RDEPENDS:${PN} += "virtual/systemd-bootconf" 49RDEPENDS:${PN} += "virtual-systemd-bootconf"
50 50
51# Imported from the old gummiboot recipe 51# Imported from the old gummiboot recipe
52TUNE_CCARGS:remove = "-mfpmath=sse" 52TUNE_CCARGS:remove = "-mfpmath=sse"
diff --git a/meta/recipes-core/systemd/systemd-bootconf_1.00.bb b/meta/recipes-core/systemd/systemd-bootconf_1.00.bb
index 12c4447f37..19637546a9 100644
--- a/meta/recipes-core/systemd/systemd-bootconf_1.00.bb
+++ b/meta/recipes-core/systemd/systemd-bootconf_1.00.bb
@@ -2,7 +2,7 @@ LICENSE = "MIT"
2LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 2LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
3SUMMARY = "Basic systemd-boot configuration files" 3SUMMARY = "Basic systemd-boot configuration files"
4 4
5RPROVIDES:${PN} += "virtual/systemd-bootconf" 5RPROVIDES:${PN} += "virtual-systemd-bootconf"
6PACKAGE_ARCH = "${MACHINE_ARCH}" 6PACKAGE_ARCH = "${MACHINE_ARCH}"
7 7
8inherit systemd-boot-cfg 8inherit systemd-boot-cfg