[PATCH 0/4] remove ia32-base.inc and fix crownbay branch

[PATCH 0/4] remove ia32-base.inc and fix crownbay branch

[tom.zanussi]

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

This removes ia32-base to meta/conf/machine/include and separates out
the remaining meta-intel-specific variables into a meta-intel.inc.

Merging this depends on the move to oe-core being accepted.  For details see:

  https://bugzilla.yoctoproject.org/show_bug.cgi?id=2996

Also fixes a problem with the crownbay branch that appeared while test
building following the latest yocto-kernel class changes.

The following changes since commit c9e0d1edb1c7e1d2fa328fb1fb820b627ba02119:

  ia32-base.inc: Drop glibc --with-tls option, its now the only option for glibc (2012-08-22 14:16:59 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/meta-intel.git tzanussi/ia32-base-rm.v1
  http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/log/?h=tzanussi/ia32-base-rm.v1

Tom Zanussi (4):
  meta-intel.inc: new file
  ia32-base.inc: remove
  meta-intel.inc: have appropriate BSPs use it
  crownbay: fix KBRANCH

 conf/machine/include/ia32-base.inc                 | 65 ----------------------
 conf/machine/include/meta-intel.inc                | 16 ++++++
 meta-crownbay/conf/machine/crownbay.conf           |  1 +
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |  2 +-
 meta-fri2/conf/machine/fri2.conf                   |  1 +
 meta-romley/conf/machine/romley.conf               |  1 +
 meta-sys940x/conf/machine/sys940x.conf             |  1 +
 7 files changed, 21 insertions(+), 66 deletions(-)
 delete mode 100644 conf/machine/include/ia32-base.inc
 create mode 100644 conf/machine/include/meta-intel.inc

-- 
1.7.11.4

[PATCH 1/4] meta-intel.inc: new file

[tom.zanussi]

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

Move a couple intel-specific variables into a new meta-intel.inc
include file.  meta-intel.inc is meant to contain variables and
definitions that only make sense and are only available if the
meta-intel layer is included in bblayers.conf.

This is in preparation for moving the rest into oe-core.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 conf/machine/include/ia32-base.inc  |  7 -------
 conf/machine/include/meta-intel.inc | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 conf/machine/include/meta-intel.inc

diff --git a/conf/machine/include/ia32-base.inc b/conf/machine/include/ia32-base.inc
index f8b7b94..af583ae 100644
--- a/conf/machine/include/ia32-base.inc
+++ b/conf/machine/include/ia32-base.inc
@@ -55,11 +55,4 @@ XSERVER_IA32_I965 = "xf86-video-intel \
            mesa-dri-driver-i965 \
            "
 
-XSERVER_IA32_EMGD = "emgd-driver-bin \
-           "
-
 XSERVER_IA32_VESA = "xf86-video-vesa"
-
-XSERVER_IA32_MATROX_MGA = "xserver-xorg-module-xaa \
-           xf86-video-mga \
-           "
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
new file mode 100644
index 0000000..f0e538d
--- /dev/null
+++ b/conf/machine/include/meta-intel.inc
@@ -0,0 +1,16 @@
+#
+# BSP variables and settings specific to the meta-intel layer.
+# You must include the meta-intel layer in your bblayers.conf
+# to use them.
+#
+
+#
+# XSERVER subcomponents, used to build the XSERVER variable
+#
+XSERVER_IA32_EMGD = "emgd-driver-bin \
+           "
+
+XSERVER_IA32_MATROX_MGA = "xserver-xorg-module-xaa \
+           xf86-video-mga \
+           "
+
-- 
1.7.11.4

[PATCH 2/4] ia32-base.inc: remove

[tom.zanussi]

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

This has been moved to oe-core, so remove it.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 conf/machine/include/ia32-base.inc | 58 --------------------------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 conf/machine/include/ia32-base.inc

diff --git a/conf/machine/include/ia32-base.inc b/conf/machine/include/ia32-base.inc
deleted file mode 100644
index af583ae..0000000
--- a/conf/machine/include/ia32-base.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# base machine settings for ia32-architecture BSPs
-#
-
-#
-# common settings for Intel-based machines
-#
-MACHINE_FEATURES += "screen keyboard pci usbhost ext2 ext3 x86 \
-                     acpi serial usbgadget alsa"
-
-MACHINE_EXTRA_RRECOMMENDS += "kernel-modules eee-acpi-scripts"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "grub"
-
-IMAGE_FSTYPES += "ext3 cpio.gz live"
-
-KERNEL_IMAGETYPE ?= "bzImage"
-
-SERIAL_CONSOLE ?= "115200 ttyS0"
-
-#
-# glibc-related variables
-#
-GLIBC_ADDONS ?= "nptl"
-
-#
-# kernel-related variables
-#
-PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ??= "3.0%"
-
-#
-# XSERVER subcomponents, used to build the XSERVER variable
-#
-XSERVER_IA32_BASE = "xserver-xorg \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-input-synaptics \
-           mesa-dri \
-           "
-
-XSERVER_IA32_EXT = "xserver-xorg-extension-dri \
-           xserver-xorg-extension-dri2 \
-           xserver-xorg-extension-glx \
-           xserver-xorg-extension-extmod \
-           xserver-xorg-extension-dbe \
-           xserver-xorg-module-libint10 \
-           "
-
-XSERVER_IA32_I915 = "xf86-video-intel \
-           mesa-dri-driver-i915 \
-           "
-
-XSERVER_IA32_I965 = "xf86-video-intel \
-           mesa-dri-driver-i965 \
-           "
-
-XSERVER_IA32_VESA = "xf86-video-vesa"
-- 
1.7.11.4

[PATCH 3/4] meta-intel.inc: have appropriate BSPs use it

[tom.zanussi]

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

ia32-base.inc no longer contains everything these BSPs need - some of
what was in that file is now in meta-intel.inc, so we need to include
that too.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-crownbay/conf/machine/crownbay.conf | 1 +
 meta-fri2/conf/machine/fri2.conf         | 1 +
 meta-romley/conf/machine/romley.conf     | 1 +
 meta-sys940x/conf/machine/sys940x.conf   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 7d5e597..dba735a 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -8,6 +8,7 @@ PREFERRED_VERSION_linux-yocto ?= "3.4%"
 
 require conf/machine/include/tune-atom.inc
 require conf/machine/include/ia32-base.inc
+require conf/machine/include/meta-intel.inc
 
 MACHINE_FEATURES += "gst-va-mixvideo"
 
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index f90deb3..a928f0f 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -6,6 +6,7 @@
 
 require conf/machine/include/tune-atom.inc
 require conf/machine/include/ia32-base.inc
+require conf/machine/include/meta-intel.inc
 
 VA_FEATURES ?= "gst-va-intel va-intel"
 
diff --git a/meta-romley/conf/machine/romley.conf b/meta-romley/conf/machine/romley.conf
index f7cfa18..ab4d3c0 100644
--- a/meta-romley/conf/machine/romley.conf
+++ b/meta-romley/conf/machine/romley.conf
@@ -9,6 +9,7 @@ PREFERRED_VERSION_linux-yocto ?= "3.2%"
 
 require conf/machine/include/tune-x86_64.inc
 require conf/machine/include/ia32-base.inc
+require conf/machine/include/meta-intel.inc
 
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
index 18f769d..9db2b2a 100644
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ b/meta-sys940x/conf/machine/sys940x.conf
@@ -6,6 +6,7 @@
 
 require conf/machine/include/tune-atom.inc
 require conf/machine/include/ia32-base.inc
+require conf/machine/include/meta-intel.inc
 
 # Add "pcbios" if you have a non-efi version of the firmware
 MACHINE_FEATURES += "efi pcbios gst-va-mixvideo"
-- 
1.7.11.4

[PATCH 4/4] crownbay: fix KBRANCH

[tom.zanussi]

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

KBRANCH_crownbay is set to standard/default/crownbay, which isn't even
a 3.4 branch.

Set it to standard/crownbay, which is.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 4f9dd70..a384ca0 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 COMPATIBLE_MACHINE_crownbay = "crownbay"
 KMACHINE_crownbay  = "crownbay"
-KBRANCH_crownbay  = "standard/default/crownbay"
+KBRANCH_crownbay  = "standard/crownbay"
 
 COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
 KMACHINE_crownbay-noemgd  = "crownbay"
-- 
1.7.11.4