diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-10-29 17:29:16 -0500 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2012-10-29 18:04:05 -0500 |
commit | 3898886e634523bc1bfbfae9f942959f6badfdb0 (patch) | |
tree | 2567d14d254ba16c45c53ad8b2179f6e52d65a00 /meta-fri2/recipes-kernel | |
parent | 20c289289ef1fa84bbef323c77d2c39e9e8a9882 (diff) | |
download | meta-intel-3898886e634523bc1bfbfae9f942959f6badfdb0.tar.gz |
meta-intel: update kernel SRCREVs and pin LINUX_VERSION
Update all the linux-yocto .bbappends with the latest kernel SRCREVs
and add explicit LINUX_VERSIONs for the 1.3 release, to prevent a
mismatch between the kernel version actually used in the machine
branch vs the version the recipe uses for the kernel image, which can
change with stable updates.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-fri2/recipes-kernel')
-rw-r--r-- | meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend | 10 | ||||
-rw-r--r-- | meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend index 35d0b3ae..8459a354 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend | |||
@@ -3,13 +3,15 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
3 | COMPATIBLE_MACHINE_fri2 = "fri2" | 3 | COMPATIBLE_MACHINE_fri2 = "fri2" |
4 | KMACHINE_fri2 = "fri2" | 4 | KMACHINE_fri2 = "fri2" |
5 | KBRANCH_fri2 = "standard/default/fri2" | 5 | KBRANCH_fri2 = "standard/default/fri2" |
6 | SRCREV_machine_pn-linux-yocto_fri2 ?= "046bef8ea4dbb9c279e49ad9faf240b86fc80fdc" | 6 | SRCREV_machine_pn-linux-yocto_fri2 ?= "e0b29aa980673a1a5abde5ffdf356ca21b00f3ec" |
7 | SRCREV_meta_pn-linux-yocto_fri2 ?= "07ee09b520579b9f29bd15fefb01fd28b34c6064" | 7 | SRCREV_meta_pn-linux-yocto_fri2 ?= "486f7aec824b4127e91ef53228823e996b3696f0" |
8 | 8 | ||
9 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" | 9 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" |
10 | KMACHINE_fri2-noemgd = "fri2" | 10 | KMACHINE_fri2-noemgd = "fri2" |
11 | KBRANCH_fri2-noemgd = "standard/default/fri2" | 11 | KBRANCH_fri2-noemgd = "standard/default/fri2" |
12 | SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "046bef8ea4dbb9c279e49ad9faf240b86fc80fdc" | 12 | SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "e0b29aa980673a1a5abde5ffdf356ca21b00f3ec" |
13 | SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "07ee09b520579b9f29bd15fefb01fd28b34c6064" | 13 | SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "486f7aec824b4127e91ef53228823e996b3696f0" |
14 | |||
15 | LINUX_VERSION = "3.2.18" | ||
14 | 16 | ||
15 | module_autoload_iwlwifi = "iwlwifi" | 17 | module_autoload_iwlwifi = "iwlwifi" |
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend index 522c7038..dff9456d 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend | |||
@@ -12,4 +12,6 @@ KBRANCH_fri2-noemgd = "standard/fri2" | |||
12 | SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2" | 12 | SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2" |
13 | SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" | 13 | SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" |
14 | 14 | ||
15 | LINUX_VERSION = "3.4.11" | ||
16 | |||
15 | module_autoload_iwlwifi = "iwlwifi" | 17 | module_autoload_iwlwifi = "iwlwifi" |