aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2016-03-09 11:47:56 -0600
committerMark Hatle <mark.hatle@windriver.com>2016-03-09 13:24:36 -0600
commit785dd92671d9815d78b2ac263da5bd881e25ebc9 (patch)
tree419d8641a36b52cb77c7a01b217e28626b8810d3
parentae108ddf9607bbe7b8eddf1d76e711ff4d069a14 (diff)
downloadopenembedded-core-contrib-mhatle/rpm-5.4.16.tar.gz
openembedded-core-contrib-mhatle/rpm-5.4.16.tar.bz2
openembedded-core-contrib-mhatle/rpm-5.4.16.zip
rpm: Sync CVS to regular versionmhatle/rpm-5.4.16
A previous fix for a python dep issue was not merged to the CVS version. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4+cvs.bb8
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
index 982c035ac7..bacdef5242 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
@@ -634,6 +634,14 @@ EOF
${@multilib_rpmmacros(d)}
}
+do_install_append_class-native () {
+ sed -i -e 's|^#!.*/usr/bin/python|#! /usr/bin/env nativepython|' ${D}/${libdir}/python2.7/site-packages/rpm/transaction.py
+}
+
+do_install_append_class-nativesdk () {
+ sed -i -e 's|^#!.*/usr/bin/python|#! /usr/bin/env python|' ${D}/${libdir}/python2.7/site-packages/rpm/transaction.py
+}
+
def multilib_rpmmacros(d):
localdata = d.createCopy()
# We need to clear the TOOLCHAIN_OPTIONS (--sysroot)