diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-17 00:55:34 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-17 00:56:31 +0100 |
| commit | 5a0fecab4a7a17ab7218e522c2750f0fb8c9aa45 (patch) | |
| tree | 04d3a89c05224709f6d8deed63317e8a52979a34 | |
| parent | 9d8f00414393bff8a0f9cb2dfbac3e5e717b57b2 (diff) | |
distutils.bbclass: bandaid against wrong datadir installation
bump affected python recipes
| -rw-r--r-- | classes/distutils.bbclass | 5 | ||||
| -rw-r--r-- | packages/python/python-fnorb_1.3.bb | 7 | ||||
| -rw-r--r-- | packages/python/python-pycurl_7.18.2.bb | 6 | ||||
| -rw-r--r-- | packages/python/python-pymetar_0.14.bb | 6 | ||||
| -rw-r--r-- | packages/python/python-scapy_2.0.0.9.bb | 9 |
5 files changed, 10 insertions, 23 deletions
diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index 694d6bc5d9..375ffff4db 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -58,6 +58,11 @@ distutils_do_install() { fi rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth + + # + # FIXME: Bandaid against wrong datadir computation + # + mv -f ${D}${datadir}/share/* ${D}${datadir}/ } EXPORT_FUNCTIONS do_compile do_install diff --git a/packages/python/python-fnorb_1.3.bb b/packages/python/python-fnorb_1.3.bb index e6844de81f..15ae037ca6 100644 --- a/packages/python/python-fnorb_1.3.bb +++ b/packages/python/python-fnorb_1.3.bb @@ -3,14 +3,9 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "FNORB" SRCNAME = "Fnorb" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/fnorb/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils - -do_install_append() { - mv -f ${D}/usr/share/share/* ${D}/usr/share/ - rm -rf ${D}/usr/share/share/ -} diff --git a/packages/python/python-pycurl_7.18.2.bb b/packages/python/python-pycurl_7.18.2.bb index 5105e90cf5..a38a4b5a27 100644 --- a/packages/python/python-pycurl_7.18.2.bb +++ b/packages/python/python-pycurl_7.18.2.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "curl-${PV}" SRCNAME = "pycurl" -PR = "ml1" +PR = "ml2" SRC_URI = "\ http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz \ @@ -14,8 +14,4 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils -do_install_append() { - mv -f ${D}${datadir}/share/* ${D}${datadir}/ -} - RDEPENDS = "python-core curl (>=${PV})" diff --git a/packages/python/python-pymetar_0.14.bb b/packages/python/python-pymetar_0.14.bb index a22404dd21..7520b668bd 100644 --- a/packages/python/python-pymetar_0.14.bb +++ b/packages/python/python-pymetar_0.14.bb @@ -3,13 +3,9 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "GPL" SRCNAME = "pymetar" -PR = "ml0" +PR = "ml1" SRC_URI = "http://www.schwarzvogel.de/pkgs/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils - -do_install_append() { - mv -f ${D}/${datadir}/share/* ${D}/${datadir}/ -} diff --git a/packages/python/python-scapy_2.0.0.9.bb b/packages/python/python-scapy_2.0.0.9.bb index 616b905564..ebe1223418 100644 --- a/packages/python/python-scapy_2.0.0.9.bb +++ b/packages/python/python-scapy_2.0.0.9.bb @@ -7,19 +7,14 @@ HOMEPAGE = "http://www.secdev.org/projects/scapy/" LICENSE = "GPL" PRIORITY = "optional" SRCNAME = "scapy" -PR = "ml0" +PR = "ml1" SRC_URI = "http://www.secdev.org/projects/scapy/files/scapy-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR} - install -m 0755 ${S}/scapy.py ${D}${libdir}/${PYTHON_DIR}/ -} +inherit distutils RDEPENDS = "\ python-netclient \ python-netserver \ " - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/" |