[oe] [meta-handheld][PATCH] zaurus.inc: adapt jffs2 and sum.jffs2 to changes in oe-core

[Paul Eggleton]

On Thursday 08 December 2011 17:06:30 Andrea Adami wrote:
> * in oe-core jffs2 summary has been added to image_types.bbclass and
> * IMAGE_CMD_jffs2 now includes '-n' to skip cleanmarkers node creation
> * so we need to customize only padding, endianness and compression mode
> * While there remove compression settings which are handled in kernel.
> * This allows us to use the same string for mkfs.jffs2 and for sumtool.
> 
> Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
> ---
>  conf/machine/include/zaurus.inc |   13 +++----------
>  1 files changed, 3 insertions(+), 10 deletions(-)
> 
> diff --git a/conf/machine/include/zaurus.inc
> b/conf/machine/include/zaurus.inc index b488f37..0a9b1c5 100644
> --- a/conf/machine/include/zaurus.inc
> +++ b/conf/machine/include/zaurus.inc
> @@ -9,18 +9,11 @@ ERASEBLOCKSIZE_akita = "0x20000"
>  # C3100 and C3200 have same 128MiB NAND device as akita
>  ERASEBLOCKSIZE_spitz = "0x20000"
> 
> -IMAGE_FSTYPES += "jffs2 tar.gz"
> +IMAGE_FSTYPES += "tar.gz jffs2 sum.jffs2"
> 
>  # kernel now supports favourlzo
> -IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m
> favourlzo \ -                   --output=${T}/${IMAGE_NAME}.rootfs.jffs2
> --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ -                
>   && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ -                   -o
> ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
> -                   --eraseblock=${ERASEBLOCKSIZE} -l -p; \
> -                   cat ${T}/${IMAGE_NAME}.rootfs.jffs2 >
> ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ -                   rm
> ${T}/${IMAGE_NAME}.rootfs.jffs2; \
> -                   cat ${T}/${IMAGE_NAME}.rootfs.jffs2.summary >
> ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \ -                
>   rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"
> +EXTRA_IMAGECMD_jffs2 = "-p -l --eraseblock=${ERASEBLOCKSIZE}"
> +EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}"
> 
>  EXTRA_IMAGEDEPENDS += "zaurus-installer"

Merged to meta-handheld, thanks.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre