[oe] [meta-handheld] [PATCH 3/3] zaurus.inc: decouple build of zaurus-installer (and linux-kexecboot)

[Andrea Adami]

* Once flashed on device there isn't any advantage rebuilding
* initramfs images for linux-kexecboot on each image build.
*
* One would bitbake zaurus-installer only when needed.

Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
---
 conf/machine/include/initramfs-kexecboot.inc |   18 ------------------
 conf/machine/include/zaurus.inc              |   14 +++++++++-----
 2 files changed, 9 insertions(+), 23 deletions(-)
 delete mode 100644 conf/machine/include/initramfs-kexecboot.inc

diff --git a/conf/machine/include/initramfs-kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc
deleted file mode 100644
index bc9cd51..0000000
--- a/conf/machine/include/initramfs-kexecboot.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-# Initramfs-kexecboot extra config
-
-
-# If set here, each image will also build linux-kexecboot.
-# Usually the machine-installer recipe already DEPENDS on it
-#
-EXTRA_IMAGEDEPENDS += "linux-kexecboot"
-
-
-# Force inclusion of kernel in target images
-# (done by default)
-#
-RDEPENDS_kernel-base = "kernel-image"
-
-
-# Install /boot/boot.cfg in target images
-#
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg "
diff --git a/conf/machine/include/zaurus.inc b/conf/machine/include/zaurus.inc
index b42799f..e833ecc 100644
--- a/conf/machine/include/zaurus.inc
+++ b/conf/machine/include/zaurus.inc
@@ -16,8 +16,6 @@ INITRAMFS_FSTYPES ?= "cpio.gz cpio.lzma"
 EXTRA_IMAGECMD_jffs2 = "-p -l --eraseblock=${ERASEBLOCKSIZE}"
 EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}"
 
-EXTRA_IMAGEDEPENDS += "zaurus-installer"
-
 IMAGE_DEVICE_TABLES = ""
 
 #########
@@ -74,11 +72,17 @@ MACHINE_EXTRA_RDEPENDS_collie = "zaurusd"
 # MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix"
 
 ##################################
-# build kexecboot kernel while
-# making sure rootfs is compatible
+# Zaurus rootfs are booted by
+# linux-kexecboot
 ##################################
 
-require conf/machine/include/initramfs-kexecboot.inc
+# If set here, each image will also build linux-kexecboot and the updater
+# EXTRA_IMAGEDEPENDS += "zaurus-installer"
+
+# Install /boot/boot.cfg in target images
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg "
+
+
 
 # FIXME
 # blindly import from linux-rp.inc (2.6.2x)
-- 
1.7.3.4