Patchwork [2/2] createrepo 0.4.11: create wrapper for python script

login
register
mail settings
Submitter Robert Yang
Date Aug. 1, 2012, 9:14 a.m.
Message ID <78a5aef01b8e2e7a57596b1df0cf622a7d724e01.1343811985.git.liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/33491/
State Accepted
Commit 1e96a8460b93ba9c0c9a6c4ea4ffd6a19302831c
Headers show

Comments

Robert Yang - Aug. 1, 2012, 9:14 a.m.
The native python is installed to
${STAGING_BINDIR_NATIVE}/python-native/python, so we should use wrapper
for the python script.

[YOCTO #2822]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../createrepo/createrepo_0.4.11.bb                |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
index dcddcf8..42c7214 100644
--- a/meta/recipes-support/createrepo/createrepo_0.4.11.bb
+++ b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
@@ -6,7 +6,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
 
 RDEPENDS_${PN}_virtclass-native += "libxml2-native rpm-native"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \
           file://fix-native-install.patch \
@@ -24,3 +24,16 @@  do_install () {
 	oe_runmake -e 'DESTDIR=${D}' install
 	install -m 0755 ${WORKDIR}/rpm-createsolvedb.py ${D}${bindir}/
 }
+
+# Wrap the python script since the native python is
+# ${bindir}/python-native/python, and the "#! /usr/bin/env python" can't
+# find it since it is not in PATH.
+do_install_append_virtclass-native () {
+	# Not all the python scripts should be wrapped since some of
+	# them are modules (be imported).
+	for i in ${D}${datadir}/createrepo/genpkgmetadata.py \
+		 ${D}${datadir}/createrepo/modifyrepo.py \
+		 ${D}${bindir}/rpm-createsolvedb.py ; do
+		create_wrapper $i ${STAGING_BINDIR_NATIVE}/python-native/python
+	done
+}