diff mbox series

meta: stop using "virtual-" in RPROVIDES and RDEPENDS

Message ID 20240210113612.525615-1-simone.p.weiss@posteo.com
State Rejected, archived
Headers show
Series meta: stop using "virtual-" in RPROVIDES and RDEPENDS | expand

Commit Message

Simone Weiß Feb. 10, 2024, 11:36 a.m. UTC 
From: Simone Weiß <simone.p.weiss@posteo.com>

Instead of using "virtual-" use "VIRTUAL-RUNTIME_" as recommended
in insane.bbclass for RPROVIDES and RDEPENDS.

Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com>
---
 meta/recipes-bsp/grub/grub-bootconf_1.00.bb        | 2 +-
 meta/recipes-bsp/grub/grub-efi_2.12.bb             | 2 +-
 meta/recipes-core/glibc/glibc-package.inc          | 2 +-
 meta/recipes-core/musl/musl_git.bb                 | 2 +-
 meta/recipes-core/systemd/systemd-boot_255.1.bb    | 2 +-
 meta/recipes-core/systemd/systemd-bootconf_1.00.bb | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

Comments

Richard Purdie Feb. 10, 2024, 2:38 p.m. UTC | #1 
On Sat, 2024-02-10 at 11:36 +0000, Simone Weiß wrote:
> From: Simone Weiß <simone.p.weiss@posteo.com>
> 
> Instead of using "virtual-" use "VIRTUAL-RUNTIME_" as recommended
> in insane.bbclass for RPROVIDES and RDEPENDS.
> 
> Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com>
> ---
>  meta/recipes-bsp/grub/grub-bootconf_1.00.bb        | 2 +-
>  meta/recipes-bsp/grub/grub-efi_2.12.bb             | 2 +-
>  meta/recipes-core/glibc/glibc-package.inc          | 2 +-
>  meta/recipes-core/musl/musl_git.bb                 | 2 +-
>  meta/recipes-core/systemd/systemd-boot_255.1.bb    | 2 +-
>  meta/recipes-core/systemd/systemd-bootconf_1.00.bb | 2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/meta/recipes-bsp/grub/grub-bootconf_1.00.bb b/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
> index 783e30bf38..33a4517e5b 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-RUNTIME_grub-bootconf"
>  
>  inherit grub-efi-cfg
>  
> diff --git a/meta/recipes-bsp/grub/grub-efi_2.12.bb b/meta/recipes-bsp/grub/grub-efi_2.12.bb
> index 9857e8e036..078a59a465 100644
> --- a/meta/recipes-bsp/grub/grub-efi_2.12.bb
> +++ b/meta/recipes-bsp/grub/grub-efi_2.12.bb
> @@ -5,7 +5,7 @@ require conf/image-uefi.conf
>  GRUBPLATFORM = "efi"
>  
>  DEPENDS:append = " grub-native"
> -RDEPENDS:${PN} = "grub-common virtual-grub-bootconf"
> +RDEPENDS:${PN} = "grub-common VIRTUAL-RUNTIME_grub-bootconf"
>  
>  SRC_URI += " \
>             file://cfg \
> diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
> index 1ef987be0a..8846934b25 100644
> --- a/meta/recipes-core/glibc/glibc-package.inc
> +++ b/meta/recipes-core/glibc/glibc-package.inc
> @@ -7,7 +7,7 @@ RPROVIDES:${PN} = "eglibc rtld(GNU_HASH)"
>  RPROVIDES:${PN}-utils = "eglibc-utils"
>  RPROVIDES:${PN}-mtrace = "eglibc-mtrace libc-mtrace"
>  RPROVIDES:${PN}-pic = "eglibc-pic"
> -RPROVIDES:${PN}-dev = "eglibc-dev libc6-dev virtual-libc-dev"
> +RPROVIDES:${PN}-dev = "eglibc-dev libc6-dev VIRTUAL-RUNTIME_libc-dev"
>  RPROVIDES:${PN}-staticdev = "eglibc-staticdev"
>  RPROVIDES:${PN}-doc = "eglibc-doc"
>  RPROVIDES:glibc-extra-nss = "eglibc-extra-nss"
> diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
> index 324269a968..54df0de913 100644
> --- a/meta/recipes-core/musl/musl_git.bb
> +++ b/meta/recipes-core/musl/musl_git.bb
> @@ -76,7 +76,7 @@ FILES:${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \
>                     "
>  
>  RDEPENDS:${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev"
> -RPROVIDES:${PN}-dev += "libc-dev virtual-libc-dev"
> +RPROVIDES:${PN}-dev += "libc-dev VIRTUAL-RUNTIME_libc-dev"
>  RPROVIDES:${PN} += "ldd rtld(GNU_HASH)"
>  
>  LEAD_SONAME = "libc.so"
> diff --git a/meta/recipes-core/systemd/systemd-boot_255.1.bb b/meta/recipes-core/systemd/systemd-boot_255.1.bb
> index 4ee25ee72f..32495c883d 100644
> --- a/meta/recipes-core/systemd/systemd-boot_255.1.bb
> +++ b/meta/recipes-core/systemd/systemd-boot_255.1.bb
> @@ -45,7 +45,7 @@ python __anonymous () {
>  
>  FILES:${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}"
>  
> -RDEPENDS:${PN} += "virtual-systemd-bootconf"
> +RDEPENDS:${PN} += "VIRTUAL-RUNTIME_systemd-bootconf"
>  
>  CFLAGS:append:libc-musl = " -D__DEFINED_wchar_t"
>  
> diff --git a/meta/recipes-core/systemd/systemd-bootconf_1.00.bb b/meta/recipes-core/systemd/systemd-bootconf_1.00.bb
> index 19637546a9..5017b256e7 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"
>  LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
>  SUMMARY = "Basic systemd-boot configuration files"
>  
> -RPROVIDES:${PN} += "virtual-systemd-bootconf"
> +RPROVIDES:${PN} += "VIRTUAL-RUNTIME_systemd-bootconf"
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
>  
>  inherit systemd-boot-cfg

I appreciate the intent here but I'm not sure this is quite right.

Most of the usage of VIRTUAL-RUNTIME is done as variable substitution
so ${VIRTUAL-RUNTIME_XXX} and then declared somewhere.

These cases of virtual-XXX are simple enough they don't require that. I
think the patch could therefore add more confusion rather than improve
things.

Cheers,

Richard
Simone Weiß Feb. 10, 2024, 3:05 p.m. UTC | #2 
On Sat, 2024-02-10 at 14:38 +0000, Richard Purdie wrote:
> On Sat, 2024-02-10 at 11:36 +0000, Simone Weiß wrote:
> > From: Simone Weiß <simone.p.weiss@posteo.com>
> > 
> > Instead of using "virtual-" use "VIRTUAL-RUNTIME_" as recommended
> > in insane.bbclass for RPROVIDES and RDEPENDS.
> > 
> > Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com>
> > ---
> >  meta/recipes-bsp/grub/grub-bootconf_1.00.bb        | 2 +-
> >  meta/recipes-bsp/grub/grub-efi_2.12.bb             | 2 +-
> >  meta/recipes-core/glibc/glibc-package.inc          | 2 +-
> >  meta/recipes-core/musl/musl_git.bb                 | 2 +-
> >  meta/recipes-core/systemd/systemd-boot_255.1.bb    | 2 +-
> >  meta/recipes-core/systemd/systemd-bootconf_1.00.bb | 2 +-
> >  6 files changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
> > b/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
> > index 783e30bf38..33a4517e5b 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#Configurat
> > ion"
> >  
> > -RPROVIDES:${PN} += "virtual-grub-bootconf"
> > +RPROVIDES:${PN} += "VIRTUAL-RUNTIME_grub-bootconf"
> >  
> >  inherit grub-efi-cfg
> >  
> > diff --git a/meta/recipes-bsp/grub/grub-efi_2.12.bb b/meta/recipes-
> > bsp/grub/grub-efi_2.12.bb
> > index 9857e8e036..078a59a465 100644
> > --- a/meta/recipes-bsp/grub/grub-efi_2.12.bb
> > +++ b/meta/recipes-bsp/grub/grub-efi_2.12.bb
> > @@ -5,7 +5,7 @@ require conf/image-uefi.conf
> >  GRUBPLATFORM = "efi"
> >  
> >  DEPENDS:append = " grub-native"
> > -RDEPENDS:${PN} = "grub-common virtual-grub-bootconf"
> > +RDEPENDS:${PN} = "grub-common VIRTUAL-RUNTIME_grub-bootconf"
> >  
> >  SRC_URI += " \
> >             file://cfg \
> > diff --git a/meta/recipes-core/glibc/glibc-package.inc
> > b/meta/recipes-core/glibc/glibc-package.inc
> > index 1ef987be0a..8846934b25 100644
> > --- a/meta/recipes-core/glibc/glibc-package.inc
> > +++ b/meta/recipes-core/glibc/glibc-package.inc
> > @@ -7,7 +7,7 @@ RPROVIDES:${PN} = "eglibc rtld(GNU_HASH)"
> >  RPROVIDES:${PN}-utils = "eglibc-utils"
> >  RPROVIDES:${PN}-mtrace = "eglibc-mtrace libc-mtrace"
> >  RPROVIDES:${PN}-pic = "eglibc-pic"
> > -RPROVIDES:${PN}-dev = "eglibc-dev libc6-dev virtual-libc-dev"
> > +RPROVIDES:${PN}-dev = "eglibc-dev libc6-dev VIRTUAL-RUNTIME_libc-
> > dev"
> >  RPROVIDES:${PN}-staticdev = "eglibc-staticdev"
> >  RPROVIDES:${PN}-doc = "eglibc-doc"
> >  RPROVIDES:glibc-extra-nss = "eglibc-extra-nss"
> > diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-
> > core/musl/musl_git.bb
> > index 324269a968..54df0de913 100644
> > --- a/meta/recipes-core/musl/musl_git.bb
> > +++ b/meta/recipes-core/musl/musl_git.bb
> > @@ -76,7 +76,7 @@ FILES:${PN}-dev =+ "${libdir}/libcrypt.a
> > ${libdir}/libdl.a ${libdir}/libm.a \
> >                     "
> >  
> >  RDEPENDS:${PN}-dev += "linux-libc-headers-dev bsd-headers-dev
> > libssp-nonshared-staticdev"
> > -RPROVIDES:${PN}-dev += "libc-dev virtual-libc-dev"
> > +RPROVIDES:${PN}-dev += "libc-dev VIRTUAL-RUNTIME_libc-dev"
> >  RPROVIDES:${PN} += "ldd rtld(GNU_HASH)"
> >  
> >  LEAD_SONAME = "libc.so"
> > diff --git a/meta/recipes-core/systemd/systemd-boot_255.1.bb
> > b/meta/recipes-core/systemd/systemd-boot_255.1.bb
> > index 4ee25ee72f..32495c883d 100644
> > --- a/meta/recipes-core/systemd/systemd-boot_255.1.bb
> > +++ b/meta/recipes-core/systemd/systemd-boot_255.1.bb
> > @@ -45,7 +45,7 @@ python __anonymous () {
> >  
> >  FILES:${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}"
> >  
> > -RDEPENDS:${PN} += "virtual-systemd-bootconf"
> > +RDEPENDS:${PN} += "VIRTUAL-RUNTIME_systemd-bootconf"
> >  
> >  CFLAGS:append:libc-musl = " -D__DEFINED_wchar_t"
> >  
> > diff --git a/meta/recipes-core/systemd/systemd-bootconf_1.00.bb
> > b/meta/recipes-core/systemd/systemd-bootconf_1.00.bb
> > index 19637546a9..5017b256e7 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"
> >  LIC_FILES_CHKSUM =
> > "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4d
> > e20420"
> >  SUMMARY = "Basic systemd-boot configuration files"
> >  
> > -RPROVIDES:${PN} += "virtual-systemd-bootconf"
> > +RPROVIDES:${PN} += "VIRTUAL-RUNTIME_systemd-bootconf"
> >  PACKAGE_ARCH = "${MACHINE_ARCH}"
> >  
> >  inherit systemd-boot-cfg
> 
> I appreciate the intent here but I'm not sure this is quite right.
> 
> Most of the usage of VIRTUAL-RUNTIME is done as variable substitution
> so ${VIRTUAL-RUNTIME_XXX} and then declared somewhere.

True, I saw that. 
> These cases of virtual-XXX are simple enough they don't require that.
> I
> think the patch could therefore add more confusion rather than
> improve
> things.

Might be true, in that case let us just ignore the patch for now :)

Simone
> 
> Cheers,
> 
> Richard
> 
>
diff mbox series

Patch

diff --git a/meta/recipes-bsp/grub/grub-bootconf_1.00.bb b/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
index 783e30bf38..33a4517e5b 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-RUNTIME_grub-bootconf"
 
 inherit grub-efi-cfg
 
diff --git a/meta/recipes-bsp/grub/grub-efi_2.12.bb b/meta/recipes-bsp/grub/grub-efi_2.12.bb
index 9857e8e036..078a59a465 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.12.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.12.bb
@@ -5,7 +5,7 @@  require conf/image-uefi.conf
 GRUBPLATFORM = "efi"
 
 DEPENDS:append = " grub-native"
-RDEPENDS:${PN} = "grub-common virtual-grub-bootconf"
+RDEPENDS:${PN} = "grub-common VIRTUAL-RUNTIME_grub-bootconf"
 
 SRC_URI += " \
            file://cfg \
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 1ef987be0a..8846934b25 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -7,7 +7,7 @@  RPROVIDES:${PN} = "eglibc rtld(GNU_HASH)"
 RPROVIDES:${PN}-utils = "eglibc-utils"
 RPROVIDES:${PN}-mtrace = "eglibc-mtrace libc-mtrace"
 RPROVIDES:${PN}-pic = "eglibc-pic"
-RPROVIDES:${PN}-dev = "eglibc-dev libc6-dev virtual-libc-dev"
+RPROVIDES:${PN}-dev = "eglibc-dev libc6-dev VIRTUAL-RUNTIME_libc-dev"
 RPROVIDES:${PN}-staticdev = "eglibc-staticdev"
 RPROVIDES:${PN}-doc = "eglibc-doc"
 RPROVIDES:glibc-extra-nss = "eglibc-extra-nss"
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 324269a968..54df0de913 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -76,7 +76,7 @@  FILES:${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \
                    "
 
 RDEPENDS:${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev"
-RPROVIDES:${PN}-dev += "libc-dev virtual-libc-dev"
+RPROVIDES:${PN}-dev += "libc-dev VIRTUAL-RUNTIME_libc-dev"
 RPROVIDES:${PN} += "ldd rtld(GNU_HASH)"
 
 LEAD_SONAME = "libc.so"
diff --git a/meta/recipes-core/systemd/systemd-boot_255.1.bb b/meta/recipes-core/systemd/systemd-boot_255.1.bb
index 4ee25ee72f..32495c883d 100644
--- a/meta/recipes-core/systemd/systemd-boot_255.1.bb
+++ b/meta/recipes-core/systemd/systemd-boot_255.1.bb
@@ -45,7 +45,7 @@  python __anonymous () {
 
 FILES:${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}"
 
-RDEPENDS:${PN} += "virtual-systemd-bootconf"
+RDEPENDS:${PN} += "VIRTUAL-RUNTIME_systemd-bootconf"
 
 CFLAGS:append:libc-musl = " -D__DEFINED_wchar_t"
 
diff --git a/meta/recipes-core/systemd/systemd-bootconf_1.00.bb b/meta/recipes-core/systemd/systemd-bootconf_1.00.bb
index 19637546a9..5017b256e7 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"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 SUMMARY = "Basic systemd-boot configuration files"
 
-RPROVIDES:${PN} += "virtual-systemd-bootconf"
+RPROVIDES:${PN} += "VIRTUAL-RUNTIME_systemd-bootconf"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit systemd-boot-cfg