diff options
author | Ross Burton <ross@burtonini.com> | 2021-05-17 12:58:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-18 23:52:53 +0100 |
commit | b96c342fbd9fb939e8661b9019c7b9a424d50a70 (patch) | |
tree | ab41c83321bb71ca7baf2b1fbfed67d30226716d /meta/recipes-devtools/rpm/rpm_4.16.1.3.bb | |
parent | d54f9cf4cf8008d96bd2a7afca1fc16e6f19d813 (diff) | |
download | poky-b96c342fbd9fb939e8661b9019c7b9a424d50a70.tar.gz |
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.
(From OE-Core rev: 365f0804a0726fe4be9eb7ef3515fea2dd38bef1)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm_4.16.1.3.bb')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_4.16.1.3.bb | 5 |
1 files 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 2857cd730c..f9c04cf680 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" | |||
51 | # included in 4.16.1.3 | 51 | # included in 4.16.1.3 |
52 | CVE_CHECK_WHIETLIST += "CVE-2021-20271" | 52 | CVE_CHECK_WHIETLIST += "CVE-2021-20271" |
53 | 53 | ||
54 | DEPENDS = "libgcrypt db file popt xz bzip2 elfutils python3" | 54 | DEPENDS = "libgcrypt file popt xz bzip2 elfutils python3" |
55 | DEPENDS_append_class-native = " file-replacement-native bzip2-replacement-native" | 55 | DEPENDS_append_class-native = " file-replacement-native bzip2-replacement-native" |
56 | 56 | ||
57 | inherit autotools gettext pkgconfig python3native | 57 | inherit autotools gettext pkgconfig python3native |
@@ -74,11 +74,12 @@ EXTRA_OECONF_append_class-nativesdk = " --sysconfdir=/etc --disable-plugins" | |||
74 | 74 | ||
75 | BBCLASSEXTEND = "native nativesdk" | 75 | BBCLASSEXTEND = "native nativesdk" |
76 | 76 | ||
77 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)}" | 77 | PACKAGECONFIG ??= "bdb ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)}" |
78 | # The inhibit plugin serves no purpose outside of the target | 78 | # The inhibit plugin serves no purpose outside of the target |
79 | PACKAGECONFIG_remove_class-native = "inhibit" | 79 | PACKAGECONFIG_remove_class-native = "inhibit" |
80 | PACKAGECONFIG_remove_class-nativesdk = "inhibit" | 80 | PACKAGECONFIG_remove_class-nativesdk = "inhibit" |
81 | 81 | ||
82 | PACKAGECONFIG[bdb] = "--enable-bdb,--disable-bdb,db" | ||
82 | PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" | 83 | PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" |
83 | PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" | 84 | PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" |
84 | PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" | 85 | PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" |