| Message ID | 20260826214548.3002838-11-sumanth.gavini@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | rpm: 4.20.1 -> 6.0.2 | expand |
On Wed, 2026-08-26 at 14:45 -0700, Sumanth Gavini via lists.openembedded.org wrote: > RPM 6's fileattr script generator produces Requires: /usr/bin/pkg-config > for packages that call pkg-config in their scriptlets. Add > /usr/bin/pkg-config as an explicit RPROVIDES in pkgconf so these > file-path dependencies resolve correctly. > Remove /usr/bin/pkg-config from nativesdk-sdk-provides-dummy.bb since > pkgconf now provides it explicitly via RPROVIDES. > > Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com> > --- > meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb | 1 - > meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb > index 6075770bf0..37dad54409 100644 > --- a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb > +++ b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb > @@ -11,7 +11,6 @@ DUMMYPROVIDES = "\ > /bin/sh \ > /bin/bash \ > /usr/bin/env \ > - /usr/bin/pkg-config \ > libGL.so()(64bit) \ > libGL.so \ > " > diff --git a/meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb b/meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb > index 471433e7b5..0249c87878 100644 > --- a/meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb > +++ b/meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb > @@ -7,7 +7,7 @@ HOMEPAGE = "http://pkgconf.org" > BUGTRACKER = "https://github.com/pkgconf/pkgconf/issues" > SECTION = "devel" > PROVIDES += "pkgconfig" > -RPROVIDES:${PN} += "pkgconfig" > +RPROVIDES:${PN} += "pkgconfig /usr/bin/pkg-config" > > # The pkgconf license seems to be functionally equivalent to BSD-2-Clause or > # ISC, but has different wording, so needs its own name. > This reverts half of patch 5 in the series. Do we still need patch 5 at all? Do we need the RPROVIDES of /usr/bin/pkg-config if we have the pkg- config dependency code in rpm disabled (e.g as in patch 16)? Cheers, Richard
diff --git a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb index 6075770bf0..37dad54409 100644 --- a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb +++ b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb @@ -11,7 +11,6 @@ DUMMYPROVIDES = "\ /bin/sh \ /bin/bash \ /usr/bin/env \ - /usr/bin/pkg-config \ libGL.so()(64bit) \ libGL.so \ " diff --git a/meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb b/meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb index 471433e7b5..0249c87878 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://pkgconf.org" BUGTRACKER = "https://github.com/pkgconf/pkgconf/issues" SECTION = "devel" PROVIDES += "pkgconfig" -RPROVIDES:${PN} += "pkgconfig" +RPROVIDES:${PN} += "pkgconfig /usr/bin/pkg-config" # The pkgconf license seems to be functionally equivalent to BSD-2-Clause or # ISC, but has different wording, so needs its own name.
RPM 6's fileattr script generator produces Requires: /usr/bin/pkg-config for packages that call pkg-config in their scriptlets. Add /usr/bin/pkg-config as an explicit RPROVIDES in pkgconf so these file-path dependencies resolve correctly. Remove /usr/bin/pkg-config from nativesdk-sdk-provides-dummy.bb since pkgconf now provides it explicitly via RPROVIDES. Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com> --- meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb | 1 - meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)