diff options
| -rw-r--r-- | classes/opie.oeclass | 4 | ||||
| -rw-r--r-- | joe/joe_3.1.oe | 6 | ||||
| -rw-r--r-- | libmailwrapper/libmailwrapper_cvs.oe | 6 | ||||
| -rw-r--r-- | libopie/libopie2_cvs.oe | 48 | ||||
| -rw-r--r-- | libopieobex/libopieobex0_cvs.oe | 11 | ||||
| -rw-r--r-- | libopietooth/libopietooth_cvs.oe | 8 |
6 files changed, 41 insertions, 42 deletions
diff --git a/classes/opie.oeclass b/classes/opie.oeclass index f5327fd83b..cc94de0342 100644 --- a/classes/opie.oeclass +++ b/classes/opie.oeclass @@ -29,8 +29,8 @@ python opie_do_opie_install() { import os, shutil section = oe.data.getVar( "SECTION", d ).split( '/' )[1] or "Applications" section = section.title() - if section == "Base": - oe.note( "Section = Base --> target won't be installed automatically." ) + if section in ( "Base", "Libs" ): + oe.note( "Section = Base or Libs. Target won't be installed automatically." ) return # SECTION : BINDIR DESKTOPDIR diff --git a/joe/joe_3.1.oe b/joe/joe_3.1.oe index e69de29bb2..890db2f527 100644 --- a/joe/joe_3.1.oe +++ b/joe/joe_3.1.oe @@ -0,0 +1,6 @@ +DESCRIPTION = "Joe's own editor." +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" + +SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" + +inherit autotools diff --git a/libmailwrapper/libmailwrapper_cvs.oe b/libmailwrapper/libmailwrapper_cvs.oe index e67a54e729..839ec28c1a 100644 --- a/libmailwrapper/libmailwrapper_cvs.oe +++ b/libmailwrapper/libmailwrapper_cvs.oe @@ -1,17 +1,15 @@ DESCRIPTION = "Qt-based class wrapper of libetpan." SECTION = "opie/libs" PRIORITY = "optional" +MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "LGPL" DEPENDS = "libetpan" PV = "1.1.5-cvs-${CVSDATE}" SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/mail/libmailwrapper;date=${CVSDATE} " - S = "${WORKDIR}/libmailwrapper" -EXTRA_QMAKEVARS_POST = "DESTDIR=${S}" - -inherit palmtop +inherit opie do_stage () { install -d ${STAGING_INCDIR}/libmailwrapper/ diff --git a/libopie/libopie2_cvs.oe b/libopie/libopie2_cvs.oe index 8fe1b8b41d..857dcde07d 100644 --- a/libopie/libopie2_cvs.oe +++ b/libopie/libopie2_cvs.oe @@ -1,29 +1,27 @@ DESCRIPTION = "Base libraries for the Open Palmtop Integrated Environment" HOMEPAGE = "http://opie.handhelds.org" SECTION = "opie/libs" -PRIORITY = "optional" MAINTAINER = "Michael Lauer <mickey@Vanille.de>" LICENSE = "LGPL" DEPENDS = "libqpe-opie sqlite libpcap-0.7.2 virtual/kernel" PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2 " PV = "1.1.5-cvs-${CVSDATE}" -PR = "r1" +PR = "r2" SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/libopie2;date=${CVSDATE} \ file://include.pro" S = "${WORKDIR}/libopie2" -inherit qmake +inherit opie export QTDIR = "${STAGING_LIBDIR}/.." export OPIEDIR = "${STAGING_LIBDIR}/.." #FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file -EXTRA_QMAKEVARS_POST = ' DEFINES+=QWS \ - DEFINES+=OPIE_NEW_MALLOC \ - DEFINES+="OPIE_SOUND_FRAGMENT_SHIFT=16" \ - DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX ' +EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \ + DEFINES+="OPIE_SOUND_FRAGMENT_SHIFT=16" \ + DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX' EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=y' @@ -43,10 +41,15 @@ do_compile() { oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S} } -# no sophisticated staging neessary, because most include+lib files already done during do_compile -# only need some special case for uic-created header files here +LIBS = "core2 ui2 db2 mm2 net2 pim2 security2" +# need some special case for uic-created header files here do_stage() { + for f in ${LIBS} + do + oe_libinstall -so libopie$f ${STAGING_LIBDIR}/ + done + install -m 0644 ${WORKDIR}/include.pro ${OPIEDIR}/ install -m 0644 opiepim/ui/opimrecurrencebase.h ${STAGING_INCDIR}/opie2/ install -m 0644 opieui/otimepickerbase.h ${STAGING_INCDIR}/opie2/ @@ -54,23 +57,20 @@ do_stage() { } do_install() { - oe_libinstall -so -C ${STAGING_LIBDIR} libopiecore2 ${D}/${palmtopdir}/lib - oe_libinstall -so -C ${STAGING_LIBDIR} libopiedb2 ${D}/${palmtopdir}/lib - oe_libinstall -so -C ${STAGING_LIBDIR} libopiemm2 ${D}/${palmtopdir}/lib - oe_libinstall -so -C ${STAGING_LIBDIR} libopienet2 ${D}/${palmtopdir}/lib - oe_libinstall -so -C ${STAGING_LIBDIR} libopiepim2 ${D}/${palmtopdir}/lib - oe_libinstall -so -C ${STAGING_LIBDIR} libopieui2 ${D}/${palmtopdir}/lib - oe_libinstall -so -C ${STAGING_LIBDIR} libopiesecurity2 ${D}/${palmtopdir}/lib + install -d ${D}/${palmtopdir}/lib + for f in ${LIBS} + do + oe_libinstall -so libopie$f ${D}/${palmtopdir}/lib + done } PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2" -FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so.*" -FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so.*" -FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so.*" -FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so.*" -FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so.*" -FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so.*" -FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so.*" - +FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*" +FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*" +FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*" +FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*" +FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*" +FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*" +FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*" #FIXME: Add individual package descriptions and dependencies diff --git a/libopieobex/libopieobex0_cvs.oe b/libopieobex/libopieobex0_cvs.oe index 7e159d06ee..6e835ca3e1 100644 --- a/libopieobex/libopieobex0_cvs.oe +++ b/libopieobex/libopieobex0_cvs.oe @@ -1,8 +1,8 @@ DESCRIPTION = "IrDA obex support library" SECTION = "opie/libs" PRIORITY = "optional" -MAINTAINER = "Open Embedded <oe@handhelds.org>" -LICENSE = "GPL" +MAINTAINER = "Team Opie <opie@handhelds.org>" +LICENSE = "LGPL" DEPENDS = "opie-taskbar openobex" PV = "1.1.5-cvs-${CVSDATE}" APPNAME = "obex" @@ -11,11 +11,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/obex;dat cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics;date=${CVSDATE}" S = "${WORKDIR}/obex" -inherit palmtop - -EXTRA_QMAKEVARS_POST = 'DESTDIR="${S}"' - -FILES_${PN} = "${palmtopdir}/plugins/obex/ ${palmtopdir}/pics/obex/" +inherit opie do_install() { install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/ @@ -23,3 +19,4 @@ do_install() { oe_libinstall -so libopieobex ${D}${palmtopdir}/plugins/obex/ } +FILES_${PN} = "${palmtopdir}/plugins/obex/ ${palmtopdir}/pics/obex/" diff --git a/libopietooth/libopietooth_cvs.oe b/libopietooth/libopietooth_cvs.oe index dc346e9d06..0cad21ba84 100644 --- a/libopietooth/libopietooth_cvs.oe +++ b/libopietooth/libopietooth_cvs.oe @@ -2,13 +2,11 @@ DESCRIPTION = "Opie Bluetooth library" SECTION = "opie/libs" PRIORITY = "optional" DEPENDS = "libopie2" -MAINTAINER = "Open Embedded <oe@handhelds.org>" -LICENSE = "GPL" +MAINTAINER = "Team Opie <opie@handhelds.org> +LICENSE = "LGPL" PV = "1.1.5-cvs-${CVSDATE}" -inherit palmtop - -EXTRA_QMAKEVARS_POST = "DESTDIR=${S}" +inherit opie SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/opietooth/lib;date=${CVSDATE}" S = "${WORKDIR}/lib" |