summaryrefslogtreecommitdiffstats
path: root/meta-fri2
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-11-12 04:46:42 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2012-11-13 15:24:46 (GMT)
commit787d5d8c933577307d5c231f5ba3e9aa41db3aea (patch)
treeba888d181e1eec4c3aed5d071b5b5bb6bf036bad /meta-fri2
parent52a9a5aec7cc61d115e72015fd2451facec739cb (diff)
downloadmeta-intel-787d5d8c933577307d5c231f5ba3e9aa41db3aea.tar.gz
meta-intel: remove explicit kernel SRCREVs
To ease development on unreleased BSPs, let the kernel SRCREV float. This avoids constantly having to update the SRCREVs manually, and assures we won't get into a situation where LINUX_VERSION doesn't match the version set by the kernel recipe. We'll lock down the kernel SRCREVs and set the matching LINUX_VERSION when we do releases, but in the meantime, we can use AUTOREV. Note that individual BSPs are always free to override this maintain their own SRCREVs if they want to. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-fri2')
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend8
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend8
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend8
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend10
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend10
5 files changed, 20 insertions, 24 deletions
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
index 08f8753..0d18043 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
@@ -3,13 +3,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3COMPATIBLE_MACHINE_fri2 = "fri2" 3COMPATIBLE_MACHINE_fri2 = "fri2"
4KMACHINE_fri2 = "fri2" 4KMACHINE_fri2 = "fri2"
5#KBRANCH_fri2 = "standard/preempt-rt/fri2" 5#KBRANCH_fri2 = "standard/preempt-rt/fri2"
6SRCREV_machine_pn-linux-yocto-rt_fri2 ?= "99554fd7da2605828ceda01a113bf826ec5a8229" 6SRCREV_machine_pn-linux-yocto-rt_fri2 ?= "${AUTOREV}"
7SRCREV_meta_pn-linux-yocto-rt_fri2 ?= "07ee09b520579b9f29bd15fefb01fd28b34c6064" 7SRCREV_meta_pn-linux-yocto-rt_fri2 ?= "${AUTOREV}"
8 8
9COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" 9COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
10KMACHINE_fri2-noemgd = "fri2" 10KMACHINE_fri2-noemgd = "fri2"
11#KBRANCH_fri2-noemgd = "standard/preempt-rt/fri2" 11#KBRANCH_fri2-noemgd = "standard/preempt-rt/fri2"
12SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "99554fd7da2605828ceda01a113bf826ec5a8229" 12SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "${AUTOREV}"
13SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "07ee09b520579b9f29bd15fefb01fd28b34c6064" 13SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "${AUTOREV}"
14 14
15module_autoload_iwlwifi = "iwlwifi" 15module_autoload_iwlwifi = "iwlwifi"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
index 2c0a8fb..967f6cc 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -3,13 +3,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3COMPATIBLE_MACHINE_fri2 = "fri2" 3COMPATIBLE_MACHINE_fri2 = "fri2"
4KMACHINE_fri2 = "fri2" 4KMACHINE_fri2 = "fri2"
5KBRANCH_fri2 = "standard/preempt-rt/fri2" 5KBRANCH_fri2 = "standard/preempt-rt/fri2"
6SRCREV_machine_pn-linux-yocto-rt_fri2 ?= "f867af8e39af7a47b79e05b6b4ccc6cde09579ee" 6SRCREV_machine_pn-linux-yocto-rt_fri2 ?= "${AUTOREV}"
7SRCREV_meta_pn-linux-yocto-rt_fri2 ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" 7SRCREV_meta_pn-linux-yocto-rt_fri2 ?= "${AUTOREV}"
8 8
9COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" 9COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
10KMACHINE_fri2-noemgd = "fri2" 10KMACHINE_fri2-noemgd = "fri2"
11KBRANCH_fri2-noemgd = "standard/preempt-rt/fri2" 11KBRANCH_fri2-noemgd = "standard/preempt-rt/fri2"
12SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "f867af8e39af7a47b79e05b6b4ccc6cde09579ee" 12SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "${AUTOREV}"
13SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" 13SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "${AUTOREV}"
14 14
15module_autoload_iwlwifi = "iwlwifi" 15module_autoload_iwlwifi = "iwlwifi"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend
index f9130ab..46a45f9 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend
@@ -3,12 +3,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3COMPATIBLE_MACHINE_fri2 = "fri2" 3COMPATIBLE_MACHINE_fri2 = "fri2"
4KMACHINE_fri2 = "fri2" 4KMACHINE_fri2 = "fri2"
5KBRANCH_fri2 = "standard/tiny/base" 5KBRANCH_fri2 = "standard/tiny/base"
6#SRCREV_machine_pn-linux-yocto-tiny_fri2 ?= "449f7f520350700858f21a5554b81cc8ad23267d" 6#SRCREV_machine_pn-linux-yocto-tiny_fri2 ?= "${AUTOREV}"
7SRCREV_meta_pn-linux-yocto-tiny_fri2 ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" 7SRCREV_meta_pn-linux-yocto-tiny_fri2 ?= "${AUTOREV}"
8 8
9 9
10COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" 10COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
11KMACHINE_fri2-noemgd = "fri2" 11KMACHINE_fri2-noemgd = "fri2"
12KBRANCH_fri2-noemgd = "standard/tiny/base" 12KBRANCH_fri2-noemgd = "standard/tiny/base"
13#SRCREV_machine_pn-linux-yocto-tiny_fri2-noemgd ?= "449f7f520350700858f21a5554b81cc8ad23267d" 13#SRCREV_machine_pn-linux-yocto-tiny_fri2-noemgd ?= "${AUTOREV}"
14SRCREV_meta_pn-linux-yocto-tiny_fri2-noemgd ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" 14SRCREV_meta_pn-linux-yocto-tiny_fri2-noemgd ?= "${AUTOREV}"
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 8459a35..f036ccc 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend
@@ -3,15 +3,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3COMPATIBLE_MACHINE_fri2 = "fri2" 3COMPATIBLE_MACHINE_fri2 = "fri2"
4KMACHINE_fri2 = "fri2" 4KMACHINE_fri2 = "fri2"
5KBRANCH_fri2 = "standard/default/fri2" 5KBRANCH_fri2 = "standard/default/fri2"
6SRCREV_machine_pn-linux-yocto_fri2 ?= "e0b29aa980673a1a5abde5ffdf356ca21b00f3ec" 6SRCREV_machine_pn-linux-yocto_fri2 ?= "${AUTOREV}"
7SRCREV_meta_pn-linux-yocto_fri2 ?= "486f7aec824b4127e91ef53228823e996b3696f0" 7SRCREV_meta_pn-linux-yocto_fri2 ?= "${AUTOREV}"
8 8
9COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" 9COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
10KMACHINE_fri2-noemgd = "fri2" 10KMACHINE_fri2-noemgd = "fri2"
11KBRANCH_fri2-noemgd = "standard/default/fri2" 11KBRANCH_fri2-noemgd = "standard/default/fri2"
12SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "e0b29aa980673a1a5abde5ffdf356ca21b00f3ec" 12SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "${AUTOREV}"
13SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "486f7aec824b4127e91ef53228823e996b3696f0" 13SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "${AUTOREV}"
14
15LINUX_VERSION = "3.2.18"
16 14
17module_autoload_iwlwifi = "iwlwifi" 15module_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 dff9456..814d08e 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -3,15 +3,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3COMPATIBLE_MACHINE_fri2 = "fri2" 3COMPATIBLE_MACHINE_fri2 = "fri2"
4KMACHINE_fri2 = "fri2" 4KMACHINE_fri2 = "fri2"
5KBRANCH_fri2 = "standard/fri2" 5KBRANCH_fri2 = "standard/fri2"
6SRCREV_machine_pn-linux-yocto_fri2 ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2" 6SRCREV_machine_pn-linux-yocto_fri2 ?= "${AUTOREV}"
7SRCREV_meta_pn-linux-yocto_fri2 ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" 7SRCREV_meta_pn-linux-yocto_fri2 ?= "${AUTOREV}"
8 8
9COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" 9COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
10KMACHINE_fri2-noemgd = "fri2" 10KMACHINE_fri2-noemgd = "fri2"
11KBRANCH_fri2-noemgd = "standard/fri2" 11KBRANCH_fri2-noemgd = "standard/fri2"
12SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2" 12SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "${AUTOREV}"
13SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" 13SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "${AUTOREV}"
14
15LINUX_VERSION = "3.4.11"
16 14
17module_autoload_iwlwifi = "iwlwifi" 15module_autoload_iwlwifi = "iwlwifi"