diff options
| author | Maxin B. John <maxin.john@enea.com> | 2014-04-03 09:58:55 +0200 |
|---|---|---|
| committer | Maxin B. John <maxin.john@enea.com> | 2014-04-03 09:58:55 +0200 |
| commit | 6ef83e1cb65080174a888faef3a0791158f10ee4 (patch) | |
| tree | 6b028d3ab33c369284f41614d1c14aef8994c2cc /meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | |
| parent | accc04b57bb68da4542bcecd49d95dcb03efd909 (diff) | |
| parent | 185ac2bc78f4c23c2023b5ecad3a21e3f3fc34de (diff) | |
| download | meta-intel-6ef83e1cb65080174a888faef3a0791158f10ee4.tar.gz | |
Merge remote-tracking branch 'origin/master' into master-enea
Conflicts:
common/recipes-kernel/linux/linux-yocto_3.10.bbappend
Diffstat (limited to 'meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend')
| -rw-r--r-- | meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend index 4b81b610..07eaa2a4 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | LINUX_VERSION = "3.10.33" | 3 | LINUX_VERSION = "3.10.34" |
| 4 | 4 | ||
| 5 | COMPATIBLE_MACHINE_fri2 = "fri2" | 5 | COMPATIBLE_MACHINE_fri2 = "fri2" |
| 6 | KMACHINE_fri2 = "fri2" | 6 | KMACHINE_fri2 = "fri2" |
| 7 | KBRANCH_fri2 = "standard/fri2" | 7 | KBRANCH_fri2 = "standard/fri2" |
| 8 | KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" | 8 | KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" |
| 9 | SRCREV_meta_fri2 = "99c503a92885060bebf2bba6747735e8e9346a40" | 9 | SRCREV_meta_fri2 = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
| 10 | SRCREV_machine_fri2 = "21df0c8486e129a4087970a07b423c533ae05de7" | 10 | SRCREV_machine_fri2 = "c7739be126930006e3bfbdb2fb070a967abc5e09" |
| 11 | SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" | 11 | SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" |
| 12 | SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" | 12 | SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" |
| 13 | 13 | ||
| @@ -15,8 +15,8 @@ COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" | |||
| 15 | KMACHINE_fri2-noemgd = "fri2" | 15 | KMACHINE_fri2-noemgd = "fri2" |
| 16 | KBRANCH_fri2-noemgd = "standard/fri2" | 16 | KBRANCH_fri2-noemgd = "standard/fri2" |
| 17 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" | 17 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" |
| 18 | SRCREV_meta_fri2-noemgd = "99c503a92885060bebf2bba6747735e8e9346a40" | 18 | SRCREV_meta_fri2-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
| 19 | SRCREV_machine_fri2-noemgd = "21df0c8486e129a4087970a07b423c533ae05de7" | 19 | SRCREV_machine_fri2-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09" |
| 20 | 20 | ||
| 21 | module_autoload_iwlwifi = "iwlwifi" | 21 | module_autoload_iwlwifi = "iwlwifi" |
| 22 | 22 | ||