[OE-core] [PATCH 2/2] rpm: Sync CVS to regular version

Mark Hatle mark.hatle at windriver.com
Wed Mar 9 19:58:42 UTC 2016


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




More information about the Openembedded-core mailing list