From: Mark Hatle <mark.hatle@windriver.com>
Date: Wed, 9 Mar 2016 19:58:42 +0000 (-0600)
Subject: rpm: Sync CVS to regular version
X-Git-Tag: 2016-4~504
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1a9efb0be07c62b7780da68dc19c834ade1cb533;p=openembedded-core.git

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>
---

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)