[meta-intel] [PATCH 4/4] emenlow: Remove SRCREVs from linux-yocto-dev, drop emgd for -dev

Darren Hart dvhart at linux.intel.com
Thu May 22 21:52:34 PDT 2014


The default AUTOREV mechanism is thwarted by SRCREV overrides in
bbappends. -dev is intended to be built using AUTOREV unless overriden
by the user in local.conf or similar. Use the defaults in the bbappends.

Drop emgd from the emenlow bbappend, but keep emenlow-noemgd as it uses
gma500 which causes issues with the other BSPs.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
---
 .../recipes-kernel/linux/linux-yocto-dev.bbappend       | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
index 27714a6..61aed2f 100644
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,21 +1,10 @@
 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"
+# NOTE: We do not set SRCREVs here as -dev is intended to be built with AUTOREV
+# and setting them here breaks the default mechanism to use AUTOREV if the
+# default SRCREV is set and linux-yocto-dev is the preferred provider.
-- 
1.9.1



More information about the meta-intel mailing list