Someone

From ff4b36a908fd246e5a5056977c296b07a58af671 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Thu, 25 Mar 2010 23:14:06 +0100
Subject: [PATCH][STABLE] zaurus: unbreak build of initramfs-kexecboot-image (thus others too...)

* partial sync with old .dev checkout

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 conf/machine/include/zaurus-2.6.inc            |    1 +
 conf/machine/include/zaurus-clamshell.inc      |    1 +
 recipes/kexecboot/initramfs-kexecboot-image.bb |    6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 5ce1cdc..942660a 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -12,6 +12,7 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --f
 
 ZAURUS-UPDATER = "zaurus-updater"
 EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}"
+KEXECBOOT_IMAGEDEPENDS += "${ZAURUS-UPDATER}"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index 1421630..714380e 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -4,6 +4,7 @@ UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
+KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
                    --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
diff --git a/recipes/kexecboot/initramfs-kexecboot-image.bb b/recipes/kexecboot/initramfs-kexecboot-image.bb
index 7fc2b79..b08474c 100644
--- a/recipes/kexecboot/initramfs-kexecboot-image.bb
+++ b/recipes/kexecboot/initramfs-kexecboot-image.bb
@@ -1,7 +1,7 @@
 #initramfs image which mounts the rootfilesystem and kexecs a kernel from there
 
 ONLINE_PACKAGE_MANAGEMENT = "none"
-IMAGE_FSTYPES += " cpio.gz"
+IMAGE_FSTYPES = " cpio.gz"
 inherit image
 
 # These devices need mmcblk* to be 254 instead of 179
@@ -10,7 +10,8 @@ IMAGE_DEVICE_TABLES_h2200 = "device_table-oldmmc.txt"
 
 export IMAGE_BASENAME = "initramfs-kexecboot-image"
 
-EXTRA_IMAGEDEPENDS = ""
+KEXECBOOT_IMAGEDEPENDS ?= ""
+EXTRA_IMAGEDEPENDS = "${KEXECBOOT_IMAGEDEPENDS}"
 IMAGE_INSTALL = "kexecboot"
 IMAGE_LINGUAS = ""
 
@@ -18,4 +19,3 @@ IMAGE_LOGIN_MANAGER = ""
 IMAGE_INIT_MANAGER = ""
 IMAGE_INITSCRIPTS = ""
 IMAGE_DEV_MANAGER = ""
-#ONLINE_PACKAGE_MANAGEMENT = "none"
-- 
1.6.4.4

From 51273e6572ccb9776299a5a451f13a3df7a0461c Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Thu, 25 Mar 2010 01:45:52 +0100
Subject: [PATCH][STABLE] zaurus-updater: sync with .dev (fix tasks order)


Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 recipes/zaurus-updater/zaurus-updater.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes/zaurus-updater/zaurus-updater.bb b/recipes/zaurus-updater/zaurus-updater.bb
index 6ed1c5f..7621d47 100644
--- a/recipes/zaurus-updater/zaurus-updater.bb
+++ b/recipes/zaurus-updater/zaurus-updater.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-PR = "r23"
+PR = "r24"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -34,4 +34,6 @@ do_deploy() {
 	esac
 }
 
-addtask deploy before do_build after do_compile
+# package_stagefile_shell need to run before populate_staging for packaged-staging
+addtask deploy before do_populate_staging after do_compile
+
-- 
1.6.4.4