summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2020-11-02 10:51:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-03 08:21:10 +0000
commit7661beb222022b33bdc7e1589479f428bbed84d8 (patch)
treeaece36f7d278db81fdbce8ddb31d1972dc4523ac /meta
parent235101a662ab7b41532ed1319fd9d1735931e8ca (diff)
downloadpoky-7661beb222022b33bdc7e1589479f428bbed84d8.tar.gz
rpm: use libgcrypt instead of OpenSSL for cryptography
RPM 4.16 uses libgcrypt by default[1], so change our build to follow. [1] https://github.com/rpm-software-management/rpm/commit/5c0801a1a3cba56d5c7e379323242e26f33f0729 (From OE-Core rev: 196855101f28aeb8ab44f5ca1e02bfb02a11a256) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/rpm/rpm_4.16.0.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_4.16.0.bb b/meta/recipes-devtools/rpm/rpm_4.16.0.bb
index a578cf3cbd..4125f3f9d0 100644
--- a/meta/recipes-devtools/rpm/rpm_4.16.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.16.0.bb
@@ -48,7 +48,7 @@ SRCREV = "cd7f9303ef1070f027493cad7d00bc66935af2a0"
48 48
49S = "${WORKDIR}/git" 49S = "${WORKDIR}/git"
50 50
51DEPENDS = "openssl db file popt xz bzip2 elfutils python3" 51DEPENDS = "libgcrypt db file popt xz bzip2 elfutils python3"
52DEPENDS_append_class-native = " file-replacement-native bzip2-replacement-native" 52DEPENDS_append_class-native = " file-replacement-native bzip2-replacement-native"
53 53
54inherit autotools gettext pkgconfig python3native 54inherit autotools gettext pkgconfig python3native
@@ -59,7 +59,7 @@ AUTOTOOLS_AUXDIR = "${S}/build-aux"
59# OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe 59# OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe
60EXTRA_AUTORECONF_append = " --exclude=gnu-configize" 60EXTRA_AUTORECONF_append = " --exclude=gnu-configize"
61 61
62EXTRA_OECONF_append = " --without-lua --enable-python --with-crypto=openssl" 62EXTRA_OECONF_append = " --without-lua --enable-python --with-crypto=libgcrypt"
63EXTRA_OECONF_append_libc-musl = " --disable-nls --disable-openmp" 63EXTRA_OECONF_append_libc-musl = " --disable-nls --disable-openmp"
64 64
65# --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs 65# --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs