]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
rpm: Sync CVS to regular version mhatle/rpm-5.4.16
authorMark Hatle <mark.hatle@windriver.com>
Wed, 9 Mar 2016 17:47:56 +0000 (11:47 -0600)
committerMark Hatle <mark.hatle@windriver.com>
Wed, 9 Mar 2016 19:24:36 +0000 (13:24 -0600)
A previous fix for a python dep issue was not merged to the CVS version.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
meta/recipes-devtools/rpm/rpm_5.4+cvs.bb

index 982c035ac72e0cc446a4ca9bead4bb444a65852b..bacdef5242b2dd025df588a90abb7cf7c6c5e5d7 100644 (file)
@@ -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)