[meta-intel] [PATCH 2/2] meta-emenlow: Common kernel update for -noemgd

[Darren Hart]

On 3/17/14, 9:48, "tom.zanussi at intel.com" <tom.zanussi at intel.com> wrote:

>From: Tom Zanussi <tom.zanussi at intel.com>
>
>Have emenlow-noemgd use intel-common-pkgarch, and for linux-yocto-dev
>use the common kernel and remove the noemgd branch-specific variables
>now defined by the common include.
>
>Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>

Acked-by: Darren Hart <dvhart at linux.intel.com>

One question, you say to use the common kernel only for
linux-yocto-dev.... What about 3.10?

If you expect it to use the machine specific kernel (or at least to name
it as such) the 3.10 kernel bbappend will need to add:

PACKAGE_ARCH = "${MACHINE_ARCH}"

To undo the change to that variable in intel-common-pkgarch.inc

Same for the crown bay patch I Acked previously.

--
Darren

>---
> meta-emenlow/conf/machine/emenlow-noemgd.conf      |    6 ++++--
> .../recipes-kernel/linux/linux-yocto-dev.bbappend  |    6 ------
> 2 files changed, 4 insertions(+), 8 deletions(-)
>
>diff --git a/meta-emenlow/conf/machine/emenlow-noemgd.conf
>b/meta-emenlow/conf/machine/emenlow-noemgd.conf
>index f7b11e6..68f83a4 100644
>--- a/meta-emenlow/conf/machine/emenlow-noemgd.conf
>+++ b/meta-emenlow/conf/machine/emenlow-noemgd.conf
>@@ -8,9 +8,11 @@
> PREFERRED_VERSION_linux-yocto ?= "3.10%"
> 
> require conf/machine/include/intel-core2-32-common.inc
>+require conf/machine/include/intel-common-pkgarch.inc
> 
> XSERVER ?= "${XSERVER_X86_BASE} \
>-           ${XSERVER_X86_EXT} \
>-           ${XSERVER_X86_MODESETTING} \
>+            ${XSERVER_X86_EXT} \
>+            ${XSERVER_X86_MODESETTING} \
>            "
>+
> APPEND += "reboot=pci"
>diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
>b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
>index 27714a6..9d1481e 100644
>--- a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
>+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
>@@ -1,21 +1,15 @@
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> 
>-
> COMPATIBLE_MACHINE_emenlow = "emenlow"
> KMACHINE_emenlow = "emenlow"
> KBRANCH_emenlow = "standard/emenlow"
> KERNEL_FEATURES_append_emenlow = " features/drm-emgd/drm-emgd-1.16
>cfg/vesafb"
> 
> COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
>-KMACHINE_emenlow-noemgd = "emenlow"
>-KBRANCH_emenlow-noemgd = "standard/emenlow"
> KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
> 
> SRCREV_machine_emenlow = "60536206ad300ccf5b2be2c2d449f4ab27170238"
> SRCREV_meta_emenlow = "fe20c99783387dab779472ff50a88666da1c6391"
> SRCREV_emgd_emenlow = "17aacd908ed6035213a6d206cfdb2c0c9fa9e0c1"
> 
>-SRCREV_machine_emenlow-noemgd =
>"60536206ad300ccf5b2be2c2d449f4ab27170238"
>-SRCREV_meta_emenlow-noemgd = "fe20c99783387dab779472ff50a88666da1c6391"
>-
> SRC_URI_emenlow =
>"git://git.yoctoproject.org/linux-yocto-dev.git;protocol=git;nocheckout=1;
>branch=${KBRANCH},${KMETA},emgd-1.16;name=machine,meta,emgd"
>-- 
>1.7.9.5
>
>-- 
>_______________________________________________
>meta-intel mailing list
>meta-intel at yoctoproject.org
>https://lists.yoctoproject.org/listinfo/meta-intel
>


-- 
Darren Hart
Yocto Project - Linux Kernel
Intel Open Source Technology Center