Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/06/25 23:35:49+02:00 uni-frankfurt.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/06/25 22:03:02+02:00 uni-frankfurt.de!mickey
opie-today-mailplugin: s/DEPENDS/RDEPENDS/

2004/06/25 22:02:32+02:00 uni-frankfurt.de!mickey
zaurus kernel 2.6: catch up with upstream file renames

2004/06/25 22:01:15+02:00 uni-frankfurt.de!mickey
packaging and specs improvements for qte

BKrev: 40dd6843D4OUWmZqcTjzb-y-igCABQ

3 files changed, 112 insertions, 32 deletions

diff --git a/linux/openzaurus_2.6.7-jl2.oe b/linux/openzaurus_2.6.7-jl2.oe
index e69de29bb2..c3af3ef739 100644
--- a/linux/openzaurus_2.6.7-jl2.oe
+++ b/linux/openzaurus_2.6.7-jl2.oe
@@ -0,0 +1,56 @@
+DESCRIPTION = "Linux kernel 2.6 for Zaurus devices."
+LICENSE = "GPL"
+KV = "${@oe.data.getVar('PV',d,True).split('-')[0]}"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \
+           http://www.cs.wisc.edu/~lenz/zaurus/files/patch-${PV}.diff.gz;patch=1 \
+           file://patch-2.6.5-rp1.diff;patch=1 \
+           file://collie-config-${PV} \
+           file://poodle-config-${PV} \
+           file://husky-config-${PV}"
+S = "${WORKDIR}/linux-${KV}"
+
+inherit kernel
+
+#
+# Compensate for sucky bootloader on all Sharp Zaurus models
+#
+FILES_kernel = ""
+ALLOW_EMPTY = 1 
+        
+EXTRA_OEMAKE = ""
+COMPATIBLE_HOST = "arm.*-linux"
+KERNEL_CCSUFFIX = "-3.3.3"
+
+#FIXME: Use configuration system
+export MEM = "32"
+export RD = "32"
+export CMDLINE = "noinitrd root=/dev/mtdblock2 rootfstype=jffs2 console=tty0 jffs2_orphand_inodes=delete"
+export CMDLINEpxa = "console=ttyS0,9600n8 9600n8 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 console=tty0 jffs2_orphand_inodes=delete"
+
+do_configure() {
+        install -m 0644 ${WORKDIR}/${MACHINE}-config-${PV} ${S}/.config || die "No default configuration for ${MACHINE} available."
+
+        if [ "${MACHINE}" == "collie" ]
+	then
+		mem=${MEM}
+		rd=${RD}
+		mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
+		rdsize=`echo "$rd * 1024" | bc`
+		total=`expr $mem + $rd`
+		addr=`echo "obase=16; ibase=16; C000000 + $mempos" | bc`
+	 	if [ "$rd" == "0" ]
+	 	then
+			echo "# CONFIG_MTD_MTDRAM_SA1100 is not set" >> ${S}/.config
+		else
+			echo "CONFIG_MTD_MTDRAM_SA1100=y"           >> ${S}/.config
+			echo "CONFIG_MTDRAM_TOTAL_SIZE=$rdsize"     >> ${S}/.config
+			echo "CONFIG_MTDRAM_ERASE_SIZE=1"           >> ${S}/.config
+			echo "CONFIG_MTDRAM_ABS_POS=$addr"          >> ${S}/.config
+		fi
+		echo "CONFIG_CMDLINE=\"$CMDLINE mem=${mem}M\"" >> ${S}/.config
+	else
+		echo "CONFIG_CMDLINE=\"$CMDLINEpxa\"" >> ${S}/.config
+	fi
+        oe_runmake oldconfig
+}
diff --git a/opie-today-mailplugin/opie-today-mailplugin_cvs.oe b/opie-today-mailplugin/opie-today-mailplugin_cvs.oe
index f2a343e551..45f9cdacde 100644
--- a/opie-today-mailplugin/opie-today-mailplugin_cvs.oe
+++ b/opie-today-mailplugin/opie-today-mailplugin_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/today"
 PRIORITY = "optional"
 MAINTAINER = "Open Embedded <oe@handhelds.org>"
 LICENSE = "GPL"
-DEPENDS = "opie-today opie-mailapplet"
+RDEPENDS = "opie-today opie-mailapplet"
 PV = "1.1.4-cvs-${CVSDATE}"
 APPNAME = "todaymailplugin"
 
diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index c03df48bc0..a0414a6599 100644
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -4,27 +4,23 @@ PRIORITY = "optional"
 LICENSE = "GPL/QPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
 PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \
 	   file://qpe.patch;patch=1 \
 	   file://vt-switch.patch;patch=1 \
-	   file://tslib.patch;patch=1 \
-	   file://devfs.patch;patch=1 \
 	   file://no-moc.patch;patch=1 \
 	   file://gcc3_4.patch;patch=1 \
 	   file://update-qtfontdir \
 	   file://sharp_char.h \
 	   file://switches.h "
 
-#
-# FIXME: Apply the SIMpad hardware patch for SIMpad.
-#
-SRC_URI_append_simpad = "file://simpad.patch;patch=1 "
-#
-# FIXME: Apply the C7xx hardware patch for shepherd/husky/boxer
-#
-#SRC_URI_append_<machine> = "file://c700-hardware.patch;patch=1 "
+SRC_URI_append_simpad   = "file://simpad.patch;patch=1 file://devfs.patch;patch=1 "
+SRC_URI_append_corgi    = "file://c700-hardware.patch;patch=1 file://tslib.patch;patch=1 "
+SRC_URI_append_shepherd = "file://c700-hardware.patch;patch=1 file://tslib.patch;patch=1 " 
+SRC_URI_append_husky    = "file://c700-hardware.patch;patch=1 file://tslib.patch;patch=1 " 
+SRC_URI_append_h3600    = "file://tslib.patch;patch=1 file://devfs.patch;patch=1 "
+SRC_URI_append_h3900    = "file://tslib.patch;patch=1 file://devfs.patch;patch=1 "
 
 S = "${WORKDIR}/qt-${PV}"
 
@@ -52,8 +48,9 @@ EXTRA_OEMAKE = "-e"
 # FIXME: Add more here
 #
 EXTRA_DEFINES 		= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE"
-EXTRA_DEFINES_collie 	= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_h3600 	= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_collie 	= "            -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
+EXTRA_DEFINES_h3600     = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ                 -DQT_QWS_DEVFS" 
+EXTRA_DEFINES_h3900 	= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ                 -DQT_QWS_DEVFS"
 EXTRA_DEFINES_simpad	= "            -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS"
 EXTRA_DEFINES_shepherd  = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700"
 EXTRA_DEFINES_husky	= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700"
@@ -100,7 +97,7 @@ do_install() {
 	cp -a lib/fonts/* ${D}${palmtopdir}/lib/fonts/
 }
 
-pkg_postinst () {
+pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
 set -e
@@ -108,31 +105,58 @@ set -e
 ${sbindir}/update-qtfontdir
 }
 
-#
-# FIXME: Don't use the above but make the following work:
-#
+pkg_postinst_qte-font-unicode() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
 
-#pkg_postinst_qte-font-fixed() {
-#if [ -n $D ]; then exit 1; fi
-#/usr/sbin/update-qtfontdir
-#}
+pkg_postinst_qte-font-lcd () {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
 
-#pkg_postinst_qte-font-helvetica() {
-#if [ -n $D ]; then exit 1; fi
-#/usr/sbin/update-qtfontdir
-#}
+pkg_postinst_qte-font-japanese() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
+
+pkg_postinst_qte-font-micro() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
 
-#pkg_postinst_qte-fonts-smoothtimes() {
-#if [ -n $D ]; then exit 1; fi
-#/usr/sbin/update-qtfontdir
-#}
+pkg_postinst_qte-font-courier() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
 
-PACKAGES = "libqte2 qte-font-fixed qte-font-helvetica qte-font-smoothtimes qte-font-smallsmooth"
+PACKAGES = "libqte2 qte-font-fixed qte-font-helvetica qte-font-smoothtimes qte-font-smallsmooth \
+            qte-font-unicode qte-font-lcd qte-font-japanese qte-font-micro qte-font-courier"
 
 FILES_${PN} = ""
 FILES_libqte2 = "${palmtopdir}/lib/libqte.so* /usr/sbin/update-qtfontdir"
 FILES_qte-font-fixed = "${palmtopdir}/lib/fonts/fixed*"
-FILES_qte-font-helvetica = "${palmtopdir}/lib/fonts/helvetica*"
+FILES_qte-font-helvetica = "${palmtopdir}/lib/fonts/helv*"
 FILES_qte-font-smoothtimes = "${palmtopdir}/lib/fonts/smoothtimes*"
 FILES_qte-font-smallsmooth = "${palmtopdir}/lib/fonts/smallsmooth*"
+FILES_qte-font-unicode = "${palmtopdir}/lib/fonts/unifont*"
+FILES_qte-font-lcd = "${palmtopdir}/lib/fonts/lcd*"
+FILES_qte-font-japanese = "${palmtopdir}/lib/fonts/jap*"
+FILES_qte-font-micro = "${palmtopdir}/lib/fonts/micro*"
+FILES_qte-font-courier = "${palmtopdir}/lib/fonts/cour*"