Merge packages changes from OE into poky.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 6 insertions, 3 deletions

diff --git a/openembedded/packages/zaurus-updater/encdec-updater.bb b/openembedded/packages/zaurus-updater/encdec-updater.bb
index 49371a6a49..797a762ebf 100644
--- a/openembedded/packages/zaurus-updater/encdec-updater.bb
+++ b/openembedded/packages/zaurus-updater/encdec-updater.bb
@@ -4,6 +4,8 @@ DESCRIPTION = "A tool to encode and decode the Sharp Zaurus updater.sh skript"
 
 SRC_URI = "file://encdec-updater.c"
 
+COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)'
+
 do_compile() {
         ${CC} -o encdec-updater ${WORKDIR}/encdec-updater.c
 }
diff --git a/openembedded/packages/zaurus-updater/tosa/updater.sh b/openembedded/packages/zaurus-updater/tosa/updater.sh
index 5adfa97a1e..6d30aba231 100644
--- a/openembedded/packages/zaurus-updater/tosa/updater.sh
+++ b/openembedded/packages/zaurus-updater/tosa/updater.sh
@@ -67,7 +67,7 @@ then
         ./consolescroll
 fi
 
-for TARGETFILE in zImage zimage.bin ZIMAGE initrd.bin INITRD.BIN mversion.bin MVERSION.BIN
+for TARGETFILE in zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN mversion.bin MVERSION.BIN
 do
         if [ -e $TARGETFILE ]
         then
diff --git a/openembedded/packages/zaurus-updater/zaurus-updater.bb b/openembedded/packages/zaurus-updater/zaurus-updater.bb
index b8a87ce7dc..26cf1e5453 100644
--- a/openembedded/packages/zaurus-updater/zaurus-updater.bb
+++ b/openembedded/packages/zaurus-updater/zaurus-updater.bb
@@ -1,10 +1,11 @@
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-PR = "r3"
+PR = "r5"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)'
 
 SRC_URI = "file://updater.sh \
            file://gnu-tar.gz"
@@ -15,7 +16,7 @@ do_compile() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images/
+        install -d ${DEPLOY_DIR_IMAGE}
         install -m 0755 updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}
 
         case ${MACHINE} in