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

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

2005/01/08 03:16:08+01:00 uni-frankfurt.de!mickeyl
workaround parsing error in opie-taskbar

2005/01/08 03:01:20+01:00 uni-frankfurt.de!mickeyl
Merge

2005/01/08 02:58:47+01:00 uni-frankfurt.de!mickeyl
more adjustments for an openzaurus image w/ kernel 2.6

2005/01/08 02:57:34+01:00 uni-frankfurt.de!mickeyl
compile scripts/genksyms in kernel builds. this is needed for external modules

2005/01/07 20:54:57+01:00 uni-frankfurt.de!mickeyl
openzaurus-2.6: add defconfig for combined machine

BKrev: 41df4807VWBmhl2Rfn7MdKt1lbGHOw

5 files changed, 30 insertions, 39 deletions

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 8177654371..ad263d6d31 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -82,10 +82,15 @@ kernel_do_stage() {
 		install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}
 		install -m 0644 arch/${ARCH}/Makefile ${STAGING_KERNEL_DIR}/arch/${ARCH}
 	fi
-	cp -fR scripts ${STAGING_KERNEL_DIR}/
 	cp -fR include/config* ${STAGING_KERNEL_DIR}/include/	
 	install -m 0644 ${KERNEL_OUTPUT} ${STAGING_KERNEL_DIR}/${KERNEL_IMAGETYPE}
 	install -m 0644 System.map ${STAGING_KERNEL_DIR}/System.map-${PV}
+
+	# Check if scripts/genksyms exists and if so, build it
+	if [ -e scripts/genksyms/ ]; then
+		oe_runmake SUBDIRS="scripts/genksyms"
+	fi
+	cp -fR scripts ${STAGING_KERNEL_DIR}/
 }
 
 kernel_do_install() {
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index b9e7707edc..4c068d96ce 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -5,13 +5,13 @@ DISTRO_VERSION = "3.5.2-snapshot-${DATE}"
 # DISTRO_VERSION = "3.5.3"
 
 FEED_URIS += " \
-	upgrades##http://openzaurus.org/official/unstable/3.5.3/upgrades/ 	\
-	base##http://openzaurus.org/official/unstable/3.5.3/feed/base/		\
-	libs##http://openzaurus.org/official/unstable/3.5.3/feed/libs/		\
-	console##http://openzaurus.org/official/unstable/3.5.3/feed/console     \
-	devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel"
+	upgrades##http://openzaurus.org/official/unstable/3.5.2/upgrades/ 	\
+	base##http://openzaurus.org/official/unstable/3.5.2/feed/base/		\
+	libs##http://openzaurus.org/official/unstable/3.5.2/feed/libs/		\
+	console##http://openzaurus.org/official/unstable/3.5.2/feed/console     \
+	devel##http://openzaurus.org/official/unstable/3.5.2/feed/devel"
 
-CVSDATE = "20050103"
+CVSDATE = "20050107"
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
@@ -36,7 +36,7 @@ CVSDATE_ipkg-utils-native = "20041215"
 PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
 PREFERRED_VERSION_libtool-native = "1.5.6"
 PREFERRED_VERSION_libtool-cross= "1.5.6"
-PREFERRED_VERSION_orinoco-modules = "0.13e"
+# PREFERRED_VERSION_orinoco-modules = "0.13e"
 PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
 PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22"
 PREFERRED_VERSION_bluez-utils-dbus = "2.11"
@@ -47,7 +47,9 @@ PREFERRED_VERSION_bluez-utils-dbus = "2.11"
 
 OPIE_VERSION = "1.1.8"
 include conf/distro/preferred-opie-versions.inc
-PREFERRED_VERSION_libopie2 = "the-latest-please"
+PREFERRED_VERSION_libopie2	= "the-latest-please"
+PREFERRED_VERSION_libqpe-opie	= "the-latest-please"
+PREFERRED_VERSION_opie-taskbar  = "the-latest-please"
 
 #
 # GPE
diff --git a/conf/machine/openzaurus-pxa-2.6.conf b/conf/machine/openzaurus-pxa-2.6.conf
index e69de29bb2..3542659830 100644
--- a/conf/machine/openzaurus-pxa-2.6.conf
+++ b/conf/machine/openzaurus-pxa-2.6.conf
@@ -0,0 +1,10 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C700,Sharp Zaurus SL-C750,Sharp Zaurus SL-C760
+#@DESCRIPTION: Machine configuration for the Sharp Zaurus PXA devices running a 2.6 kernel
+
+include conf/machine/zaurus-clamshell.conf
+
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus"
+PREFERRED_VERSION_orinoco-modules = "20050101"
+
+ROOT_FLASH_SIZE = "64"
diff --git a/packages/linux/openzaurus_2.6.10.bb b/packages/linux/openzaurus_2.6.10.bb
index 683798bf48..a5065eb86b 100644
--- a/packages/linux/openzaurus_2.6.10.bb
+++ b/packages/linux/openzaurus_2.6.10.bb
@@ -46,7 +46,8 @@ http://www.rpsys.net/openzaurus/${KV}/collie_scoop-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/collie_scoop_pcmcia-r0.patch;patch=1 \
 file://defconfig-husky \
 file://defconfig-collie \
-file://defconfig-poodle "
+file://defconfig-poodle \
+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-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index dce47d384a..5488c7b148 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 DEPENDS = "opie-libqrsync"
 PV = "1.1.8+cvs-${CVSDATE}"
-PR = "r0"
+PR = "r1"
 APPNAME = "qpe"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
@@ -97,42 +97,15 @@ do_install() {
 
 	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/
-}
-do_install_append_openzaurus-pxa-2.6 () {
         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}"