diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/distro/include/poky-fixed-revisions.inc | 1 | ||||
| -rwxr-xr-x | meta/packages/osc/osc-native_svn.bb | 18 |
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" SRCREV_pn-opkg-utils-native ?= "4534" SRCREV_pn-opkg-utils ?= "4534" SRCREV_pn-oprofileui ?= "194" +SRCREV_pn-osc-native ?= "9096" SRCREV_pn-libowl-av = "398" SRCREV_pn-owl-video = "394" SRCREV_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" SECTION = "console/utils" LICENSE = "GPL" PV = "0.0+svnr${SRCREV}" -PR = "r0" -DEPENDS="python-native rpm-native" -RDEPENDS="" +PR = "r1" +DEPENDS = "python-native rpm-native" +RDEPENDS = "" SRC_URI = "svn://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/clientlib/python;module=osc;proto=https" S = "${WORKDIR}/osc" inherit native -do_stage() { +NATIVE_INSTALL_WORKS = "1" +do_install() { BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \ + STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \ ${STAGING_BINDIR_NATIVE}/python setup.py build || oefatal "python setup.py build execution failed." BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \ - ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_BINDIR_NATIVE}/.. --install-data=${STAGING_DATADIR_NATIVE} || \ + ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}${prefix} --install-data=${D}${datadir} || \ oefatal "python setup.py install execution failed." - ln -sf ${STAGING_BINDIR_NATIVE}/osc-wrapper.py ${STAGING_BINDIR_NATIVE}/osc + ln -sf osc-wrapper.py ${D}${bindir}/osc } -do_install() { - : -} |