zaurus-installer: add collie support. properly unbreaks collie image build.

* this effectively reverts d4dae3f91c9e0e5391ea5e83751ae0d56cbaabe6
  which was not the proper way to do it.  Zaurus machine config probably
  still needs some more TLC.

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index cdad690..ba923f9 100644 (file)
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -14,9 +14,6 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --f
 
 EXTRA_IMAGEDEPENDS += "zaurus-installer"
 
-# collie is flashed by pressing C+D on power-on
-EXTRA_IMAGEDEPENDS_collie += ""
-
 SERIAL_CONSOLE = "115200 ttyS0"
 SERIAL_CONSOLE_collie = "115200 ttySA0"
 

diff --git a/recipes/zaurus-updater/zaurus-installer.bb b/recipes/zaurus-updater/zaurus-installer.bb
index 098110b..70dca30 100644 (file)
--- a/recipes/zaurus-updater/zaurus-installer.bb
+++ b/recipes/zaurus-updater/zaurus-installer.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Installkit for kexecboot-kernel"
-DEPENDS = "zaurus-updater linux-kexecboot"
-PR = "r0"
+DEPENDS = "${@base_conditional('MACHINE', 'collie', 'linux-kexecboot', 'zaurus-updater linux-kexecboot', d)}"
+PR = "r1"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)'
+COMPATIBLE_MACHINE = '(collie|poodle|c7x0|spitz|akita|tosa)'
 
 S = "${WORKDIR}"
 
@@ -22,7 +22,9 @@ do_deploy() {
 
        [ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE}
 
-       cp updater.sh.${MACHINE} installkit-${MACHINE}/updater.sh
+       if [ ! "${MACHINE}" = "collie" ]; then
+               cp updater.sh.${MACHINE} installkit-${MACHINE}/updater.sh
+       fi
  
        tar czf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz installkit-${MACHINE}/
        md5sum ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz > ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz.md5