summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2016-03-09 13:58:42 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-10 23:06:16 +0000
commit1a9efb0be07c62b7780da68dc19c834ade1cb533 (patch)
treededf4160f50c728cbc57e2f7687c6ff68c8be691 /meta/recipes-devtools/rpm
parente4d6f4f48f83a5881351007aae66427e0b11fc8a (diff)
downloadopenembedded-core-1a9efb0be07c62b7780da68dc19c834ade1cb533.tar.gz
openembedded-core-1a9efb0be07c62b7780da68dc19c834ade1cb533.tar.bz2
openembedded-core-1a9efb0be07c62b7780da68dc19c834ade1cb533.zip
rpm: Sync CVS to regular version
A previous fix for a python dep issue was not merged to the CVS version. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm')
-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)