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

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/12/14 12:27:14+01:00 (none)!br1
Merge http://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/oe/openembedded

2004/12/14 12:26:43+01:00 (none)!br1
add mtx-1 i2c support

2004/12/14 11:02:03+01:00 (none)!br1
unik-olsrd 0.4.8

2004/12/14 11:00:53+01:00 (none)!br1
little fixes for bitbake

2004/12/14 10:59:06+01:00 (none)!br1
nylon updates

2004/12/14 03:27:14-06:00 ti.com!kergoth
More PACKAGE_ARCH/MACHINE_ARCH updates for the multi-z builds.

BKrev: 41bee140kQ_QwKwcIxgyouZUyeqwmA

2 files changed, 266 insertions, 0 deletions

diff --git a/packages/opie-taskbar/opie-taskbar_1.1.7.bb b/packages/opie-taskbar/opie-taskbar_1.1.7.bb
index e69de29bb2..f7372ae442 100644
--- a/packages/opie-taskbar/opie-taskbar_1.1.7.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.1.7.bb
@@ -0,0 +1,134 @@
+DESCRIPTION = "Opie Launcher and Taskbar"
+SECTION = "opie/base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+DEPENDS = "opie-libqrsync"
+PR = "r2"
+
+APPNAME = "qpe"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
+	   file://nomax.patch;patch=1;pnum=3 \
+           file://server.pro-1.1.7 \
+           file://opie-reorgfiles \
+           file://opie \
+           file://qpe.conf \
+	   file://opie_defaults"
+
+S = "${WORKDIR}/launcher"
+
+CXXFLAGS_append_husky = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_corgi = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_shepherd = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
+
+# Caps/Numlock icons for devices with keyboard
+EXTRA_QMAKEVARS_POST_append_collie 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_poodle 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_shepherd 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_corgi 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_husky 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_tosa 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+
+# Wallpaper and welcome splash
+PIXMAP_SIZE 		= ""
+PIXMAP_SIZE_shepherd 	= "-640x480"
+PIXMAP_SIZE_corgi 	= "-640x480"
+PIXMAP_SIZE_husky 	= "-640x480"
+# PIXMAP_SIZE_tosa 	= "-640x480"
+PIXMAP_SIZE_simpad 	= "-800x600"
+
+inherit opie update-rc.d
+
+INITSCRIPT_NAME = "opie"
+INITSCRIPT_PARAMS = "defaults 99"
+
+do_configure_prepend() {
+	ln -s ${WORKDIR}/calibrate ${S}/calibrate
+	ln -s ${WORKDIR}/mediummount ${S}/mediummount
+	install -m 0644 ${WORKDIR}/server.pro-1.1.7 ${S}/server.pro
+}
+
+do_stage() {
+    install obexinterface.h ${STAGING_INCDIR}/
+
+}
+
+SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings"
+PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png"
+
+do_install() {
+	install -d ${D}/${palmtopdir}/bin
+	for i in ${SECTIONS}
+	do
+		install -d ${D}/${palmtopdir}/apps/$i/
+		install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}/${palmtopdir}/apps/$i/
+	done
+	install -d ${D}/${palmtopdir}/pics/launcher
+	install -d ${D}/${palmtopdir}/pics/logo
+	install -d ${D}/${palmtopdir}/pics/RoH/star/
+	install -d ${D}/etc/init.d
+	install -d ${D}/etc/profile.d
+	install -d ${D}/${palmtopdir}/etc/colors
+	install -d ${D}/${palmtopdir}/etc/skel
+
+	install -m 0755 ${S}/qpe ${D}/${palmtopdir}/bin/qpe
+	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
+	install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
+	install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
+	install -m 0644 ${WORKDIR}/opie_defaults ${D}/etc/profile.d/
+
+	for p in ${PICS}
+	do
+		install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}/${palmtopdir}/pics/launcher/$p
+	done
+	install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/firstuse.jpg
+	install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/opie-background.jpg
+
+	install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}/${palmtopdir}/pics/logo/
+	install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}/${palmtopdir}/pics/RoH/star/
+
+	install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
+	install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/
+
+	install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
+	install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
+}
+
+# These two should be installed only on devices with keyboard
+do_install_append_collie () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_poodle () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_corgi () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_shepherd () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_husky () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_tosa () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+
+FILES_opie-taskbar_append = " /etc /etc/profile.d ${palmtopdir}/apps ${palmtopdir}/pics"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index e69de29bb2..0a8b567062 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -0,0 +1,132 @@
+DESCRIPTION = "Opie Launcher and Taskbar"
+SECTION = "opie/base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+DEPENDS = "opie-libqrsync"
+PV = "1.1.7+cvs-${CVSDATE}"
+PR = "r3"
+APPNAME = "qpe"
+
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
+           ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
+           ${HANDHELDS_CVS};module=opie/core/launcher \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps \
+           ${HANDHELDS_CVS};module=opie/root \
+           ${HANDHELDS_CVS};module=opie/etc \
+	   file://nomax.patch;patch=1;pnum=3 \
+           file://server.pro \
+           file://opie-reorgfiles \
+           file://opie \
+           file://qpe.conf \
+	   file://locale.conf \
+	   file://opie_defaults"
+
+S = "${WORKDIR}/launcher"
+
+# Caps/Numlock icons for devices with keyboard
+EXTRA_QMAKEVARS_POST_append_collie 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_poodle 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_shepherd 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_corgi 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_husky 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_tosa 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+
+# Wallpaper and welcome splash
+PIXMAP_SIZE 		= ""
+PIXMAP_SIZE_shepherd 	= "-640x480"
+PIXMAP_SIZE_corgi 	= "-640x480"
+PIXMAP_SIZE_husky 	= "-640x480"
+# PIXMAP_SIZE_tosa 	= "-640x480"
+PIXMAP_SIZE_simpad 	= "-800x600"
+
+inherit opie update-rc.d
+
+INITSCRIPT_NAME = "opie"
+INITSCRIPT_PARAMS = "defaults 99"
+
+do_configure_prepend() {
+	ln -s ${WORKDIR}/calibrate ${S}/calibrate
+	ln -s ${WORKDIR}/mediummount ${S}/mediummount
+	install -m 0644 ${WORKDIR}/server.pro ${S}/server.pro
+}
+
+do_stage() {
+    install obexinterface.h ${STAGING_INCDIR}/
+
+}
+
+SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings"
+PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png"
+
+do_install() {
+	install -d ${D}/${palmtopdir}/bin
+	for i in ${SECTIONS}
+	do
+		install -d ${D}/${palmtopdir}/apps/$i/
+		install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}/${palmtopdir}/apps/$i/
+	done
+	install -d ${D}/${palmtopdir}/pics/launcher
+	install -d ${D}/${palmtopdir}/pics/logo
+	install -d ${D}/${palmtopdir}/pics/RoH/star/
+	install -d ${D}/etc/init.d
+	install -d ${D}/etc/profile.d	
+	install -d ${D}/${palmtopdir}/etc/colors
+	install -d ${D}/${palmtopdir}/etc/skel
+
+	install -m 0755 ${S}/qpe ${D}/${palmtopdir}/bin/qpe
+	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
+	install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
+	install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
+	install -m 0644 ${WORKDIR}/opie_defaults ${D}/etc/profile.d/
+
+	for p in ${PICS}
+	do
+		install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}/${palmtopdir}/pics/launcher/$p
+	done
+	install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/firstuse.jpg
+	install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/opie-background.jpg
+
+	install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}/${palmtopdir}/pics/logo/
+	install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}/${palmtopdir}/pics/RoH/star/
+
+	install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
+	install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/
+
+	install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
+	install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
+	if [ -s ${WORKDIR}/locale.conf ]; then
+	    install -m 0644 ${WORKDIR}/locale.conf ${D}/${palmtopdir}/etc/skel/
+	fi
+}
+
+# These two should be installed only on devices with keyboard
+do_install_append_collie () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_poodle () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_corgi () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_shepherd () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_husky () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_tosa () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+
+FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"