Skip to contentSkip to conversation

meta-intel: some linux-yocto-3.4 updates

PATCH New [email protected] 1 participant 4 messages Jul 20, 2012

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover meta-intel: some linux-yocto-3.4 updates

From: Tom Zanussi <[email protected]>

This switches the chiefriver and jasperforest BSPs to linux-yocto-3.4 and removes the jasperforest linux-yocto-3.0 support.

The following changes since commit a944332ecfa59247cc0787c55d79a6392e3218bd:
Tom Zanussi (1):
meta-n450: explicitly specify KBRANCH we expect to use

are available in the git repository at:

git://git.yoctoproject.org/meta-intel.git tzanussi/3.4-updates
http://git.yoctoproject.org/cgit.cgi//log/?h=tzanussi/3.4-updates

Tom Zanussi (3):
meta-chiefriver: switch to linux-yocto-3.4 kernel
meta-jasperforest: switch to linux-yocto-3.4 kernel
jasperforest: retire linux-yocto-3.0

 meta-chiefriver/conf/machine/chiefriver.conf       |    2 +-
 .../linux/linux-yocto-rt_3.4.bbappend              |    8 ++++++++
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |   10 ++++++++++
 meta-jasperforest/conf/machine/jasperforest.conf   |    3 ++-
 ...rt_3.0.bbappend => linux-yocto-rt_3.4.bbappend} |    2 +-
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    9 ---------
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    9 +++++++++
 7 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
 create mode 100644 meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend
 rename meta-jasperforest/recipes-kernel/linux/{linux-yocto-rt_3.0.bbappend => linux-yocto-rt_3.4.bbappend} (84%)
 delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend
 create mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_3.4.bbappend
author
#1 lore raw

PATCH 1/3 meta-chiefriver: switch to linux-yocto-3.4 kernel

From: Tom Zanussi <[email protected]>

Switch chiefriver to the 3.4 kernel and update kernel SRCREVs.

Signed-off-by Tom Zanussi <[email protected]>
---
 meta-chiefriver/conf/machine/chiefriver.conf       |    2 +-
 .../linux/linux-yocto-rt_3.4.bbappend              |    8 ++++++++
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |   10 ++++++++++
 3 files changed, 19 insertions(+), 1 deletions(-)
 create mode 100644 meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
 create mode 100644 meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend
meta-chiefriver/conf/machine/chiefriver.conf +1 -1
index 4a35913..b644119 100644
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for Chief River systems
 # i.e. Ivy Bridge + Panther Point
 
-PREFERRED_VERSION_linux-yocto ?= "3.2%"
+PREFERRED_VERSION_linux-yocto ?= "3.4%"
 
 require conf/machine/include/tune-x86_64.inc
 require conf/machine/include/ia32-base.inc
meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend new file +8 -0
new file mode 100644
index 0000000..9e4a4a0
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_chiefriver = "chiefriver"
+KMACHINE_chiefriver  = "chiefriver"
+
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_chiefriver  = "standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_chiefriver ?= XXXX
+#SRCREV_meta_pn-linux-yocto-rt_chiefriver ?= XXXX
meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend new file +10 -0
new file mode 100644
index 0000000..3b8c6f3
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_chiefriver = "chiefriver"
+KMACHINE_chiefriver  = "chiefriver"
+KBRANCH_chiefriver  = "standard/common-pc-64/chiefriver"
+
+KERNEL_FEATURES_append_chiefriver = " features/amt/mei"
+
+SRCREV_machine_pn-linux-yocto_chiefriver ?= "6297e4c1d57e1063bfce297c2e12392348598559"
+SRCREV_meta_pn-linux-yocto_chiefriver ?= "c2b5ee363bf2612932301488f3ac0644ff70fc7c"
Signature · 1 line
1.7.0.4
author
#2 lore raw

PATCH 2/3 meta-jasperforest: switch to linux-yocto-3.4 kernel

From: Tom Zanussi <[email protected]>

Switch jasperforest to the 3.4 kernel and update kernel SRCREVs.

Signed-off-by Tom Zanussi <[email protected]>
---
 meta-jasperforest/conf/machine/jasperforest.conf   |    2 +-
 .../linux/linux-yocto-rt_3.4.bbappend              |    8 ++++++++
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    9 +++++++++
 3 files changed, 18 insertions(+), 1 deletions(-)
 create mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
 create mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_3.4.bbappend
meta-jasperforest/conf/machine/jasperforest.conf +1 -1
index 26e0814..d661f7b 100644
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for Jasper Forest Picket Post
 # systems i.e. Xeon C5500/C3500 + Intel 3420 chipset (Ibex Peak)
 
-PREFERRED_VERSION_linux-yocto ?= "3.2%"
+PREFERRED_VERSION_linux-yocto ?= "3.4%"
 
 require conf/machine/include/tune-x86_64.inc
 require conf/machine/include/ia32-base.inc
meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend new file +8 -0
new file mode 100644
index 0000000..e506bf4
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_jasperforest = "jasperforest"
+KMACHINE_jasperforest  = "jasperforest"
+
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_jasperforest  = "standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}
+#SRCREV_meta_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}
meta-jasperforest/recipes-kernel/linux/linux-yocto_3.4.bbappend new file +9 -0
new file mode 100644
index 0000000..abe60cd
@@ -0,0 +1,9 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_jasperforest = "jasperforest"
+
+KMACHINE_jasperforest  = "jasperforest"
+KBRANCH_jasperforest  = "standard/common-pc-64/jasperforest"
+
+SRCREV_machine_pn-linux-yocto_jasperforest ?= "6297e4c1d57e1063bfce297c2e12392348598559"
+SRCREV_meta_pn-linux-yocto_jasperforest ?= "c2b5ee363bf2612932301488f3ac0644ff70fc7c"
Signature · 1 line
1.7.0.4
author
#3 lore raw

PATCH 3/3 jasperforest: retire linux-yocto-3.0

In reply to [email protected]

From: Tom Zanussi <[email protected]>

With the move to linux-yocto-3.4, linux-yocto-3.0 support can be removed.

Signed-off-by Tom Zanussi <[email protected]>
---
 meta-jasperforest/conf/machine/jasperforest.conf   |    3 ++-
 .../linux/linux-yocto-rt_3.0.bbappend              |    8 --------
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    9 ---------
 3 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend
meta-jasperforest/conf/machine/jasperforest.conf +2 -1
index d661f7b..9a47b9a 100644
@@ -4,7 +4,8 @@
 #@DESCRIPTION: Machine configuration for Jasper Forest Picket Post
 # systems i.e. Xeon C5500/C3500 + Intel 3420 chipset (Ibex Peak)
 
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
+PREFERRED_VERSION_linux-yocto-rt ?= "3.2%"
 
 require conf/machine/include/tune-x86_64.inc
 require conf/machine/include/ia32-base.inc
meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend deleted +0 -8
deleted file mode 100644
index 1ddc78f..0000000
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_jasperforest = "jasperforest"
-KMACHINE_jasperforest  = "jasperforest"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_jasperforest  = "yocto/standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}
-#SRCREV_meta_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}
meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend deleted +0 -9
deleted file mode 100644
index 1cc7f56..0000000
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_jasperforest = "jasperforest"
-
-KMACHINE_jasperforest  = "jasperforest"
-KBRANCH_jasperforest  = "yocto/standard/common-pc-64/jasperforest"
-
-SRCREV_machine_pn-linux-yocto_jasperforest ?= "fc10a49bed173ade9c6c076241a448639fe50aa8"
-SRCREV_meta_pn-linux-yocto_jasperforest ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"
Signature · 1 line
1.7.0.4