[meta-handheld][PATCH 1/3] zaurus-installer: use linux-yocto-tiny-kexecboot kernel

[meta-handheld][PATCH 1/3] zaurus-installer: use linux-yocto-tiny-kexecboot kernel

[Andrea Adami]

* bump PR

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

diff --git a/recipes-bsp/zaurus-utils/zaurus-installer.bb b/recipes-bsp/zaurus-utils/zaurus-installer.bb
index 785836f..62f01c8 100644
--- a/recipes-bsp/zaurus-utils/zaurus-installer.bb
+++ b/recipes-bsp/zaurus-utils/zaurus-installer.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Installkit for kexecboot-kernel"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-DEPENDS = "${@base_conditional('MACHINE', 'collie', 'linux-kexecboot', 'zaurus-updater linux-kexecboot', d)}"
+DEPENDS = "${@base_conditional('MACHINE', 'collie', 'linux-yocto-tiny-kexecboot', 'zaurus-updater linux-yocto-tiny-kexecboot', d)}"
 DEPENDS += "${@base_conditional('MACHINE', 'spitz', 'zaurus-legacy-tar', '', d)}"
-PR = "r6"
+PR = "r7"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
@@ -14,7 +14,7 @@ do_compile() {
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 PACKAGES = ""
 
-COMPATIBLE_MACHINE = "(collie|poodle|c7x0|spitz|akita|tosa)"
+COMPATIBLE_MACHINE = "collie|poodle|c7x0|spitz|akita|tosa"
 
 inherit deploy
 
@@ -24,7 +24,7 @@ do_deploy() {
         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}
+        [ -f "${KERNEL_IMAGETYPE}-yocto-tiny-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-yocto-tiny-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE}
         if [ ! "${MACHINE}" = "collie" ]; then
                 cp updater.sh installkit-${MACHINE}/updater.sh
         fi
-- 
1.7.3.4

[meta-handheld][PATCH 2/3] zaurus.inc: update references to linux-kexecboot

[Andrea Adami]

* now using linux-yocto-tiny-kexecboot

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 conf/machine/include/zaurus.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/zaurus.inc b/conf/machine/include/zaurus.inc
index 1ef3213..268b9fd 100644
--- a/conf/machine/include/zaurus.inc
+++ b/conf/machine/include/zaurus.inc
@@ -69,10 +69,10 @@ MACHINE_EXTRA_RDEPENDS_collie = "zaurusd"
 
 ##################################
 # Zaurus rootfs are booted by
-# linux-kexecboot
+# linux-yocto-tiny-kexecboot
 ##################################
 
-# If set here, each image will also build linux-kexecboot and the updater
+# If set here, each image will also build linux-yocto-tiny-kexecboot and the updater
 # EXTRA_IMAGEDEPENDS += "zaurus-installer"
 
 # Install /boot/boot.cfg in target images
-- 
1.7.3.4

[meta-handheld][PATCH 3/3] linux-kexecboot_3.2: unlock removing DEFAULT_PREFERENCE = "-1"

[Andrea Adami]

* klibc can now be built against kernel >3.1

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 recipes-kernel/linux/linux-kexecboot_3.2.bbappend |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/recipes-kernel/linux/linux-kexecboot_3.2.bbappend b/recipes-kernel/linux/linux-kexecboot_3.2.bbappend
index 909bf9e..6ea2a00 100644
--- a/recipes-kernel/linux/linux-kexecboot_3.2.bbappend
+++ b/recipes-kernel/linux/linux-kexecboot_3.2.bbappend
@@ -1,8 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/linux-kexecboot-${PV}:${THISDIR}/files:"
 
-# wait until klibc_2.0 is out (march/april 2012)
-DEFAULT_PREFERENCE = "-1"
-
 PR = "${INC_PR}.1"
 COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
 
-- 
1.7.3.4

Re: [meta-handheld][PATCH 1/3] zaurus-installer: use linux-yocto-tiny-kexecboot kernel

[Paul Eggleton]

On Monday 23 April 2012 23:31:12 Andrea Adami wrote:
> * bump PR
> 
> Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
> ---
>  recipes-bsp/zaurus-utils/zaurus-installer.bb |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/recipes-bsp/zaurus-utils/zaurus-installer.bb
> b/recipes-bsp/zaurus-utils/zaurus-installer.bb index 785836f..62f01c8
> 100644
> --- a/recipes-bsp/zaurus-utils/zaurus-installer.bb
> +++ b/recipes-bsp/zaurus-utils/zaurus-installer.bb
> @@ -1,9 +1,9 @@
>  DESCRIPTION = "Installkit for kexecboot-kernel"
>  LICENSE = "MIT"
>  LIC_FILES_CHKSUM =
> "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -DEPENDS
> = "${@base_conditional('MACHINE', 'collie', 'linux-kexecboot',
> 'zaurus-updater linux-kexecboot', d)}" +DEPENDS =
> "${@base_conditional('MACHINE', 'collie', 'linux-yocto-tiny-kexecboot',
> 'zaurus-updater linux-yocto-tiny-kexecboot', d)}" DEPENDS +=
> "${@base_conditional('MACHINE', 'spitz', 'zaurus-legacy-tar', '', d)}" -PR
> = "r6"
> +PR = "r7"
> 
>  INHIBIT_DEFAULT_DEPS = "1"
> 
> @@ -14,7 +14,7 @@ do_compile() {
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
>  PACKAGES = ""
> 
> -COMPATIBLE_MACHINE = "(collie|poodle|c7x0|spitz|akita|tosa)"
> +COMPATIBLE_MACHINE = "collie|poodle|c7x0|spitz|akita|tosa"
> 
>  inherit deploy
> 
> @@ -24,7 +24,7 @@ do_deploy() {
>          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} +        [ -f
> "${KERNEL_IMAGETYPE}-yocto-tiny-kexecboot-${MACHINE}.bin" ] && cp
> ${KERNEL_IMAGETYPE}-yocto-tiny-kexecboot-${MACHINE}.bin
> installkit-${MACHINE}/${KERNEL_IMAGETYPE} if [ ! "${MACHINE}" = "collie" ];
> then
>                  cp updater.sh installkit-${MACHINE}/updater.sh
>          fi

Merged these three to meta-handheld, thanks.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre