[PATCH 0/3] meta-intel: fishriver update

[PATCH 0/3] meta-intel: fishriver update

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

A few updates for meta-fishriver dealing with the new tune file
and live image changes.  This also moves the kernel to 3.0.

Boot tested successfully with the fishriver live sato image (on
emenlow since my fishriver is currently broken).

The following changes since commit b1dab2886f607a181afc843925ce76c9ef1c340c:
  Tom Zanussi (1):
        meta-emenlow: add live fstype

are available in the git repository at:

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

Tom Zanussi (3):
  meta-fishriver: remove tune-related assignments from machine conf
  meta-fishriver: add live fstype
  meta-fishriver: switch to linux-yocto 3.0 kernel

 meta-fishriver/conf/machine/fishriver.conf         |    6 +++---
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend

[PATCH 1/3] meta-fishriver: remove tune-related assignments from machine conf

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

These are all now handled or obsoleted by tune-atom.inc, so remove
them here.
---
 meta-fishriver/conf/machine/fishriver.conf |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index e692cac..6f90776 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -4,8 +4,6 @@
 #@DESCRIPTION: Machine configuration for Fish River Island systems
 # i.e. Z530/E660 + EG20T
 
-TARGET_ARCH = "i586"
-
 include conf/machine/include/tune-atom.inc
 
 MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-- 
1.7.0.4

[PATCH 2/3] meta-fishriver: add live fstype

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

Most of the time, we want a -live image, so add it to the
IMAGE_FSTYPES by default.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-fishriver/conf/machine/fishriver.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index 6f90776..c59e81d 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -28,7 +28,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
 
-IMAGE_FSTYPES ?= "ext3 cpio.gz"
+IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
-- 
1.7.0.4

[PATCH 3/3] meta-fishriver: switch to linux-yocto 3.0 kernel

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

Switch fishriver to the 3.0 kernel, lock it down, and update kernel
SRCREVs.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-fishriver/conf/machine/fishriver.conf         |    2 ++
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)
 create mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend

diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index c59e81d..a44d896 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -12,6 +12,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 KERNEL_IMAGETYPE = "bzImage"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+PREFERRED_VERSION_linux-yocto = "3.0+git%"
+
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend
new file mode 100644
index 0000000..e96751e
--- /dev/null
+++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_fishriver = "fishriver"
+KMACHINE_fishriver  = "yocto/standard/fishriver"
+
+SRCREV_machine_pn-linux-yocto_fishriver ?= "e556c2a9403cef5688b55283b1d2bd4ca704dc59"
+SRCREV_meta_pn-linux-yocto_fishriver ?= "76b3679beff6c640388a609ccf87f46bb7bf0f2b"
-- 
1.7.0.4