summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-19 13:15:43 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-19 13:15:43 +0000
commit3a2ad83b387319c5806b61bde4c6df87b9f35500 (patch)
treebf5fa21213e61528eb28f47d5a479ac9b249ebd6 /meta
parent47c19bb87a85073d69adfc20614a12a17e937e1d (diff)
downloadpoky-3a2ad83b387319c5806b61bde4c6df87b9f35500.tar.gz
osc-native: Stage using do_install (and add SRCREV)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc1
-rwxr-xr-xmeta/packages/osc/osc-native_svn.bb18
2 files changed, 9 insertions, 10 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 705d595675..96ffcf50ba 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -81,6 +81,7 @@ SRCREV_pn-opkg ?= "215"
81SRCREV_pn-opkg-utils-native ?= "4534" 81SRCREV_pn-opkg-utils-native ?= "4534"
82SRCREV_pn-opkg-utils ?= "4534" 82SRCREV_pn-opkg-utils ?= "4534"
83SRCREV_pn-oprofileui ?= "194" 83SRCREV_pn-oprofileui ?= "194"
84SRCREV_pn-osc-native ?= "9096"
84SRCREV_pn-libowl-av = "398" 85SRCREV_pn-libowl-av = "398"
85SRCREV_pn-owl-video = "394" 86SRCREV_pn-owl-video = "394"
86SRCREV_pn-psplash ?= "422" 87SRCREV_pn-psplash ?= "422"
diff --git a/meta/packages/osc/osc-native_svn.bb b/meta/packages/osc/osc-native_svn.bb
index 781fcff542..ef9a42a00a 100755
--- a/meta/packages/osc/osc-native_svn.bb
+++ b/meta/packages/osc/osc-native_svn.bb
@@ -3,29 +3,27 @@ HOMEPAGE = "http://en.opensuse.org/Build_Service/CLI"
3SECTION = "console/utils" 3SECTION = "console/utils"
4LICENSE = "GPL" 4LICENSE = "GPL"
5PV = "0.0+svnr${SRCREV}" 5PV = "0.0+svnr${SRCREV}"
6PR = "r0" 6PR = "r1"
7DEPENDS="python-native rpm-native" 7DEPENDS = "python-native rpm-native"
8RDEPENDS="" 8RDEPENDS = ""
9 9
10SRC_URI = "svn://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/clientlib/python;module=osc;proto=https" 10SRC_URI = "svn://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/clientlib/python;module=osc;proto=https"
11S = "${WORKDIR}/osc" 11S = "${WORKDIR}/osc"
12 12
13inherit native 13inherit native
14 14
15do_stage() { 15NATIVE_INSTALL_WORKS = "1"
16do_install() {
16 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 17 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
17 STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \ 18 STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
18 ${STAGING_BINDIR_NATIVE}/python setup.py build || 19 ${STAGING_BINDIR_NATIVE}/python setup.py build ||
19 oefatal "python setup.py build execution failed." 20 oefatal "python setup.py build execution failed."
20 21
21 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 22 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
22 STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \ 23 STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \
23 ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_BINDIR_NATIVE}/.. --install-data=${STAGING_DATADIR_NATIVE} || \ 24 ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}${prefix} --install-data=${D}${datadir} || \
24 oefatal "python setup.py install execution failed." 25 oefatal "python setup.py install execution failed."
25 26
26 ln -sf ${STAGING_BINDIR_NATIVE}/osc-wrapper.py ${STAGING_BINDIR_NATIVE}/osc 27 ln -sf osc-wrapper.py ${D}${bindir}/osc
27} 28}
28 29
29do_install() {
30 :
31}