[oe] [meta-handheld][PATCH v3 3/3] remove linux-kexecboot_3.1, now in meta-initramfs

Martin Jansa martin.jansa at gmail.com
Tue Feb 21 22:51:46 UTC 2012


On Tue, Feb 21, 2012 at 11:48:16PM +0100, Andrea Adami wrote:
> * add .bbappend
> * bump PR and INC_PR

AFAIK if you don't move all versions at once then 3.2 will always win
(ignoring D_P between layers).

Cheers,

> 
> Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
> ---
>  recipes-kernel/linux/linux-kexecboot_3.1.bb       |    7 ----
>  recipes-kernel/linux/linux-kexecboot_3.1.bbappend |   36 +++++++++++++++++++++
>  2 files changed, 36 insertions(+), 7 deletions(-)
>  delete mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bb
>  create mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bbappend
> 
> diff --git a/recipes-kernel/linux/linux-kexecboot_3.1.bb b/recipes-kernel/linux/linux-kexecboot_3.1.bb
> deleted file mode 100644
> index 28dc370..0000000
> --- a/recipes-kernel/linux/linux-kexecboot_3.1.bb
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -require linux-kexecboot.inc
> -require linux-${PV}.inc
> -
> -PR = "${INC_PR}.7"
> -S = "${WORKDIR}/linux-${PV}"
> -
> -COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
> diff --git a/recipes-kernel/linux/linux-kexecboot_3.1.bbappend b/recipes-kernel/linux/linux-kexecboot_3.1.bbappend
> new file mode 100644
> index 0000000..74d63bb
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-kexecboot_3.1.bbappend
> @@ -0,0 +1,36 @@
> +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-kexecboot-${PV}:${THISDIR}/files:"
> +
> +COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
> +
> +# Note we set loglevel=3 and master console on serial to protect bootlogo.
> +CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8"
> +CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8"
> +CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
> +CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
> +CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M"
> +CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
> +
> +# Zaurus machines need kernel size-check.
> +KERNEL_IMAGE_MAXSIZE_akita = "1294336"
> +KERNEL_IMAGE_MAXSIZE_c7x0 = "1294336"
> +KERNEL_IMAGE_MAXSIZE_collie = "1048576"
> +KERNEL_IMAGE_MAXSIZE_poodle = "1294336"
> +KERNEL_IMAGE_MAXSIZE_tosa = "1294336"
> +KERNEL_IMAGE_MAXSIZE_spitz = "1294336"
> +
> +LOGO_SIZE ?= "."
> +
> +SRC_URI += "file://defconfig \
> +           file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \
> +           "
> +
> +SRC_URI_append_collie = " \
> +                         file://0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch \
> +                         file://locomo_kbd_tweak-r2.patch \
> +                         "
> +
> +SRC_URI_append_poodle = " \
> +                         file://locomo_kbd_tweak-r2.patch \
> +                         "
> +
> +
> -- 
> 1.7.3.4
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20120221/b34d9408/attachment-0002.sig>


More information about the Openembedded-devel mailing list