summaryrefslogtreecommitdiffstats
path: root/meta/packages
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
parent5716a14bf4366d0c8fe2526759ca3500b4985bc5 (diff)
downloadpoky-47c19bb87a85073d69adfc20614a12a17e937e1d.tar.gz
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')
-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 275e60e329..d35b2808fe 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
16export STAGING_LIBDIR 16export STAGING_LIBDIR
17export STAGING_INCDIR 17export STAGING_INCDIR
18 18
19do_stage() {
20 autotools_stage_all
21}
22
23RDEPENDS = "python-io python-logging python-stringold python-threading python-xml" 19RDEPENDS = "python-io python-logging python-stringold python-threading python-xml"
24 20
25FILES_${PN}-dev += "${libdir}/pkgconfig 21FILES_${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 c2d633c5f2..bb841fed10 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
2inherit native 2inherit native
3DEPENDS = "python-native" 3DEPENDS = "python-native"
4RDEPENDS = "" 4RDEPENDS = ""
5NATIVE_INSTALL_WORKS = "1"
5 6
6do_stage() {
7 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
8 STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
9 ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
10}
diff --git a/meta/packages/python/python-pycairo_1.4.0.bb b/meta/packages/python/python-pycairo_1.4.0.bb
index 9bb2fdfcd8..8248775587 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}"
10 10
11inherit distutils pkgconfig 11inherit distutils pkgconfig
12 12
13do_stage() {
14 install -d ${STAGING_INCDIR}
15 install -m 0644 cairo/pycairo.h ${STAGING_INCDIR}
16
17 # nasty pkgconfig fix necessary here
18 sed -i -e s,${STAGING_DIR_NATIVE},, pycairo.pc
19}
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 a1c733334c..f5b9cb338c 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 = ""
7 7
8inherit native 8inherit native
9 9
10NATIVE_INSTALL_WORKS = "1"
11
10SRC_URI = "\ 12SRC_URI = "\
11 ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \ 13 ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
12# file://python-path.patch;patch=1 \ 14# file://python-path.patch;patch=1 \
13" 15"
14 16
15do_stage_append() { 17do_install_append() {
16 install -d ${STAGING_BINDIR} 18 install -d ${D}${bindir}
17 install -m 0755 gobject/generate-constants ${STAGING_BINDIR}/gobject-generate-constants 19 install -m 0755 gobject/generate-constants ${D}${bindir}/gobject-generate-constants
18} 20}
diff --git a/meta/packages/python/python-pygobject_2.16.0.bb b/meta/packages/python/python-pygobject_2.16.0.bb
index 773ffdff49..de07ec762c 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
22export STAGING_INCDIR 22export STAGING_INCDIR
23export STAGING_LIBDIR 23export STAGING_LIBDIR
24 24
25do_stage() {
26 autotools_stage_all
27 install -d ${STAGING_LIBDIR}/../share/pygobject/
28 cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/
29 install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
30 cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
31}
32
33PACKAGES += "${PN}-lib" 25PACKAGES += "${PN}-lib"
34 26
35RDEPENDS_${PN} += "python-textutils" 27RDEPENDS_${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 6b26f59ad8..c37f64e51d 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 += "\
49 ${bindir}/pygtk-* \ 49 ${bindir}/pygtk-* \
50 ${datadir}/pygtk/2.0" 50 ${datadir}/pygtk/2.0"
51 51
52do_stage() {
53 autotools_stage_includes
54 sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0
55 install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/
56 install -d ${STAGING_DATADIR}/pygtk/2.0/codegen
57 install -d ${STAGING_DATADIR}/pygtk/2.0/defs/
58 cp -pPr codegen/*.py* ${STAGING_DATADIR}/pygtk/2.0/codegen/
59 cp -pPr *.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
60 cp -pPr gtk/*.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
61}
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 4405212040..7912355449 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
3DEPENDS = "python-native" 3DEPENDS = "python-native"
4RDEPENDS = "" 4RDEPENDS = ""
5 5
6do_stage() { 6NATIVE_INSTALL_WORKS = "1"
7 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
8 STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
9 ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
10}
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 03468a0522..7523e11279 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"
5PRIORITY = "optional" 5PRIORITY = "optional"
6LICENSE = "GPL" 6LICENSE = "GPL"
7SRCNAME = "Pyrex" 7SRCNAME = "Pyrex"
8PR = "ml1" 8PR = "ml2"
9 9
10SRC_URI = "\ 10SRC_URI = "\
11 http://www.cosc.canterbury.ac.nz/greg.ewing/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ 11 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 45eeee117a..915cbabd90 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
3DEPENDS = "python-native" 3DEPENDS = "python-native"
4RDEPENDS = "" 4RDEPENDS = ""
5 5
6do_stage() { 6NATIVE_INSTALL_WORKS = "1"
7 STAGING_LIBDIR=${STAGING_LIBDIR} \
8 STAGING_INCDIR=${STAGING_INCDIR} \
9 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
10 ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_LIBDIR}/.. --install-data=${STAGING_DATADIR} || \
11 oefatal "python setup.py install execution failed."
12}
13 7
14do_install() {
15 :
16}
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 5e43ca2d87..353fd65307 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
3DEPENDS = "python-native" 3DEPENDS = "python-native"
4RDEPENDS = "" 4RDEPENDS = ""
5 5
6do_stage() { 6NATIVE_INSTALL_WORKS = "1"
7 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 7
8 STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
9 ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
10}
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 8a43ec462d..3fff85afa3 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 = ""
5 5
6#BUILD_CFLAGS += "-I${STAGING_LIBDIR}/glib-2.0" 6#BUILD_CFLAGS += "-I${STAGING_LIBDIR}/glib-2.0"
7 7
8do_stage() { 8NATIVE_INSTALL_WORKS = "1"
9 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
10 STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
11 ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
12}