diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-02-16 23:25:57 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-16 23:25:57 +0000 |
| commit | 1d5cdacd570300eeb4bf299de0da2f105c3e5b99 (patch) | |
| tree | 864d061a9e1f8e7e78080be42669f64106ab10e7 | |
| parent | e6f6ecb62b493d186fcfd302f1b60c886c68e55b (diff) | |
| parent | 7388d24f0f488739d662ac3bfc4e78bcad199937 (diff) | |
merge of 397e16c7ee39422a928815c8f39b1d8aa619daec
and 5964138bce1427aaaa36a1953c3090063a8da2de
| -rw-r--r-- | packages/python/python-pylinda/honor-datadir.patch | 32 | ||||
| -rw-r--r-- | packages/python/python-pylinda_0.6.bb (renamed from packages/python/python-pylinda_0.5.bb) | 2 |
2 files changed, 11 insertions, 23 deletions
diff --git a/packages/python/python-pylinda/honor-datadir.patch b/packages/python/python-pylinda/honor-datadir.patch index 9035804592..decf686e34 100644 --- a/packages/python/python-pylinda/honor-datadir.patch +++ b/packages/python/python-pylinda/honor-datadir.patch @@ -3,27 +3,13 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- linda-0.4/setup.py~honor-datadir.patch -+++ linda-0.4/setup.py -@@ -74,7 +74,7 @@ - class myinstall(install): - def run(self): - install.run(self) -- -+ return - print "PyLinda's post-install options" +--- linda-0.6/setup.py~honor-datadir.patch ++++ linda-0.6/setup.py +@@ -68,6 +68,7 @@ + f.close() - # the following is taken from the install_scripts standard command -@@ -123,9 +123,9 @@ - Topic :: System :: Distributed Computing""".split("\n"), - version="0.4", - scripts=["linda_server.py"], -- data_files=[(root_path+"/examples", glob.glob("examples/*.py")), -- (root_path+"/doc", glob.glob("doc/html/*")), -- (root_path, ["README"])], -+ data_files=[("examples", glob.glob("examples/*.py")), -+ ("doc", glob.glob("doc/html/*")), -+ (".", ["README"])], - ext_modules=ext, - packages=["linda"], - package_dir={"linda": ""}, + def getlibpath(): ++ return os.getenv("LINDA_DATADIR") + l = sys.path + l.reverse() + for x in l: diff --git a/packages/python/python-pylinda_0.5.bb b/packages/python/python-pylinda_0.6.bb index 788db867c4..3bcd1a1362 100644 --- a/packages/python/python-pylinda_0.5.bb +++ b/packages/python/python-pylinda_0.6.bb @@ -10,3 +10,5 @@ SRC_URI = "http://www-users.cs.york.ac.uk/~aw/pylinda/dist/linda-${PV}.tar.gz \ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils + +export LINDA_DATADIR = "${D}/${libdir}/${PYTHON_DIR}" |