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

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

2005/01/03 22:31:46+01:00 hrw.one.pl!hrw
timesleuth is not game so moved from qpe-games to own directory

2005/01/03 22:23:43+01:00 hrw.one.pl!hrw
added opie/security SECTION for opie-security plugins as they were packaged like normal applications before

BKrev: 41d9bbb8deZoVHyqhZXAuipJBrYREw

10 files changed, 211 insertions, 8 deletions

diff --git a/classes/opie.bbclass b/classes/opie.bbclass
index e69de29bb2..55b3a9cb6e 100644
--- a/classes/opie.bbclass
+++ b/classes/opie.bbclass
@@ -0,0 +1,95 @@
+#
+# This oeclass takes care about some of the itchy details of installing parts
+# of Opie applications. Depending on quicklaunch or not, plugin or not, the
+# TARGET is either a shared object, a shared object with a link to quicklauncher,
+# or a usual binary.
+# 
+# You have to provide two things: 1.) A proper SECTION field, and 2.) a proper APPNAME
+# Then opie.oeclass will:
+#    * create the directory for the binary and install the binary file(s)
+#    * for applications: create the directory for the .desktop and install the .desktop file
+#    * for quicklauncher applications: create the startup symlink to the quicklauncher
+# You can override the automatic detection of APPTYPE, valid values are 'quicklaunch', 'binary', 'plugin'
+# You can override the default location of APPDESKTOP (<workdir>/apps/<section>/)
+#
+
+inherit palmtop
+
+DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}"
+
+# to be consistent, put all targets into workdir
+EXTRA_QMAKEVARS_POST_append = " DESTDIR=${S}"
+
+# plan for later:
+# add common scopes for opie applications, see qmake-native/common.pro
+# qmake should care about all the details then. qmake can do that, i know it :)
+#
+
+python opie_do_opie_install() {
+	import os, shutil
+	section = bb.data.getVar( "SECTION", d ).split( '/' )[1] or "Applications"
+	section = section.title()
+	if section in ( "Base", "Libs" ):
+		bb.note( "Section = Base or Libs. Target won't be installed automatically." )
+		return
+
+	#               SECTION         : BINDIR			DESKTOPDIR
+	dirmap = { 	"Applets" 	: ( "/plugins/applets",		None 			),
+			"Applications" 	: ( "<BINDIR>",			"/apps/Applications" 	),
+			"Multimedia"	: ( "<BINDIR>",			"/apps/Applications"	),
+			"Games"		: ( "<BINDIR>",			"/apps/Games"		),
+			"Settings"	: ( "<BINDIR>",			"/apps/Settings"	),
+			"Pim"		: ( "<BINDIR>",			"/apps/1Pim"		),
+			"Examples"	: ( "<BINDIR>",			"/apps/Examples"	),
+			"Shell"		: ( "/bin",			"/apps/Opie-SH"		),
+			"Codecs"	: ( "/plugins/codecs",		None			),
+			"Decorations"	: ( "/plugins/decorations",	None			),
+			"Inputmethods"	: ( "/plugins/inputmethods",	None			),
+			"Fontfactories" : ( "/plugins/fontfactories",	None			),
+			"Security"	: ( "/plugins/security",	None			),
+			"Styles"	: ( "/plugins/styles",		None			),
+			"Today"		: ( "/plugins/today",		None			),
+		"Networksettings"	: ( "/plugins/networksettings", None			) }
+
+	if section not in dirmap:
+		raise ValueError, "Unknown section '%s'. Valid sections are: %s" % ( section, dirmap.keys() )
+	
+	bindir, desktopdir = dirmap[section]
+	APPNAME = bb.data.getVar( "APPNAME", d, True ) or bb.data.getVar( "PN", d, True )
+	APPTYPE = bb.data.getVar( "APPTYPE", d, True )
+	if not APPTYPE:
+		if bindir == "<BINDIR>":
+			APPTYPE = "quicklaunch"
+		else:
+			APPTYPE = "plugin"
+
+	appmap = { "binary":"/bin", "quicklaunch":"/plugins/application" }
+	if bindir == "<BINDIR>": bindir = appmap[APPTYPE]
+	
+	bb.note( "Section='%s', bindir='%s', desktopdir='%s', name='%s', type='%s'" %
+               ( section, bindir, desktopdir, APPNAME, APPTYPE ) )
+
+	S = bb.data.getVar( "S", d, 1 )
+	D = "%s/image" % bb.data.getVar( "WORKDIR", d, True )
+	WORKDIR = bb.data.getVar( "WORKDIR", d, True )
+	palmtopdir = bb.data.getVar( "palmtopdir", d )
+	APPDESKTOP = bb.data.getVar( "APPDESKTOP", d, True ) or "%s/%s" % ( WORKDIR, desktopdir )
+
+	if desktopdir is not None:
+		os.system( "install -d %s%s%s/" % ( D, palmtopdir, desktopdir ) )
+		os.system( "install -m 0644 %s/%s.desktop %s%s%s/" % ( APPDESKTOP, APPNAME, D, palmtopdir, desktopdir ) )
+
+	os.system( "install -d %s%s%s/" % ( D, palmtopdir, bindir ) )
+
+	if APPTYPE == "binary":
+		os.system( "install -m 0755 %s/%s %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
+	elif APPTYPE == "quicklaunch":
+		os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
+		os.system( "install -d %s%s/bin/" % ( D, palmtopdir ) )
+		os.system( "ln -sf %s/bin/quicklauncher %s%s/bin/%s" % ( palmtopdir, D, palmtopdir, APPNAME ) )
+	elif APPTYPE == "plugin":
+		os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
+}
+
+EXPORT_FUNCTIONS do_opie_install
+addtask opie_install after do_compile before do_populate_staging
diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_1.1.8.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_1.1.8.bb
index e69de29bb2..525ee95a3b 100644
--- a/packages/opie-securityplugins/opie-securityplugin-blueping_1.1.8.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-blueping_1.1.8.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Blueping plugin for opie-security authentication. \
+This is a bluetooth-based authentication plugin (you need \
+to have another Bluetooth device around to use it)."
+SECTION = "opie/security"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+I18N_FILES = "libmultiauthbluepingplugin.ts"
+RDEPENDS = "opie-security bluez-utils"
+PR = "r1"
+
+APPNAME = "multiauthbluepingplugin"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/blueping \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
+
+S = "${WORKDIR}/blueping"
+
+inherit opie
+
+# FILES plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth
+do_install() {
+        install -d ${D}${palmtopdir}/pics/security/
+        install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
index 95128604fd..d7266fc636 100644
--- a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Blueping plugin for opie-security authentication. \
 This is a bluetooth-based authentication plugin (you need \
 to have another Bluetooth device around to use it)."
-SECTION = "opie/settings"
+SECTION = "opie/security"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
@@ -9,7 +9,7 @@ I18N_FILES = "libmultiauthbluepingplugin.ts"
 RDEPENDS = "opie-security bluez-utils"
 PV = "1.1.8+cvs-${CVSDATE}"
 APPNAME = "multiauthbluepingplugin"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/blueping \
            ${HANDHELDS_CVS};module=opie/pics "
diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_1.1.8.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_1.1.8.bb
index e69de29bb2..cc5c7bb229 100644
--- a/packages/opie-securityplugins/opie-securityplugin-dummy_1.1.8.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-dummy_1.1.8.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Dummy plugin for opie-security authentication. \
+This is a very simple authentication plugin (you just have \
+to press a button basically), for demonstration purpose."
+SECTION = "opie/security"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+I18N_FILES = "libmultiauthdummyplugin.ts"
+RDEPENDS = "opie-security"
+PR = "r1"
+
+APPNAME = "multiauthdummyplugin"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/dummy \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
+
+S = "${WORKDIR}/dummy"
+
+inherit opie
+
+# FILES plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/security
+        install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
index 7ee57ccf40..37910034aa 100644
--- a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Dummy plugin for opie-security authentication. \
 This is a very simple authentication plugin (you just have \
 to press a button basically), for demonstration purpose."
-SECTION = "opie/settings"
+SECTION = "opie/security"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
@@ -9,7 +9,7 @@ I18N_FILES = "libmultiauthdummyplugin.ts"
 RDEPENDS = "opie-security"
 PV = "1.1.8+cvs-${CVSDATE}"
 APPNAME = "multiauthdummyplugin"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/dummy \
            ${HANDHELDS_CVS};module=opie/pics "
diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_1.1.8.bb b/packages/opie-securityplugins/opie-securityplugin-notice_1.1.8.bb
index e69de29bb2..c0b01de4e6 100644
--- a/packages/opie-securityplugins/opie-securityplugin-notice_1.1.8.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-notice_1.1.8.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Notice plugin for opie-security authentication. \
+It allows you to display, for example, a notice from your legal departement."
+SECTION = "opie/security"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+I18N_FILES = "libmultiauthnoticeplugin.ts"
+RDEPENDS = "opie-security"
+PR = "r1"
+
+APPNAME = "multiauthnoticeplugin"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/notice \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
+
+S = "${WORKDIR}/notice"
+
+inherit opie
+
+# FILES plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/security/
+        install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
index 040350f970..e647ccaeb4 100644
--- a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Notice plugin for opie-security authentication. \
 It allows you to display, for example, a notice from your legal departement."
-SECTION = "opie/settings"
+SECTION = "opie/security"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
@@ -8,7 +8,7 @@ I18N_FILES = "libmultiauthnoticeplugin.ts"
 RDEPENDS = "opie-security"
 PV = "1.1.8+cvs-${CVSDATE}"
 APPNAME = "multiauthnoticeplugin"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/notice \
            ${HANDHELDS_CVS};module=opie/pics "
diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_1.1.8.bb b/packages/opie-securityplugins/opie-securityplugin-pin_1.1.8.bb
index e69de29bb2..5a3bbd14ce 100644
--- a/packages/opie-securityplugins/opie-securityplugin-pin_1.1.8.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-pin_1.1.8.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "PIN plugin for opie-security authentication. \
+It implements the same kind of widgets as opie-security package, \
+but this implementation can be used along with other authentication \
+methods in the Opie Multi-Authentication Framework."
+SECTION = "opie/security"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+I18N_FILES = "libmultiauthpinplugin.ts"
+RDEPENDS = "opie-security"
+PR = "r1"
+
+APPNAME = "multiauthpinplugin"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/pin \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
+
+S = "${WORKDIR}/pin"
+
+inherit opie
+
+# FILES plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/security/
+        install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
index 999e641a52..951c728222 100644
--- a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "PIN plugin for opie-security authentication. \
 It implements the same kind of widgets as opie-security package, \
 but this implementation can be used along with other authentication \
 methods in the Opie Multi-Authentication Framework."
-SECTION = "opie/settings"
+SECTION = "opie/security"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
@@ -10,7 +10,7 @@ I18N_FILES = "libmultiauthpinplugin.ts"
 RDEPENDS = "opie-security"
 PV = "1.1.8+cvs-${CVSDATE}"
 APPNAME = "multiauthpinplugin"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/pin \
            ${HANDHELDS_CVS};module=opie/pics "
diff --git a/packages/qpe-games/timesleuth_1.0.5.bb b/packages/timesleuth/timesleuth_1.0.5.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/qpe-games/timesleuth_1.0.5.bb
+++ b/packages/timesleuth/timesleuth_1.0.5.bb