Skip to contentSkip to conversation

libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled

PATCH In review Khem Raj 2 participants 3 messages Feb 20, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled

opkg also depends on libsolv and can needlessly pull in rpm even if the O_P_M does not desire to use rpm

---
 meta/recipes-extended/libsolv/libsolv_0.7.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/libsolv/libsolv_0.7.10.bb +1 -1
index 502f4e0e85..265a27c00d 100644
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
 
 inherit cmake
 
-PACKAGECONFIG ??= "rpm"
+PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}"
 PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm"
 
 EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON"
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm

dnf does not work with opkg or dpkg/apt anyway

---
 meta/recipes-devtools/dnf/dnf_4.2.2.bb        | 2 ++
 meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 +
 2 files changed, 3 insertions(+)
meta/recipes-devtools/dnf/dnf_4.2.2.bb +2 -0
index f38167f1ad..220f1aabbd 100644
@@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \
                          dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \
 "
 SYSTEMD_AUTO_ENABLE ?= "disable"
+
+PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}"
meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +1 -0
index 882c435b32..49afa04812 100644
@@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF"
 EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF"
 
 BBCLASSEXTEND = "native nativesdk"
+PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}"
 
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH 2/2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm

Can you add "...due to missing rpm support in libsolv" to the reasoning string please?

Alex

Quoted 45 lines · Khem Raj

dnf does not work with opkg or dpkg/apt anyway

---
 meta/recipes-devtools/dnf/dnf_4.2.2.bb        | 2 ++
 meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 +
 2 files changed, 3 insertions(+)
meta/recipes-devtools/dnf/dnf_4.2.2.bb +2 -0
index f38167f1ad..220f1aabbd 100644
@@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service
 dnf-makecache.timer \
                          dnf-automatic-notifyonly.service
 dnf-automatic-notifyonly.timer \
 "
 SYSTEMD_AUTO_ENABLE ?= "disable"
+
+PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES',

'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}"

meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +1 -0
index 882c435b32..49afa04812 100644
@@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF"
 EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF"
 
 BBCLASSEXTEND = "native nativesdk"
+PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES',

'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}"

--
2.25.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core