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

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

2005/01/08 12:23:21+00:00 nexus.co.uk!pb
update ipkg to 0.99.135 and apply patch for provides/depends bug


2005/01/08 13:05:40+01:00 uni-frankfurt.de!mickeyl
minor adjustments to get a opie-image w/ kernel 2.6

BKrev: 41dfd4a8c4MPnpjSOylCKq2HKe77Ig

12 files changed, 60 insertions, 14 deletions

diff --git a/conf/machine/openzaurus-pxa-2.6.conf b/conf/machine/openzaurus-pxa-2.6.conf
index 3542659830..9c5b241196 100644
--- a/conf/machine/openzaurus-pxa-2.6.conf
+++ b/conf/machine/openzaurus-pxa-2.6.conf
@@ -7,4 +7,9 @@ include conf/machine/zaurus-clamshell.conf
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus"
 PREFERRED_VERSION_orinoco-modules = "20050101"
 
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules    orinoco-modules chkhinge"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel        hostap-modules-cs orinoco-modules chkhinge"
+# kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
+# kernel-module-usbdcore kernel-module-usbdmonitor chkhinge"
+
 ROOT_FLASH_SIZE = "64"
diff --git a/packages/ipkg/ipkg-0.99.129/uninclude-replace.patch b/packages/ipkg/files/uninclude-replace.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/ipkg/ipkg-0.99.129/uninclude-replace.patch
+++ b/packages/ipkg/files/uninclude-replace.patch
diff --git a/packages/ipkg/ipkg-0.99.130/uninclude-replace.patch b/packages/ipkg/ipkg-0.99.135/depends.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/ipkg/ipkg-0.99.130/uninclude-replace.patch
+++ b/packages/ipkg/ipkg-0.99.135/depends.patch
diff --git a/packages/ipkg/ipkg-0.99.135/terse.patch b/packages/ipkg/ipkg-0.99.135/terse.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipkg/ipkg-0.99.135/terse.patch
diff --git a/packages/ipkg/ipkg-native_0.99.135.bb b/packages/ipkg/ipkg-native_0.99.135.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipkg/ipkg-native_0.99.135.bb
diff --git a/packages/ipkg/ipkg_0.99.135.bb b/packages/ipkg/ipkg_0.99.135.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipkg/ipkg_0.99.135.bb
diff --git a/packages/linux/openzaurus_2.6.10.bb b/packages/linux/openzaurus_2.6.10.bb
index a5065eb86b..3e3459f582 100644
--- a/packages/linux/openzaurus_2.6.10.bb
+++ b/packages/linux/openzaurus_2.6.10.bb
@@ -47,7 +47,7 @@ http://www.rpsys.net/openzaurus/${KV}/collie_scoop_pcmcia-r0.patch;patch=1 \
 file://defconfig-husky \
 file://defconfig-collie \
 file://defconfig-poodle \
-file://defconfig-openzaurus-pxa-2.6"
+file://defconfig-openzaurus-pxa-2.6 "
 
 SRC_URI_append_husky = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r1.patch;patch=1"
 SRC_URI_append_openzaurus-pxa-2.6 = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r1.patch;patch=1"
diff --git a/packages/opie-alarm/opie-alarm_1.1.8.bb b/packages/opie-alarm/opie-alarm_1.1.8.bb
index e69de29bb2..26c74416a8 100644
--- a/packages/opie-alarm/opie-alarm_1.1.8.bb
+++ b/packages/opie-alarm/opie-alarm_1.1.8.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Opie Alarm"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "apmd"
+RDEPENDS = "apmd"
+PR = "r1"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/opiealarm \
+           file://01opiealarm "
+S = "${WORKDIR}/opiealarm"
+
+inherit opie
+
+do_install() {
+	install -d ${D}/${palmtopdir}/bin/ ${D}/${sysconfdir}/apm/event.d/
+	install -m 0755 ${S}/opiealarm ${D}/${palmtopdir}/bin/
+	install -m 0755 ${WORKDIR}/01opiealarm ${D}/${sysconfdir}/apm/event.d/
+}
+
+FILES_${PN} = "${palmtopdir}/bin/opiealarm ${sysconfdir}/apm/event.d/01opiealarm"
diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb
index 9435952941..feba4837cf 100644
--- a/packages/opie-alarm/opie-alarm_cvs.bb
+++ b/packages/opie-alarm/opie-alarm_cvs.bb
@@ -4,7 +4,9 @@ PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.8+cvs-${CVSDATE}"
+DEPENDS = "apmd"
 RDEPENDS = "apmd"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
            file://01opiealarm "
diff --git a/packages/qte/qte-for-opie_2.3.9-snapshot-20050103.bb b/packages/qte/qte-for-opie_2.3.9-snapshot-20050103.bb
index e69de29bb2..bc6292b45c 100644
--- a/packages/qte/qte-for-opie_2.3.9-snapshot-20050103.bb
+++ b/packages/qte/qte-for-opie_2.3.9-snapshot-20050103.bb
@@ -0,0 +1,9 @@
+SECTION = "opie/base"
+include qte_2.3.9-snapshot.bb
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-2.3.9-snapshot"
+
+DESCRIPTION = "Qt/Embedded w/ Opie Patches version ${PV}"
+
+SRC_URI += "file://opie.patch;patch=1 \
+            file://qiconview-speed.patch;patch=1 "
diff --git a/packages/qte/qte_2.3.9-snapshot.bb b/packages/qte/qte_2.3.9-snapshot.bb
index 4148519cb8..15b94f6173 100644
--- a/packages/qte/qte_2.3.9-snapshot.bb
+++ b/packages/qte/qte_2.3.9-snapshot.bb
@@ -28,7 +28,7 @@ SRC_URI_append_husky		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap
 SRC_URI_append_tosa		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 "
 SRC_URI_append_beagle   	= "file://beagle.patch;patch=1 "
 
-SRC_URI_append_openzaurus-pxa-2.6 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1"
+SRC_URI_append_openzaurus-pxa-2.6 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 "
 
 S = "${WORKDIR}/qt-${PV}"
 
diff --git a/packages/qte/qte_4.0.0-b1.bb b/packages/qte/qte_4.0.0-b1.bb
index ddadc2e368..72922bc381 100644
--- a/packages/qte/qte_4.0.0-b1.bb
+++ b/packages/qte/qte_4.0.0-b1.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "Qt/Embedded version ${PV}"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
-DEPENDS = "zlib libpng jpeg tslib uicmoc4-native"
+DEPENDS = "zlib libpng jpeg tslib qmake-1.08a uicmoc4-native"
 PROVIDES = "virtual/qte4 virtual/libqte4"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "ml4"
+PR = "ml5"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-opensource-${PV}.tar.bz2 \
            file://gcc34.patch;patch=1 \
@@ -38,6 +38,17 @@ def qte_arch(d):
 
 QTE_ARCH := "${@qte_arch(d)}"
 
+#
+# How to build the embedded drivers. Use plugin-<type> or qt-<type>. As for Beta1, that doesn't work :D
+#
+GFX = "qt-gfx"
+KBD = "qt-kbd"
+MSE = "qt-mouse"
+
+#
+# Borken: yopy, busmouse, linuxtp
+#
+
 EXTRA_OECONF = "-embedded ${QTE_ARCH} \
 		-system-libjpeg -system-libpng -system-zlib \
 		-no-qvfb -no-nis -no-cups -no-stl -no-pch   \
@@ -45,14 +56,10 @@ EXTRA_OECONF = "-embedded ${QTE_ARCH} \
 		-qconfig large -depths 8,16,24,32 -fast     \
                 -qt-gfx-transformed			    \
 		-qt-gfx-vnc             		    \
-                -plugin-kbd-sl5000                          \
-		-plugin-kbd-tty                             \
-		-plugin-kbd-usb                             \
-		-plugin-kbd-yopy			    \
-		-plugin-mouse-pc                            \
-		-plugin-mouse-bus			    \
-		-plugin-mouse-linuxtp			    \
-		-plugin-mouse-yopy			    \
+                -${KBD}-sl5000                          \
+		-${KBD}-tty                             \
+		-${KBD}-usb                             \
+		-${MSE}-pc                            \
 		"
 
 EXTRA_OEMAKE = "-e"
@@ -72,8 +79,6 @@ do_compile() {
 	install -m 0755 ${STAGING_BINDIR}/moc4 ${S}/bin/moc
 	install -m 0755 ${STAGING_BINDIR}/uic4 ${S}/bin/uic
 
-	cp -fa	${WORKDIR}/mousedrivers/	${S}/src/gui/embedded/
-
 	install -d include/asm/	
 	install -m 0644 ${WORKDIR}/sharp_char.h include/asm/
 	install -d include/linux/
@@ -161,6 +166,7 @@ ${sbindir}/update-qtfontdir
 }
 
 LIB_PACKAGES = "\
+		libqte4-debug			\
 		libqte4-core			\
 		libqte4-gui			\
 		libqte4-network			\
@@ -187,6 +193,7 @@ PACKAGES = "${LIB_PACKAGES} ${FONT_PACKAGES} examples"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FILES_${PN} = ""
+FILES_libqte4-debug	= "${palmtopdir}/lib/libQt*_debug.*"
 FILES_libqte4-core	= "${palmtopdir}/lib/libQtCore.* /usr/sbin/update-qtfontdir"
 FILES_libqte4-gui	= "${palmtopdir}/lib/libQtGui.*"
 FILES_libqte4-network	= "${palmtopdir}/lib/libQtNetwork.*"