summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2020-09-28 17:18:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-30 15:01:51 +0100
commitd73497502425b277284d5db9b1d7db89846cdbbe (patch)
treeef50c98b27ba480c87285d4d8f8757809e0429df /meta/recipes-devtools
parentc2a11e18c8579a1352d35ffb5e1712810983c194 (diff)
downloadpoky-d73497502425b277284d5db9b1d7db89846cdbbe.tar.gz
rpm: disable libarchive use
libarchive is only needed for the rpm2archive tool, as this is of limited use and libarchive is a non-trivial build dependency make this optional and disabled by default. (From OE-Core rev: 2eaefac2bb0b999e64a445fdadefb639eb7089a0) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/rpm/rpm_4.15.1.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_4.15.1.bb b/meta/recipes-devtools/rpm/rpm_4.15.1.bb
index c9258632d2..71e2c033fd 100644
--- a/meta/recipes-devtools/rpm/rpm_4.15.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.15.1.bb
@@ -49,7 +49,7 @@ SRCREV = "ab2179452c5be276a6b96c591afded485c7e58c3"
49 49
50S = "${WORKDIR}/git" 50S = "${WORKDIR}/git"
51 51
52DEPENDS = "openssl libarchive db file popt xz bzip2 dbus elfutils python3" 52DEPENDS = "openssl db file popt xz bzip2 dbus elfutils python3"
53DEPENDS_append_class-native = " file-replacement-native bzip2-replacement-native" 53DEPENDS_append_class-native = " file-replacement-native bzip2-replacement-native"
54 54
55inherit autotools gettext pkgconfig python3native 55inherit autotools gettext pkgconfig python3native
@@ -74,6 +74,7 @@ BBCLASSEXTEND = "native nativesdk"
74 74
75PACKAGECONFIG ??= "" 75PACKAGECONFIG ??= ""
76PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" 76PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils"
77PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive"
77 78
78ASNEEDED = "" 79ASNEEDED = ""
79 80
@@ -95,7 +96,7 @@ WRAPPER_TOOLS = " \
95 96
96do_install_append_class-native() { 97do_install_append_class-native() {
97 for tool in ${WRAPPER_TOOLS}; do 98 for tool in ${WRAPPER_TOOLS}; do
98 create_wrapper ${D}$tool \ 99 test -x ${D}$tool && create_wrapper ${D}$tool \
99 RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ 100 RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \
100 RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} \ 101 RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} \
101 MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ 102 MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \
@@ -105,7 +106,7 @@ do_install_append_class-native() {
105 106
106do_install_append_class-nativesdk() { 107do_install_append_class-nativesdk() {
107 for tool in ${WRAPPER_TOOLS}; do 108 for tool in ${WRAPPER_TOOLS}; do
108 create_wrapper ${D}$tool \ 109 test -x ${D}$tool && create_wrapper ${D}$tool \
109 RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \ 110 RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \
110 RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/..} \ 111 RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/..} \
111 MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/misc/magic.mgc \ 112 MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/misc/magic.mgc \