diff options
| author | George Nita <george.nita@enea.com> | 2015-10-04 05:11:58 +0200 |
|---|---|---|
| committer | George Nita <george.nita@enea.com> | 2015-10-04 05:11:58 +0200 |
| commit | 385b6e75f1fe9c39c87ff179e6af8be4e80aa65f (patch) | |
| tree | 11028cf6fcef77b1ec27b1718f2830c632191c5f /meta-isg/meta-mohonpeak | |
| parent | 9e4c491105d191b064614d9255f467d552ea3362 (diff) | |
| parent | 6e91701dcf68f9351db8bb0b92eb2d26af1b8f7f (diff) | |
| download | meta-intel-385b6e75f1fe9c39c87ff179e6af8be4e80aa65f.tar.gz | |
Merge remote-tracking branch 'origin/master' into master-enea
Diffstat (limited to 'meta-isg/meta-mohonpeak')
| -rw-r--r-- | meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf | 2 | ||||
| -rw-r--r-- | meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf b/meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf index a103b0e8..afc933a1 100644 --- a/meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf +++ b/meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #@DESCRIPTION: Machine configuration for Mohon Peak systems | 4 | #@DESCRIPTION: Machine configuration for Mohon Peak systems |
| 5 | 5 | ||
| 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 7 | PREFERRED_VERSION_linux-yocto ?= "3.14%" | 7 | PREFERRED_VERSION_linux-yocto ?= "4.1%" |
| 8 | 8 | ||
| 9 | require conf/machine/include/intel-core2-32-common.inc | 9 | require conf/machine/include/intel-core2-32-common.inc |
| 10 | require conf/machine/include/intel-common-pkgarch.inc | 10 | require conf/machine/include/intel-common-pkgarch.inc |
diff --git a/meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf b/meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf index d023c15d..4beab814 100644 --- a/meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf +++ b/meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #@DESCRIPTION: Machine configuration for Mohon Peak systems | 4 | #@DESCRIPTION: Machine configuration for Mohon Peak systems |
| 5 | 5 | ||
| 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 7 | PREFERRED_VERSION_linux-yocto ?= "3.14%" | 7 | PREFERRED_VERSION_linux-yocto ?= "4.1%" |
| 8 | 8 | ||
| 9 | require conf/machine/include/intel-corei7-64-common.inc | 9 | require conf/machine/include/intel-corei7-64-common.inc |
| 10 | require conf/machine/include/intel-common-pkgarch.inc | 10 | require conf/machine/include/intel-common-pkgarch.inc |