[oe-commits] [openembedded-core] 03/12: rpm: Sync CVS to regular version

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 1a9efb0be07c62b7780da68dc19c834ade1cb533
Author: Mark Hatle <mark.hatle at windriver.com>
AuthorDate: Wed Mar 9 13:58:42 2016 -0600

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
index 982c035..bacdef5 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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.