From 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 9 Dec 2004 09:47:41 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA --- packages/python/python-pyqwt_3.10.bb | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/python/python-pyqwt_3.10.bb (limited to 'packages/python/python-pyqwt_3.10.bb') diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3 From 6579e8daf68dd520b702412208bfeae85af6fadc Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 8 Feb 2005 18:05:47 +0000 Subject: make python 2.4 as default, move python-sip into python/, make sip4 as default BKrev: 4208ff7b-sgl7QbT_1xhYPmdi-Oy4g --- packages/python/python-pyqwt_3.10.bb | 64 ++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'packages/python/python-pyqwt_3.10.bb') diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb index e69de29bb2..1f41ab0459 100644 --- a/packages/python/python-pyqwt_3.10.bb +++ b/packages/python/python-pyqwt_3.10.bb @@ -0,0 +1,64 @@ +DESCRIPTION = "Python QWT Bindings, QtE edition" +HOMEPAGE = "http://www.vanille.de/projects/python.spy" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "GPL" +RDEPENDS = "python-core python-sip python-pyqt (>=${PV}) python-numeric qwt" +DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt" +SRCNAME = "pyqwt" +PR = "ml2" + +SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \ + file://qt2.x-compat.patch;patch=1 \ + file://features" +S = "${WORKDIR}/PyQwt-20040118" + +inherit qmake sip + +QMAKE_PROFILES = "pyqwt.pro" +EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" +SIP_MODULES = "qwt" +SIP_FEATURES = "${WORKDIR}/features" +EXTRA_OEMAKE = " MAKEFLAGS= " + +EXTRA_QMAKEVARS_POST += "CONFIG=qt CONFIG+=warn_on CONFIG+=release \ + TARGET=qwt DESTDIR= VERSION=1.0.0 \ + DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=HAS_NUMERIC DEFINES+=QWS \ + INCLUDEPATH+=../numpy \ + INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \ + INCLUDEPATH+=${STAGING_INCDIR} \ + LIBS+=-L${STAGING_LIBDIR}/python2.3/site-packages \ + LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe " + +do_generate_prepend() { + echo -e "TEMPLATE=subdirs\nSUBDIRS=qwt\n" >pyqwt.pro + + echo "%Makefile qwt.pro.in" >>sip/qwtmod.sip + echo "TEMPLATE=lib" >>sip/qwtmod.sip + echo 'SOURCES = $B' >>sip/qwtmod.sip + echo 'HEADERS = $H' >>sip/qwtmod.sip + echo "%End" >>sip/qwtmod.sip + + mkdir -p sip/qwt/ + mv sip/*.* sip/qwt/ +} + +do_stage() { + install -d ${STAGING_SIPDIR}/qt/ + for module in ${SIP_MODULES} + do + install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ + install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/python2.3/site-packages/${module}.so + done +} + +do_install() { + install -d ${D}/${libdir}/python2.3/site-packages/ + for module in ${SIP_MODULES} + do + install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/python2.3/site-packages/${module}.so + done +} + +FILES_${PN} = "/usr/lib/python2.3/site-packages" -- cgit v1.2.3 From fb2fa1075ab82a84ead46c6d400755297bcc39f4 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 9 Feb 2005 00:06:49 +0000 Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/09 01:04:39+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/09 01:04:15+01:00 uni-frankfurt.de!mickeyl remove direct references to python2.3, instead compute PYTHON_DIR in distutils. Split distutils into distutils-base and distutils. BKrev: 42095419HYtcbp33LQCUNFdiLMXHog --- packages/python/python-pyqwt_3.10.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'packages/python/python-pyqwt_3.10.bb') diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb index 1f41ab0459..cf8543f6c8 100644 --- a/packages/python/python-pyqwt_3.10.bb +++ b/packages/python/python-pyqwt_3.10.bb @@ -26,9 +26,9 @@ EXTRA_QMAKEVARS_POST += "CONFIG=qt CONFIG+=warn_on CONFIG+=release \ TARGET=qwt DESTDIR= VERSION=1.0.0 \ DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=HAS_NUMERIC DEFINES+=QWS \ INCLUDEPATH+=../numpy \ - INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \ + INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ INCLUDEPATH+=${STAGING_INCDIR} \ - LIBS+=-L${STAGING_LIBDIR}/python2.3/site-packages \ + LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages \ LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe " do_generate_prepend() { @@ -49,16 +49,16 @@ do_stage() { for module in ${SIP_MODULES} do install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ - install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/python2.3/site-packages/${module}.so + install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so done } do_install() { - install -d ${D}/${libdir}/python2.3/site-packages/ + install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/ for module in ${SIP_MODULES} do - install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/python2.3/site-packages/${module}.so + install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/${PYTHON_DIR}/site-packages/${module}.so done } -FILES_${PN} = "/usr/lib/python2.3/site-packages" +FILES_${PN} = "/usr/lib/${PYTHON_DIR}/site-packages" -- cgit v1.2.3 From 162167d945c624fb80da51089e65d198af7105a2 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 9 Feb 2005 00:18:35 +0000 Subject: compute python version based on staging area, not on host python *cough*. inherit distutils-base for sip, pyqt, and pyqwt BKrev: 420956dbKk6Hb3R1N-CN8-KJ3liYdQ --- packages/python/python-pyqwt_3.10.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/python/python-pyqwt_3.10.bb') diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb index cf8543f6c8..7b3c8ab28f 100644 --- a/packages/python/python-pyqwt_3.10.bb +++ b/packages/python/python-pyqwt_3.10.bb @@ -7,14 +7,14 @@ LICENSE = "GPL" RDEPENDS = "python-core python-sip python-pyqt (>=${PV}) python-numeric qwt" DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt" SRCNAME = "pyqwt" -PR = "ml2" +PR = "ml3" SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \ file://qt2.x-compat.patch;patch=1 \ file://features" S = "${WORKDIR}/PyQwt-20040118" -inherit qmake sip +inherit qmake sip distutils-base QMAKE_PROFILES = "pyqwt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" -- cgit v1.2.3 From 4f857db335de6935077d4866c51dd9d6851fed1d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Tue, 22 Feb 2005 12:53:55 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/21 17:35:27-06:00 ti.com!kergoth Kill the ipkg paths patch, since its busted. 2005/02/21 17:33:13-06:00 ti.com!kergoth Fix sbindir in native.bbclass and cross.bbclass. Thanks to Jordan Crouse for reporting. 2005/02/21 17:13:19-06:00 ti.com!kergoth Add the paths patch to ipkg which fixes it to no longer hardcode the '/usr/lib/ipkg' path, which I forgot to check in from the previous commit. 2005/02/21 17:09:46-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/02/21 17:09:03-06:00 ti.com!kergoth Run a sed script against our packages to fix some hardcoded target path references. As always when I do things like this, if packages you maintain were touched by this, please do a sanity check to ensure the sed script didn't run wild. 2005/02/21 15:49:47-06:00 ti.com!kergoth Use a HOTPLUG variable to manage which hotplug you prefer, to ensure that hotplug is still included in task-bootstrap even if you dont set DISTRO. BKrev: 421b2b63X5eoMcSrC7pVcptXK-iFKg --- packages/python/python-pyqwt_3.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/python/python-pyqwt_3.10.bb') diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb index 7b3c8ab28f..c39661bd28 100644 --- a/packages/python/python-pyqwt_3.10.bb +++ b/packages/python/python-pyqwt_3.10.bb @@ -61,4 +61,4 @@ do_install() { done } -FILES_${PN} = "/usr/lib/${PYTHON_DIR}/site-packages" +FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" -- cgit v1.2.3 From dba2b89720b0318a28ebe7778294873b9353f71d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 23 Feb 2005 12:47:30 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 11:34:13+01:00 mn-solutions.de!schurig Merge http://oe-devel@openembedded.bkbits.net/openembedded into mnz66.mn-solutions.de:/usr/src/oe/p 2005/02/23 11:33:31+01:00 mn-solutions.de!schurig fix installation stage 2005/02/23 09:27:44+00:00 (none)!xora New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission 2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though. 2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl bump cvsdate on oz-3.5.3 2005/02/22 17:37:44-06:00 ti.com!kergoth Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp. Thanks to holger freyther for pointing it out. BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A --- packages/python/python-pyqwt_3.10.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/python/python-pyqwt_3.10.bb') diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb index c39661bd28..8677ed05ea 100644 --- a/packages/python/python-pyqwt_3.10.bb +++ b/packages/python/python-pyqwt_3.10.bb @@ -54,10 +54,10 @@ do_stage() { } do_install() { - install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/ + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ for module in ${SIP_MODULES} do - install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/${PYTHON_DIR}/site-packages/${module}.so + install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so done } -- cgit v1.2.3