diff options
| author | George Nita <george.nita@enea.com> | 2015-03-18 05:12:47 +0100 |
|---|---|---|
| committer | George Nita <george.nita@enea.com> | 2015-03-18 05:12:47 +0100 |
| commit | f45464d4db852dad79963ae15a0c1a19140bae30 (patch) | |
| tree | 76c6a6377f7f80af2c2f88355b2ad37f0cb00c2e | |
| parent | 432358b3a7cbd8edc572a813081f0a3369e076c6 (diff) | |
| parent | 53eea4f12311b4808b3af9695ac822eea1fc60c2 (diff) | |
| download | meta-intel-f45464d4db852dad79963ae15a0c1a19140bae30.tar.gz | |
Merge remote-tracking branch 'origin/master' into master-enea
| -rw-r--r-- | meta-crystalforest/conf/machine/crystalforest.conf | 2 | ||||
| -rw-r--r-- | meta-romley/conf/machine/romley-ivb.conf | 2 | ||||
| -rw-r--r-- | meta-romley/conf/machine/romley.conf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta-crystalforest/conf/machine/crystalforest.conf b/meta-crystalforest/conf/machine/crystalforest.conf index 44b9bb2d..7716e56f 100644 --- a/meta-crystalforest/conf/machine/crystalforest.conf +++ b/meta-crystalforest/conf/machine/crystalforest.conf | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | # i.e. Xeon E5-2600 and E5-2400 + Intel 89xx Communication Chipsets | 16 | # i.e. Xeon E5-2600 and E5-2400 + Intel 89xx Communication Chipsets |
| 17 | 17 | ||
| 18 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 18 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 19 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 19 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
| 20 | 20 | ||
| 21 | require conf/machine/include/intel-corei7-64-common.inc | 21 | require conf/machine/include/intel-corei7-64-common.inc |
| 22 | require conf/machine/include/intel-common-pkgarch.inc | 22 | require conf/machine/include/intel-common-pkgarch.inc |
diff --git a/meta-romley/conf/machine/romley-ivb.conf b/meta-romley/conf/machine/romley-ivb.conf index af528978..9d7bff6c 100644 --- a/meta-romley/conf/machine/romley-ivb.conf +++ b/meta-romley/conf/machine/romley-ivb.conf | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | # i.e. Xeon E5-2600 and E5-2400 + Intel CC604/C602-J | 8 | # i.e. Xeon E5-2600 and E5-2400 + Intel CC604/C602-J |
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 11 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
| 12 | 12 | ||
| 13 | require conf/machine/include/intel-corei7-64-common.inc | 13 | require conf/machine/include/intel-corei7-64-common.inc |
| 14 | require conf/machine/include/intel-common-pkgarch.inc | 14 | require conf/machine/include/intel-common-pkgarch.inc |
diff --git a/meta-romley/conf/machine/romley.conf b/meta-romley/conf/machine/romley.conf index ed52a1ec..14f34b0a 100644 --- a/meta-romley/conf/machine/romley.conf +++ b/meta-romley/conf/machine/romley.conf | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | # i.e. Xeon E5-2600 and E5-2400 + Intel CC604/C602-J | 8 | # i.e. Xeon E5-2600 and E5-2400 + Intel CC604/C602-J |
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 11 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
| 12 | 12 | ||
| 13 | require conf/machine/include/intel-corei7-64-common.inc | 13 | require conf/machine/include/intel-corei7-64-common.inc |
| 14 | require conf/machine/include/intel-common-pkgarch.inc | 14 | require conf/machine/include/intel-common-pkgarch.inc |