> -----Original Message----- > From: [email protected] > <[email protected]> On Behalf Of Ross Burton > Sent: den 17 maj 2021 13:58 > To: [email protected] > Subject: [OE-core] [PATCH 1/2] rpm: turn Berkeley DB hard dependency into > PACKAGECONFIG > > In the future we hope to switch to sqlite instead of Berkeley DB, so > prepare for this by adding an (enabled by default) PACKAGECONFIG for > Berkeley DB. > > Signed-off-by: Ross Burton <[email protected]> > --- > meta/recipes-devtools/rpm/rpm_4.16.1.3.bb | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb > b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb > index 2857cd730c4..2baa23944e6 100644 > --- a/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb > +++ b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb > @@ -51,7 +51,7 @@ S = "${WORKDIR}/git" > # included in 4.16.1.3 > CVE_CHECK_WHIETLIST += "CVE-2021-20271" > > -DEPENDS = "libgcrypt db file popt xz bzip2 elfutils python3" > +DEPENDS = "libgcrypt file popt xz bzip2 elfutils python3" > DEPENDS_append_class-native = " file-replacement-native > bzip2-replacement-native" > > inherit autotools gettext pkgconfig python3native > @@ -74,7 +74,7 @@ EXTRA_OECONF_append_class-nativesdk = " -- > sysconfdir=/etc --disable-plugins" > > BBCLASSEXTEND = "native nativesdk" > > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', > 'inhibit', '', d)}" > +PACKAGECONFIG ??= "bdb ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', > 'inhibit', '', d)}" > # The inhibit plugin serves no purpose outside of the target > PACKAGECONFIG_remove_class-native = "inhibit" > PACKAGECONFIG_remove_class-nativesdk = "inhibit" > @@ -82,6 +82,7 @@ PACKAGECONFIG_remove_class-nativesdk = "inhibit" > PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" > PACKAGECONFIG[inhibit] = > "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" > PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" > +PACKAGECONFIG[bdb] = "--enable-bdb,--disable-bdb,db"
Please keep the PACKAGECONFIGs sorted. > > ASNEEDED = "" > > -- > 2.25.1 //Peter
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#151938): https://lists.openembedded.org/g/openembedded-core/message/151938 Mute This Topic: https://lists.openembedded.org/mt/82884536/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
