summaryrefslogtreecommitdiff
path: root/meta/packages/python
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-19 11:50:58 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-19 11:50:58 +0000
commit47c19bb87a85073d69adfc20614a12a17e937e1d (patch)
treef426f86486d41cbf70dd83fc98a3b52f69699943 /meta/packages/python
parent5716a14bf4366d0c8fe2526759ca3500b4985bc5 (diff)
downloadopenembedded-core-47c19bb87a85073d69adfc20614a12a17e937e1d.tar.gz
openembedded-core-47c19bb87a85073d69adfc20614a12a17e937e1d.tar.bz2
openembedded-core-47c19bb87a85073d69adfc20614a12a17e937e1d.tar.xz
openembedded-core-47c19bb87a85073d69adfc20614a12a17e937e1d.zip
python: Drop staging functions. If failures occur we just need to improve do_install
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/python')
-rw-r--r--meta/packages/python/python-dbus_0.83.0.bb4
-rw-r--r--meta/packages/python/python-iniparse-native_0.2.3.bb6
-rw-r--r--meta/packages/python/python-pycairo_1.4.0.bb7
-rw-r--r--meta/packages/python/python-pygobject-native_2.16.0.bb8
-rw-r--r--meta/packages/python/python-pygobject_2.16.0.bb8
-rw-r--r--meta/packages/python/python-pygtk_2.10.4.bb10
-rw-r--r--meta/packages/python/python-pyrex-native_0.9.8.5.bb6
-rw-r--r--meta/packages/python/python-pyrex_0.9.8.5.bb2
-rw-r--r--meta/packages/python/python-scons-native_0.97.bb11
-rw-r--r--meta/packages/python/python-urlgrabber-native_3.1.0.bb7
-rw-r--r--meta/packages/python/yum-metadata-parser-native_1.1.2.bb6
11 files changed, 12 insertions, 63 deletions
diff --git a/meta/packages/python/python-dbus_0.83.0.bb b/meta/packages/python/python-dbus_0.83.0.bb
index 275e60e32..d35b2808f 100644
--- a/meta/packages/python/python-dbus_0.83.0.bb
+++ b/meta/packages/python/python-dbus_0.83.0.bb
@@ -16,10 +16,6 @@ export HOST_SYS
export STAGING_LIBDIR
export STAGING_INCDIR
-do_stage() {
- autotools_stage_all
-}
-
RDEPENDS = "python-io python-logging python-stringold python-threading python-xml"
FILES_${PN}-dev += "${libdir}/pkgconfig
diff --git a/meta/packages/python/python-iniparse-native_0.2.3.bb b/meta/packages/python/python-iniparse-native_0.2.3.bb
index c2d633c5f..bb841fed1 100644
--- a/meta/packages/python/python-iniparse-native_0.2.3.bb
+++ b/meta/packages/python/python-iniparse-native_0.2.3.bb
@@ -2,9 +2,5 @@ require python-iniparse_${PV}.bb
inherit native
DEPENDS = "python-native"
RDEPENDS = ""
+NATIVE_INSTALL_WORKS = "1"
-do_stage() {
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
- ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
-}
diff --git a/meta/packages/python/python-pycairo_1.4.0.bb b/meta/packages/python/python-pycairo_1.4.0.bb
index 9bb2fdfcd..824877558 100644
--- a/meta/packages/python/python-pycairo_1.4.0.bb
+++ b/meta/packages/python/python-pycairo_1.4.0.bb
@@ -10,10 +10,3 @@ S = "${WORKDIR}/pycairo-${PV}"
inherit distutils pkgconfig
-do_stage() {
- install -d ${STAGING_INCDIR}
- install -m 0644 cairo/pycairo.h ${STAGING_INCDIR}
-
- # nasty pkgconfig fix necessary here
- sed -i -e s,${STAGING_DIR_NATIVE},, pycairo.pc
-}
diff --git a/meta/packages/python/python-pygobject-native_2.16.0.bb b/meta/packages/python/python-pygobject-native_2.16.0.bb
index a1c733334..f5b9cb338 100644
--- a/meta/packages/python/python-pygobject-native_2.16.0.bb
+++ b/meta/packages/python/python-pygobject-native_2.16.0.bb
@@ -7,12 +7,14 @@ PARALLEL_MAKE = ""
inherit native
+NATIVE_INSTALL_WORKS = "1"
+
SRC_URI = "\
ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
# file://python-path.patch;patch=1 \
"
-do_stage_append() {
- install -d ${STAGING_BINDIR}
- install -m 0755 gobject/generate-constants ${STAGING_BINDIR}/gobject-generate-constants
+do_install_append() {
+ install -d ${D}${bindir}
+ install -m 0755 gobject/generate-constants ${D}${bindir}/gobject-generate-constants
}
diff --git a/meta/packages/python/python-pygobject_2.16.0.bb b/meta/packages/python/python-pygobject_2.16.0.bb
index 773ffdff4..de07ec762 100644
--- a/meta/packages/python/python-pygobject_2.16.0.bb
+++ b/meta/packages/python/python-pygobject_2.16.0.bb
@@ -22,14 +22,6 @@ export HOST_SYS
export STAGING_INCDIR
export STAGING_LIBDIR
-do_stage() {
- autotools_stage_all
- install -d ${STAGING_LIBDIR}/../share/pygobject/
- cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/
- install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
- cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
-}
-
PACKAGES += "${PN}-lib"
RDEPENDS_${PN} += "python-textutils"
diff --git a/meta/packages/python/python-pygtk_2.10.4.bb b/meta/packages/python/python-pygtk_2.10.4.bb
index 6b26f59ad..c37f64e51 100644
--- a/meta/packages/python/python-pygtk_2.10.4.bb
+++ b/meta/packages/python/python-pygtk_2.10.4.bb
@@ -49,13 +49,3 @@ FILES_${PN}-dev += "\
${bindir}/pygtk-* \
${datadir}/pygtk/2.0"
-do_stage() {
- autotools_stage_includes
- sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0
- install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/
- install -d ${STAGING_DATADIR}/pygtk/2.0/codegen
- install -d ${STAGING_DATADIR}/pygtk/2.0/defs/
- cp -pPr codegen/*.py* ${STAGING_DATADIR}/pygtk/2.0/codegen/
- cp -pPr *.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
- cp -pPr gtk/*.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
-}
diff --git a/meta/packages/python/python-pyrex-native_0.9.8.5.bb b/meta/packages/python/python-pyrex-native_0.9.8.5.bb
index 440521204..791235544 100644
--- a/meta/packages/python/python-pyrex-native_0.9.8.5.bb
+++ b/meta/packages/python/python-pyrex-native_0.9.8.5.bb
@@ -3,8 +3,4 @@ inherit native
DEPENDS = "python-native"
RDEPENDS = ""
-do_stage() {
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
- ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
-}
+NATIVE_INSTALL_WORKS = "1"
diff --git a/meta/packages/python/python-pyrex_0.9.8.5.bb b/meta/packages/python/python-pyrex_0.9.8.5.bb
index 03468a052..7523e1127 100644
--- a/meta/packages/python/python-pyrex_0.9.8.5.bb
+++ b/meta/packages/python/python-pyrex_0.9.8.5.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
PRIORITY = "optional"
LICENSE = "GPL"
SRCNAME = "Pyrex"
-PR = "ml1"
+PR = "ml2"
SRC_URI = "\
http://www.cosc.canterbury.ac.nz/greg.ewing/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
diff --git a/meta/packages/python/python-scons-native_0.97.bb b/meta/packages/python/python-scons-native_0.97.bb
index 45eeee117..915cbabd9 100644
--- a/meta/packages/python/python-scons-native_0.97.bb
+++ b/meta/packages/python/python-scons-native_0.97.bb
@@ -3,14 +3,5 @@ inherit native
DEPENDS = "python-native"
RDEPENDS = ""
-do_stage() {
- STAGING_LIBDIR=${STAGING_LIBDIR} \
- STAGING_INCDIR=${STAGING_INCDIR} \
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_LIBDIR}/.. --install-data=${STAGING_DATADIR} || \
- oefatal "python setup.py install execution failed."
-}
+NATIVE_INSTALL_WORKS = "1"
-do_install() {
- :
-}
diff --git a/meta/packages/python/python-urlgrabber-native_3.1.0.bb b/meta/packages/python/python-urlgrabber-native_3.1.0.bb
index 5e43ca2d8..353fd6530 100644
--- a/meta/packages/python/python-urlgrabber-native_3.1.0.bb
+++ b/meta/packages/python/python-urlgrabber-native_3.1.0.bb
@@ -3,8 +3,5 @@ inherit native
DEPENDS = "python-native"
RDEPENDS = ""
-do_stage() {
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
- ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
-}
+NATIVE_INSTALL_WORKS = "1"
+
diff --git a/meta/packages/python/yum-metadata-parser-native_1.1.2.bb b/meta/packages/python/yum-metadata-parser-native_1.1.2.bb
index 8a43ec462..3fff85afa 100644
--- a/meta/packages/python/yum-metadata-parser-native_1.1.2.bb
+++ b/meta/packages/python/yum-metadata-parser-native_1.1.2.bb
@@ -5,8 +5,4 @@ RDEPENDS = ""
#BUILD_CFLAGS += "-I${STAGING_LIBDIR}/glib-2.0"
-do_stage() {
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
- ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
-}
+NATIVE_INSTALL_WORKS = "1"