diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2014-05-21 15:54:59 -0700 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2014-05-22 22:58:14 -0700 |
| commit | e115c951633b5381dfb111fa4dd444e539c8f40a (patch) | |
| tree | 41458415e33bb6eb1320caee57a24afa186af1b2 | |
| parent | f5951ee2ef9b7027318eaf563beeb8d3e8f8d736 (diff) | |
| download | meta-intel-e115c951633b5381dfb111fa4dd444e539c8f40a.tar.gz | |
emenlow: Remove SRCREVs from linux-yocto-dev, drop emgd for -dev
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@linux.intel.com>
(cherry picked from commit 0c80a8a3b39c5366499af19060bcf8fd23643219)
| -rw-r--r-- | meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend | 17 |
1 files 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 27714a6a..61aed2f4 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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | |||
| 4 | COMPATIBLE_MACHINE_emenlow = "emenlow" | ||
| 5 | KMACHINE_emenlow = "emenlow" | ||
| 6 | KBRANCH_emenlow = "standard/emenlow" | ||
| 7 | KERNEL_FEATURES_append_emenlow = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" | ||
| 8 | |||
| 9 | COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" | 3 | COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" |
| 10 | KMACHINE_emenlow-noemgd = "emenlow" | 4 | KMACHINE_emenlow-noemgd = "emenlow" |
| 11 | KBRANCH_emenlow-noemgd = "standard/emenlow" | 5 | KBRANCH_emenlow-noemgd = "standard/emenlow" |
| 12 | KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" | 6 | KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" |
| 13 | 7 | ||
| 14 | SRCREV_machine_emenlow = "60536206ad300ccf5b2be2c2d449f4ab27170238" | 8 | # NOTE: We do not set SRCREVs here as -dev is intended to be built with AUTOREV |
| 15 | SRCREV_meta_emenlow = "fe20c99783387dab779472ff50a88666da1c6391" | 9 | # and setting them here breaks the default mechanism to use AUTOREV if the |
| 16 | SRCREV_emgd_emenlow = "17aacd908ed6035213a6d206cfdb2c0c9fa9e0c1" | 10 | # default SRCREV is set and linux-yocto-dev is the preferred provider. |
| 17 | |||
| 18 | SRCREV_machine_emenlow-noemgd = "60536206ad300ccf5b2be2c2d449f4ab27170238" | ||
| 19 | SRCREV_meta_emenlow-noemgd = "fe20c99783387dab779472ff50a88666da1c6391" | ||
| 20 | |||
| 21 | 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" | ||