zaurus-installer: deploy legacy gnu-tar here, not in zaurus-updater.

* (only for spitz)

3 files changed, 42 insertions, 30 deletions

diff --git a/recipes/zaurus-utils/zaurus-installer.bb b/recipes/zaurus-utils/zaurus-installer.bb
index 007fe00ebf..16fa43a982 100644
--- a/recipes/zaurus-utils/zaurus-installer.bb
+++ b/recipes/zaurus-utils/zaurus-installer.bb
@@ -1,35 +1,35 @@
 DESCRIPTION = "Installkit for kexecboot-kernel"
 DEPENDS = "${@base_conditional('MACHINE', 'collie', 'linux-kexecboot', 'zaurus-updater linux-kexecboot', d)}"
+DEPENDS += "${@base_conditional('MACHINE', 'spitz', 'zaurus-legacy-tar', '', d)}"
 LICENSE = "zaurus-installer"
-PR = "r1"
+PR = "r3"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = '(collie|poodle|c7x0|spitz|akita|tosa)'
 
-S = "${WORKDIR}"
-
-do_configure() {
-}
-
 do_compile() {
 }
 
 do_deploy() {
 
-	cd ${DEPLOY_DIR_IMAGE}
-	rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/
-	mkdir installkit-${MACHINE}/
+        cd ${DEPLOY_DIR_IMAGE}
+        rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/
+        mkdir installkit-${MACHINE}/
+
+        [ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE}
+
+        if [ ! "${MACHINE}" = "collie" ]; then
+                cp updater.sh installkit-${MACHINE}/updater.sh
+        fi
 
-	[ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE}
+        if [ "${MACHINE}" = "spitz" ]; then
+                cp ${DEPLOY_DIR_IMAGE}/gnu-tar installkit-${MACHINE}/gnu-tar
+        fi
 
-	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
-	rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/
+        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
+        rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/
 }
 
 addtask deploy before do_build after do_compile
diff --git a/recipes/zaurus-utils/zaurus-legacy-tar.bb b/recipes/zaurus-utils/zaurus-legacy-tar.bb
new file mode 100644
index 0000000000..0b9a31acaf
--- /dev/null
+++ b/recipes/zaurus-utils/zaurus-legacy-tar.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Legacy GNU-tar to unpack hd images on install for Zaurus spitz"
+LICENSE = "GPL"
+PR = "r0"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGES = ""
+COMPATIBLE_MACHINE = "spitz"
+
+SRC_URI = "file://gnu-tar.gz"
+
+S = "${WORKDIR}"
+
+do_compile() {
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0755 gnu-tar ${DEPLOY_DIR_IMAGE}/gnu-tar
+        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/gnu-tar
+}
+
+# package_stagefile_shell needs to run before populate_staging for packaged-staging
+addtask deploy before do_populate_staging after do_compile
diff --git a/recipes/zaurus-utils/zaurus-updater.bb b/recipes/zaurus-utils/zaurus-updater.bb
index 67c98e22cf..7c72921e75 100644
--- a/recipes/zaurus-utils/zaurus-updater.bb
+++ b/recipes/zaurus-utils/zaurus-updater.bb
@@ -3,12 +3,10 @@ DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
 PR = "r25"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 PACKAGES = ""
 COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)'
 
-SRC_URI = "file://updater.sh \
-           file://gnu-tar.gz"
+SRC_URI = "file://updater.sh"
 
 S = "${WORKDIR}"
 
@@ -24,16 +22,7 @@ do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0755 updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh
         package_stagefile_shell ${DEPLOY_DIR_IMAGE}/updater.sh
-
-        case ${MACHINE} in
-                spitz )
-                        install -m 0755 gnu-tar ${DEPLOY_DIR_IMAGE}/gnu-tar
-                        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/gnu-tar
-                        ;;
-                *)
-                        ;;
-        esac
 }
 
-# package_stagefile_shell need to run before populate_staging for packaged-staging
+# package_stagefile_shell needs to run before populate_staging for packaged-staging
 addtask deploy before do_populate_staging after do_compile