diff options
author | George Nita <george.nita@enea.com> | 2015-09-03 05:12:11 +0200 |
---|---|---|
committer | George Nita <george.nita@enea.com> | 2015-09-03 05:12:11 +0200 |
commit | 3ab7b40622ac62f2e8876adabfbfbcb80e62bb2e (patch) | |
tree | 4428c3f371f1398555c203d1cb32088b41aceda4 /meta-emenlow/recipes-kernel | |
parent | a83cdb055a432ca3554b4ce7aab4ccd2243a5730 (diff) | |
parent | cea00968b858b60222d68103491f076067d73876 (diff) | |
download | meta-intel-3ab7b40622ac62f2e8876adabfbfbcb80e62bb2e.tar.gz |
Merge remote-tracking branch 'origin/master' into master-enea
Diffstat (limited to 'meta-emenlow/recipes-kernel')
-rw-r--r-- | meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend | 10 | ||||
-rw-r--r-- | meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend | 10 |
2 files changed, 0 insertions, 20 deletions
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend deleted file mode 100644 index 61aed2f4..00000000 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" | ||
4 | KMACHINE_emenlow-noemgd = "emenlow" | ||
5 | KBRANCH_emenlow-noemgd = "standard/emenlow" | ||
6 | KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" | ||
7 | |||
8 | # NOTE: We do not set SRCREVs here as -dev is intended to be built with AUTOREV | ||
9 | # and setting them here breaks the default mechanism to use AUTOREV if the | ||
10 | # default SRCREV is set and linux-yocto-dev is the preferred provider. | ||
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend deleted file mode 100644 index a2b8d67c..00000000 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" | ||
4 | KMACHINE_emenlow-noemgd = "emenlow" | ||
5 | KBRANCH_emenlow-noemgd = "standard/base" | ||
6 | KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" | ||
7 | |||
8 | LINUX_VERSION_emenlow-noemgd = "3.14.36" | ||
9 | SRCREV_machine_emenlow-noemgd = "4434aa71ff7043c570f9eae493df1ccadbda9b85" | ||
10 | SRCREV_meta_emenlow-noemgd = "c33d39561807e1073ca412f1c771f43e4da75994" | ||