[oe-commits] Ross Burton : createrepo: drop the usage of create_wrapper

git at git.openembedded.org git at git.openembedded.org
Thu Jun 13 16:32:37 UTC 2013


Module: openembedded-core.git
Branch: master-next
Commit: 7d91b44e00d6c50b7b5fbef17f2bae8e3a983a4c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7d91b44e00d6c50b7b5fbef17f2bae8e3a983a4c

Author: Ross Burton <ross.burton at intel.com>
Date:   Wed Jun 12 17:29:21 2013 +0100

createrepo: drop the usage of create_wrapper

create_wrapper was previously abused to invoke the Python interpretter directly
instead of relying on #! parsing, which is read into a 128 byte buffer so breaks
with deep build directories.

However now that we already install a "nativepython" binary into the native
sysroot, use sed to change the #! line to /usr/bin/env nativepython.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../createrepo/createrepo_0.4.11.bb                |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
index c977c2e..523d31b 100644
--- a/meta/recipes-support/createrepo/createrepo_0.4.11.bb
+++ b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
@@ -35,7 +35,7 @@ do_install_append_class-native () {
 	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
+		sed -i -e 's|^#!.*/usr/bin/env python|#! /usr/bin/env nativepython|' $i
 	done
 
 	create_wrapper ${D}/${bindir}/createrepo \



More information about the Openembedded-commits mailing list