[meta-handheld] [PATCH 0/3] do not force build of linux-kexecboot

[meta-handheld] [PATCH 0/3] do not force build of linux-kexecboot

[Andrea Adami]

* This patchset makes minor changes to the initramfs-kexecboot images
* in order to make clear there are two binaries inside.
* Following patches are Zaurus-specific and allow to build generic images
* without building zaurus-installer (which builds linux-kexecboot)

Andrea Adami (3):
  initramfs-kexecboot(-klibc)-image: explicitly install kexec(-klibc)
  kexecboot-cfg: Inhibit toolchain dependencies and echo
    $DISTRO_VERSION
  zaurus.inc: decouple build of zaurus-installer (and linux-kexecboot)

 conf/machine/include/initramfs-kexecboot.inc       |   18 ------------------
 conf/machine/include/zaurus.inc                    |   14 +++++++++-----
 recipes-bsp/images/initramfs-kexecboot-image.bb    |    2 +-
 .../images/initramfs-kexecboot-klibc-image.bb      |    2 +-
 recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb         |    6 ++++--
 5 files changed, 15 insertions(+), 27 deletions(-)
 delete mode 100644 conf/machine/include/initramfs-kexecboot.inc

-- 
1.7.3.4

[meta-handheld] [PATCH 1/3] initramfs-kexecboot(-klibc)-image: explicitly install kexec(-klibc)

[Andrea Adami]

* for clarity, specify we just install the two binaries
* (despite the fact that kexec is a runtime dependency for kexecboot)

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 recipes-bsp/images/initramfs-kexecboot-image.bb    |    2 +-
 .../images/initramfs-kexecboot-klibc-image.bb      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/images/initramfs-kexecboot-image.bb b/recipes-bsp/images/initramfs-kexecboot-image.bb
index 12ad15a..f306fb5 100644
--- a/recipes-bsp/images/initramfs-kexecboot-image.bb
+++ b/recipes-bsp/images/initramfs-kexecboot-image.bb
@@ -9,7 +9,7 @@ IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
 # avoid circular dependencies
 EXTRA_IMAGEDEPENDS = ""
 
-IMAGE_INSTALL = "kexecboot"
+IMAGE_INSTALL = "kexec kexecboot"
 
 # Do not pollute the initrd image with rootfs features
 IMAGE_FEATURES = ""
diff --git a/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb b/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb
index 6c6de7a..e81f9ee 100644
--- a/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb
+++ b/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb
@@ -1,5 +1,5 @@
 require initramfs-kexecboot-image.bb
 
-IMAGE_INSTALL = "kexecboot-klibc"
+IMAGE_INSTALL = "kexec-klibc kexecboot-klibc"
 
 export IMAGE_BASENAME = "initramfs-kexecboot-klibc-image"
-- 
1.7.3.4

[meta-handheld] [PATCH 2/3] kexecboot-cfg: Inhibit toolchain dependencies and echo $DISTRO_VERSION

[Andrea Adami]

* $DISTRO_VERSION is always set and is more detailed
* bump PR

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

diff --git a/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb b/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb
index 24dd2a4..3bc212e 100644
--- a/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb
+++ b/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb
@@ -3,7 +3,9 @@ SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-PR = "r12"
+PR = "r13"
+
+INHIBIT_DEFAULT_DEPS = "1"
 
 SRC_URI = "file://icon.xpm"
 
@@ -20,7 +22,7 @@ echo '# First kernel stanza.
 KERNEL=/boot/${KERNEL_IMAGETYPE}
 
 # Show this label in kexecboot menu.
-LABEL=${DISTRO}-${MACHINE}
+LABEL=${DISTRO_VERSION}-${MACHINE}
 #
 # Append this tags to the kernel cmdline.
 APPEND=${CMDLINE} ${CMDLINE_DEBUG}
-- 
1.7.3.4

[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@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

Re: [meta-handheld] [PATCH 2/3] kexecboot-cfg: Inhibit toolchain dependencies and echo $DISTRO_VERSION

[Paul Eggleton]

On Thursday 19 January 2012 00:52:58 Andrea Adami wrote:
> * $DISTRO_VERSION is always set and is more detailed

I just looked at Poky and Angstrom and neither of these have the distro name 
in DISTRO_VERSION, so this patch would lose that; would there be sufficient room 
to include both variables?

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [meta-handheld] [PATCH 2/3] kexecboot-cfg: Inhibit toolchain dependencies and echo $DISTRO_VERSION

[Andrea Adami]

Il giorno 20/gen/2012, alle ore 13:22, Paul Eggleton <paul.eggleton@linux.intel.com> ha scritto:

> On Thursday 19 January 2012 00:52:58 Andrea Adami wrote:
>> * $DISTRO_VERSION is always set and is more detailed
> 
> I just looked at Poky and Angstrom and neither of these have the distro name 
> in DISTRO_VERSION, so this patch would lose that; would there be sufficient room 
> to include both variables?
> 

Hm...building distro-less I  get 'oe-core-0' or alike  as DISTRO_VERSION. 
I fear both could make the label too long.

Regards
Andrea

> Cheers,
> Paul
> 
> -- 
> 
> Paul Eggleton
> Intel Open Source Technology Centre

Re: [meta-handheld] [PATCH 0/3] do not force build of linux-kexecboot

[Paul Eggleton]

On Thursday 19 January 2012 00:52:56 Andrea Adami wrote:
> * This patchset makes minor changes to the initramfs-kexecboot images
> * in order to make clear there are two binaries inside.
> * Following patches are Zaurus-specific and allow to build generic images
> * without building zaurus-installer (which builds linux-kexecboot)
> 
> Andrea Adami (3):
>   initramfs-kexecboot(-klibc)-image: explicitly install kexec(-klibc)
>   kexecboot-cfg: Inhibit toolchain dependencies and echo
>     $DISTRO_VERSION
>   zaurus.inc: decouple build of zaurus-installer (and linux-kexecboot)
> 
>  conf/machine/include/initramfs-kexecboot.inc       |   18
> ------------------ conf/machine/include/zaurus.inc                    |  
> 14 +++++++++----- recipes-bsp/images/initramfs-kexecboot-image.bb    |    2
> +-
>  .../images/initramfs-kexecboot-klibc-image.bb      |    2 +-
>  recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb         |    6 ++++--
>  5 files changed, 15 insertions(+), 27 deletions(-)
>  delete mode 100644 conf/machine/include/initramfs-kexecboot.inc

Merged to meta-handheld after some minor reworking of 3/3.

Thanks!

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre