summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-08-29 23:21:13 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 17:57:12 +0100
commit6f5b49ba2245e1d4d6de48ce96018afb6446e490 (patch)
tree39884ba8bbb482571b787f7ad5652a44dc44961b /meta
parent58884341dcc3fe0c56dc93aab66b824ac651b575 (diff)
downloadpoky-6f5b49ba2245e1d4d6de48ce96018afb6446e490.tar.gz
rpm: Add dependencies on bash, perl and python3-core
Also modify a Python script (pythondistdeps.py) to use Python 3. (From OE-Core rev: 18116c1490e6ef09ad5046db7f90dbcbe4caf595) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/rpm/rpm_git.bb5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_git.bb b/meta/recipes-devtools/rpm/rpm_git.bb
index 5fe52b83ec..971aac7867 100644
--- a/meta/recipes-devtools/rpm/rpm_git.bb
+++ b/meta/recipes-devtools/rpm/rpm_git.bb
@@ -99,6 +99,9 @@ do_install_append_class-target() {
99 99
100do_install_append () { 100do_install_append () {
101 sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}/${libdir}/rpm/macros 101 sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}/${libdir}/rpm/macros
102
103 sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \
104 ${D}${libdir}/rpm/pythondistdeps.py
102} 105}
103 106
104FILES_${PN} += "${libdir}/rpm-plugins/*.so \ 107FILES_${PN} += "${libdir}/rpm-plugins/*.so \
@@ -113,3 +116,5 @@ FILES_python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/*"
113 116
114# rpm 5.x was packaging the rpm build tools separately 117# rpm 5.x was packaging the rpm build tools separately
115RPROVIDES_${PN} += "rpm-build" 118RPROVIDES_${PN} += "rpm-build"
119
120RDEPENDS_${PN} = "bash perl python3-core"