__pkgconfig_provides/__pkgconfig_requires %{nil} don't reliably suppress
RPM 6's pkgconfig fileattr generator - confirmed via a cleansstate rebuild
of hicolor-icon-theme still showing "pkgconfig(default-icon-theme)" and
"/usr/bin/pkg-config" in the built package despite these defines. Most
likely because rpm's own fileattrs/pkgconfig.attr re-defines the same
macros later in the dependency-generation phase, after our --define has
already run, clobbering our override.Add __requires_exclude/__provides_exclude on top of the existing defines, as a final safety net: these filter the finished Requires/Provides list in rpm's core dependency code rather than the overridable fileattr scripts, so they take effect regardless of whether the generator suppression above was actually honored. Signed-off-by: Sumanth Gavini <[email protected]> --- meta/classes-global/package_rpm.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 71d5c5dee3..5a88e3ec20 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -612,6 +612,8 @@ python do_package_rpm () { cmd = cmd + " --define '__rpm_lua_provides %{nil}'" cmd = cmd + " --define '__rpm_macro_provides %{nil}'" cmd = cmd + " --define '__usergroup_provides %{nil}'" + cmd = cmd + " --define '__requires_exclude ^pkgconfig\\(.*\\)$|^/usr/bin/pkg-config$'" + cmd = cmd + " --define '__provides_exclude ^pkgconfig\\(.*\\)$'" cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" cmd = cmd + " --define 'debug_package %{nil}'" cmd = cmd + " --define '_tmppath " + workdir + "'"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#244433): https://lists.openembedded.org/g/openembedded-core/message/244433 Mute This Topic: https://lists.openembedded.org/mt/120947897/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
