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:13:54 +0000
commit815c36f4173d7c963bf3fb3597fe4494ee73aff1 (patch)
tree86c757deb6a5a8f3e43b3d26e89b69bbe14645d2 /meta/recipes-devtools/rpm
parent775f22e36f5dd36c8f9e0143c2697782ebd49a33 (diff)
downloadpoky-815c36f4173d7c963bf3fb3597fe4494ee73aff1.tar.gz
rpm: Sync CVS to regular version
A previous fix for a python dep issue was not merged to the CVS version. (From OE-Core rev: 1a9efb0be07c62b7780da68dc19c834ade1cb533) 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
634 ${@multilib_rpmmacros(d)} 634 ${@multilib_rpmmacros(d)}
635} 635}
636 636
637do_install_append_class-native () {
638 sed -i -e 's|^#!.*/usr/bin/python|#! /usr/bin/env nativepython|' ${D}/${libdir}/python2.7/site-packages/rpm/transaction.py
639}
640
641do_install_append_class-nativesdk () {
642 sed -i -e 's|^#!.*/usr/bin/python|#! /usr/bin/env python|' ${D}/${libdir}/python2.7/site-packages/rpm/transaction.py
643}
644
637def multilib_rpmmacros(d): 645def multilib_rpmmacros(d):
638 localdata = d.createCopy() 646 localdata = d.createCopy()
639 # We need to clear the TOOLCHAIN_OPTIONS (--sysroot) 647 # We need to clear the TOOLCHAIN_OPTIONS (--sysroot)