Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/05 18:18:16+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/05 17:03:34+01:00 uni-frankfurt.de!mickeyl
package libopie2-examples

2005/01/05 16:42:54+01:00 (none)!koen
fix feed locations, courtesy Bob Davies

BKrev: 41dc267834hnlwl0ZPDBjoUVWIeI-g

3 files changed, 112 insertions, 9 deletions

diff --git a/packages/libopie/libopie2_1.1.8.bb b/packages/libopie/libopie2_1.1.8.bb
index 669fd5d1fc..f48ef36f2e 100644
--- a/packages/libopie/libopie2_1.1.8.bb
+++ b/packages/libopie/libopie2_1.1.8.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
 DEPENDS = "libqpe-opie sqlite3 libpcap"
 PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2 "
-PR = "r3"
+PR = "r4"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
@@ -38,12 +38,12 @@ do_compile() {
 	do
 		install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
 	done
-	
+
 	for i in opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h
 	do
-		install -m 0644 opiepim/private/$i ${STAGING_INCDIR}/opie2/private/	
+		install -m 0644 opiepim/private/$i ${STAGING_INCDIR}/opie2/private/
 	done
-	
+
 	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
 }
 
@@ -62,15 +62,38 @@ do_stage() {
 	install -m 0644 opiepim/core/opimtemplatebase.h ${STAGING_INCDIR}/opie2/
 }
 
+EXAMPLES = "\
+	oconfigdemo		\
+	oglobalsettingsdemo	\
+	onetworkdemo		\
+	oplugins		\
+	osoundsystemdemo	\
+	owidgetstack-example	\
+	odebugdemo		\
+	olistviewdemo		\
+	onotifydemo		\
+	oprocessdemo		\
+	osplitter_example	\
+	sqltest			\
+"
+
 do_install() {
 	install -d ${D}/${palmtopdir}/lib
 	for f in ${LIBS}
 	do
 		oe_libinstall -so libopie$f ${D}/${palmtopdir}/lib
 	done
+
+	install -d ${D}/${palmtopdir}/bin
+	for f in ${EXAMPLES}
+	do
+		install -m 0755 $f ${D}/${palmtopdir}/bin
+	done
 }
 
-PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
+PACKAGES = "libopie2-examples libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
+
+FILES_libopie2-examples = "${palmtopdir}/bin"
 FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*"
 FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*"
 FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*"
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index db2f665adf..9a5c372a98 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
 DEPENDS = "libqpe-opie sqlite3 libpcap"
 PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
-PR = "r8"
+PR = "r9"
 PV = "1.1.8+cvs-${CVSDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
@@ -24,6 +24,20 @@ EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
 
 EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=y'
 
+EXAMPLES = "\
+	oconfigdemo		\
+	oglobalsettingsdemo	\
+	onetworkdemo		\
+	oplugins		\
+	osoundsystemdemo	\
+	owidgetstack-example	\
+	odebugdemo		\
+	olistviewdemo		\
+	onotifydemo		\
+	oprocessdemo		\
+	osplitter_example	\
+	sqltest			\
+"
 # uclibc doesn't have backtrace()
 python __anonymous () {
     import bb, re
@@ -38,12 +52,12 @@ do_compile() {
 	do
 		install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
 	done
-	
+
 	for i in opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h
 	do
-		install -m 0644 opiepim/private/$i ${STAGING_INCDIR}/opie2/private/	
+		install -m 0644 opiepim/private/$i ${STAGING_INCDIR}/opie2/private/
 	done
-	
+
 	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
 }
 
@@ -62,12 +76,33 @@ do_stage() {
 	install -m 0644 opiepim/core/opimtemplatebase.h ${STAGING_INCDIR}/opie2/
 }
 
+EXAMPLES = "\
+	oconfigdemo		\
+	oglobalsettingsdemo	\
+	onetworkdemo		\
+	oplugins		\
+	osoundsystemdemo	\
+	owidgetstack-example	\
+	odebugdemo		\
+	olistviewdemo		\
+	onotifydemo		\
+	oprocessdemo		\
+	osplitter_example	\
+	sqltest			\
+"
+
 do_install() {
 	install -d ${D}/${palmtopdir}/lib
 	for f in ${LIBS}
 	do
 		oe_libinstall -so libopie$f ${D}/${palmtopdir}/lib
 	done
+
+	install -d ${D}/${palmtopdir}/bin
+	for f in ${EXAMPLES}
+	do
+		install -m 0755 $f ${D}/${palmtopdir}/bin
+	done
 }
 
 PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
diff --git a/packages/meta/sectest-gpe-image.bb b/packages/meta/sectest-gpe-image.bb
index e69de29bb2..9ef9f27629 100644
--- a/packages/meta/sectest-gpe-image.bb
+++ b/packages/meta/sectest-gpe-image.bb
@@ -0,0 +1,45 @@
+MAINTAINER = "Bob Davies  <tyggerbob@rogers.com>"
+FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
+                                gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
+FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
+                                gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
+FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/x11 \
+                                gpe##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/gpe"
+
+PR = "r2"
+
+export IMAGE_BASENAME = "sectest-gpe-image"
+
+GUI_MACHINE_CLASS ?= "none"
+
+GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GUI_MACHINE_CLASS}}"
+GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
+
+GPE_EXTRA_THEMES = "gtk-theme-industrial gtk-industrial-engine matchbox-themes-extra-industrial"
+
+#GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
+#GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
+GPE_EXTRA_DEPENDS_bigscreen = "minimo"
+GPE_EXTRA_INSTALL_bigscreen = "minimo gpe-task-games ${GPE_EXTRA_THEMES}"
+
+GPE_EXTRA_DEPENDS_smallscreen = ""
+GPE_EXTRA_INSTALL_smallscreen = "${GPE_EXTRA_THEMES}"
+
+GPE_EXTRA_DEPENDS_none = ""
+GPE_EXTRA_INSTALL_none = ""
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+DEPENDS = "task-bootstrap \
+	   meta-sectest-gpe \
+	   ${GPE_EXTRA_DEPENDS}"
+
+export IPKG_INSTALL = "task-bootstrap gpe-task-base \
+           	       gpe-task-pim gpe-task-settings \
+	               gpe-task-apps ${GPE_EXTRA_DEPENDS} \
+		       ${XSERVER} \
+		       ${GPE_EXTRA_INSTALL}"
+
+ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
+
+inherit image_ipk