merge of '59df690e4022993ebd05954ef260ae9362300ac1'

     and 'cea642eee26bd3cdd008cf21f1e1aad4ecfd69e6'

9 files changed, 100 insertions, 31 deletions

diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index d8d9264699..4febd8939e 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -19,6 +19,13 @@ ROOT_FLASH_SIZE ?= "32"
 
 EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000"
 
+# for NAND flash.
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000;\
+	sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+	-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
+	-e 0x20000 -p\
+	"
+
 MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
 MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/packages/gpe-dm/gpe-dm_svn.bb b/packages/gpe-dm/gpe-dm_svn.bb
new file mode 100644
index 0000000000..1b1409f29a
--- /dev/null
+++ b/packages/gpe-dm/gpe-dm_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "GPE Display Manager"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 xserver-common"
+RDEPENDS_${PN} += "procps xserver-common"
+PV = "gpe-dm-0.50+svn-${SRCDATE}"
+
+inherit gpe autotools update-rc.d
+
+SRC_URI = "${GPE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gpe-edit/gpe-edit_svn.bb b/packages/gpe-edit/gpe-edit_svn.bb
new file mode 100644
index 0000000000..780294bd13
--- /dev/null
+++ b/packages/gpe-edit/gpe-edit_svn.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Editor for the GPE Palmtop Environment"
+SECTION = "gpe"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget"
+
+inherit gpe autotools
+
+SRC_URI = "${GPE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gpe-scap/gpe-scap_svn.bb b/packages/gpe-scap/gpe-scap_svn.bb
new file mode 100644
index 0000000000..3360189422
--- /dev/null
+++ b/packages/gpe-scap/gpe-scap_svn.bb
@@ -0,0 +1,12 @@
+DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup"
+RREPLACES = "gpe-screenshot"
+PV = "1.2+svn-${SRCDATE}"
+PR = "r1"
+
+inherit autotools 
+
+SRC_URI += "${GPE_EXTRA_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gpe-today/gpe-today_cvs.bb b/packages/gpe-today/gpe-today_cvs.bb
deleted file mode 100644
index 47e9c01a66..0000000000
--- a/packages/gpe-today/gpe-today_cvs.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DEFAULT_PREFERENCE = "-1"
-
-DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead"
-DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb"
-SECTION = "gpe"
-PRIORITY = "optional"
-
-
-S = "${WORKDIR}/${PN}"
-#Remove the dash below when 0.10 changes in PV
-PV = "0.11+cvs-${SRCDATE}"
-PR = "r0"
-
-inherit gpe
-
-SRC_URI =		"${HANDHELDS_CVS};module=gpe/base/${PN} \
-		 		 file://Makefile.dpkg_ipkg \
-    		 	 file://Makefile.translation"
-
-
-do_compile () {
-	sed -i 's:CVSBUILD = yes:CVSBUILD = no:' Makefile
-	mkdir build
-	cp ${WORKDIR}/Makefile.* build/
-	oe_runmake PREFIX=${prefix}
-	oe_runmake all-desktop PREFIX=${prefix}
-}
-
-
diff --git a/packages/gpe-today/gpe-today_svn.bb b/packages/gpe-today/gpe-today_svn.bb
new file mode 100644
index 0000000000..329e2271ea
--- /dev/null
+++ b/packages/gpe-today/gpe-today_svn.bb
@@ -0,0 +1,24 @@
+SECTION = "gpe"
+PRIORITY = "optional"
+DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb"
+PV = "0.11+svn-${SRCDATE}"
+PR = "r0"
+
+inherit gpe
+
+SRC_URI = "${GPE_SVN} \
+           file://Makefile.dpkg_ipkg \
+           file://Makefile.translation"
+
+S = "${WORKDIR}/${PN}"
+
+
+do_compile () {
+        sed -i 's:CVSBUILD = yes:CVSBUILD = no:' Makefile
+        mkdir -p build
+        cp ${WORKDIR}/Makefile.* build/
+        oe_runmake PREFIX=${prefix}
+        oe_runmake all-desktop PREFIX=${prefix}
+}
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/compulab-pxa270_2.6.16.bb b/packages/linux/compulab-pxa270_2.6.16.bb
index 0e9a43d9b6..928bde8f6a 100644
--- a/packages/linux/compulab-pxa270_2.6.16.bb
+++ b/packages/linux/compulab-pxa270_2.6.16.bb
@@ -1,7 +1,12 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Compulab PXA270 system"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
+
+# coreutils is required for the stat command which is used
+# to create the programming images used with USB.  Version
+# >= 6.0 is required.
+DEPENDS = "coreutils-native"
 
 # Note, the compulab package contains a binary NAND driver that is not
 # EABI compatible
@@ -29,8 +34,20 @@ do_configure_prepend() {
 }
 
 do_deploy() {
+	KNAME=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
         install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${KNAME}
+	# Create an image file that has the size prepended (used by cm-x270 BL)
+	# The following can only be done on a little endian machine
+	size=$(stat --printf=%s ${KNAME})
+	size_=$(printf '\%03o'\
+	$((size & 0x000000FF))\
+	$((size>>8 & 0x000000FF))\
+	$((size>>16 & 0x000000FF))\
+	$((size>>24 & 0x000000FF)))
+	size_=${size_}'\c'
+	echo -e $size_ > ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.img
+	cat ${KNAME} >> ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.img
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/uboot/u-boot_1.2.0.bb b/packages/uboot/u-boot_1.2.0.bb
new file mode 100644
index 0000000000..15d16bd571
--- /dev/null
+++ b/packages/uboot/u-boot_1.2.0.bb
@@ -0,0 +1,7 @@
+require u-boot.inc
+
+PR = "r1"
+
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.2.0.tar.bz2"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb
index c29aba7cd5..de0373782b 100644
--- a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb
+++ b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb
@@ -1,6 +1,7 @@
 require u-boot.inc
 
 PR = "r2"
+DEFAULT_PREFERENCE = "-1"
 
 TAG = "${@bb.data.getVar('PV',d,1).replace('.', '_')}"