Skip to contentSkip to conversation

meta-intel: machine config cleanup, v2

PATCH New [email protected] 1 participant 18 messages Nov 21, 2011

lore
Share & tools
lore
#0 lore raw

cover meta-intel: machine config cleanup, v2

From: Tom Zanussi <[email protected]>

This patchset cleans up the BSPs in meta-intel by having them use the new ia32-base.inc file containing common BSP settings.

The following BSPs were build- and boot-tested: sugarbay, crownbay, crownbay-noemgd, emenlow, and n450. These represent all the main variations and all were verified to work the same before as after. This includes the n450, which wasn't able to start X either before or after.

The other BSPs are the same or similar to those tested, so shouldn't see any changes either, but will have to be tested later.

v2: Add common metadata to intel layer and add a layer dependency section to BSP READMEs.

The following changes since commit 2a41ae377613b1f14829179f437aa76bbb1bc39e:
Tom Zanussi (1):
meta-intel: update kernel SRCREVs

are available in the git repository at:

git://git.yoctoproject.org/meta-intel.git tzanussi/conf-cleanup-v2
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/log/?h=tzanussi/conf-cleanup-v2

Tom Zanussi (17):
meta-intel: remove virtual/xserver-xf86 references
meta-intel: make meta-intel itself a layer
ia32-base.inc: new include file
Have sugarbay.conf use the common ia32-base .inc file and remove the
open-coded machine settings.
Have fishriver.conf use the common ia32-base .inc file and remove the
open-coded machine settings.
Have crownbay.conf use the common ia32-base .inc file and remove the
open-coded machine settings.
Have crownbay-noemgd.conf use the common ia32-base .inc file and
remove the open-coded machine settings.
Have fri2.conf use the common ia32-base .inc file and remove the
open-coded machine settings.
Have fri2-noemgd.conf use the common ia32-base .inc file and
remove the open-coded machine settings.
Have jasperforest.conf use the common ia32-base .inc file and
remove the open-coded machine settings.
Have n450.conf use the common ia32-base .inc file and remove the
open-coded machine settings.
Have romley.conf use the common ia32-base .inc file and remove the
open-coded machine settings.
Have emenlow.conf use the common ia32-base .inc file and remove the
open-coded machine settings.
meta-intel: update READMEs with new layer info
meta-crownbay: remove common from BBFILES
meta-fri2: remove common from BBFILES
meta-intel: update READMEs with layer dependency list

 conf/layer.conf                                  |   10 ++++
 conf/machine/include/ia32-base.inc               |   58 ++++++++++++++++++++++
 meta-crownbay/README                             |   22 ++++++++-
 meta-crownbay/conf/layer.conf                    |    4 +-
 meta-crownbay/conf/machine/crownbay-noemgd.conf  |   43 ++--------------
 meta-crownbay/conf/machine/crownbay.conf         |   43 ++--------------
 meta-emenlow/README                              |   21 ++++++++-
 meta-emenlow/conf/machine/emenlow.conf           |   22 +--------
 meta-fishriver/README                            |   21 ++++++++-
 meta-fishriver/conf/machine/fishriver.conf       |   42 ++--------------
 meta-fri2/README                                 |   22 ++++++++-
 meta-fri2/conf/layer.conf                        |    4 +-
 meta-fri2/conf/machine/fri2-noemgd.conf          |   43 ++--------------
 meta-fri2/conf/machine/fri2.conf                 |   43 +++-------------
 meta-jasperforest/README                         |   25 ++++++++-
 meta-jasperforest/conf/machine/jasperforest.conf |   42 ++--------------
 meta-n450/ReleaseNotes                           |    4 ++
 meta-n450/conf/machine/n450.conf                 |   40 ++-------------
 meta-romley/README                               |   22 ++++++++-
 meta-romley/conf/machine/romley.conf             |   40 ++-------------
 meta-sugarbay/README                             |   22 ++++++++-
 meta-sugarbay/conf/machine/sugarbay.conf         |   43 ++--------------
 22 files changed, 270 insertions(+), 366 deletions(-)
 create mode 100644 conf/layer.conf
 create mode 100644 conf/machine/include/ia32-base.inc
#1 lore raw

PATCH 1/17 meta-intel: remove virtual/xserver-xf86 references

From: Tom Zanussi <[email protected]>

These are now deprecated (in favor of just virtual/xserver), so remove them.

---
 meta-crownbay/conf/machine/crownbay-noemgd.conf  |    1 -
 meta-crownbay/conf/machine/crownbay.conf         |    1 -
 meta-emenlow/conf/machine/emenlow.conf           |    1 -
 meta-fishriver/conf/machine/fishriver.conf       |    1 -
 meta-fri2/conf/machine/fri2-noemgd.conf          |    1 -
 meta-fri2/conf/machine/fri2.conf                 |    1 -
 meta-jasperforest/conf/machine/jasperforest.conf |    1 -
 meta-n450/conf/machine/n450.conf                 |    1 -
 meta-romley/conf/machine/romley.conf             |    1 -
 meta-sugarbay/conf/machine/sugarbay.conf         |    1 -
 10 files changed, 0 insertions(+), 10 deletions(-)
meta-crownbay/conf/machine/crownbay-noemgd.conf +0 -1
index f61c75a..aa9e732 100644
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
            xserver-xorg-extension-dri \
            xserver-xorg-extension-dri2 \
meta-crownbay/conf/machine/crownbay.conf +0 -1
index defa4e5..9315e82 100644
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
            xserver-xorg-extension-dri \
            xserver-xorg-extension-dri2 \
meta-emenlow/conf/machine/emenlow.conf +0 -1
index 774ef08..06cba37 100644
@@ -20,7 +20,6 @@ PREFERRED_PROVIDER_drm = "libdrm-poulsbo"
 PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-psb"
-PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb"
 PREFERRED_PROVIDER_mesa-dri = "xpsb-glx"
 XSERVER ?= "xserver-psb \
            xserver-psb-extension-dri \
meta-fishriver/conf/machine/fishriver.conf +0 -1
index 79bf349..8cc43f8 100644
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
            xserver-xorg-extension-dri \
            xserver-xorg-extension-dri2 \
meta-fri2/conf/machine/fri2-noemgd.conf +0 -1
index 089861f..d70e06f 100644
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
            xserver-xorg-extension-dri \
            xserver-xorg-extension-dri2 \
meta-fri2/conf/machine/fri2.conf +0 -1
index 6029cee..80fa43b 100644
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
            xserver-xorg-extension-dri \
            xserver-xorg-extension-dri2 \
meta-jasperforest/conf/machine/jasperforest.conf +0 -1
index 17468de..c668c64 100644
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
            xserver-xorg-extension-dri \
            xserver-xorg-extension-dri2 \
meta-n450/conf/machine/n450.conf +0 -1
index 431a6c5..b28f57f 100644
@@ -16,7 +16,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
            xserver-xorg-extension-dri \
            xserver-xorg-extension-dri2 \
meta-romley/conf/machine/romley.conf +0 -1
index 2dcb5db..3d41db5 100644
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
            xserver-xorg-extension-dri \
            xserver-xorg-extension-dri2 \
meta-sugarbay/conf/machine/sugarbay.conf +0 -1
index 3ea9ca3..0b4541f 100644
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
            xserver-xorg-extension-dri \
            xserver-xorg-extension-dri2 \
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 2/17 meta-intel: make meta-intel itself a layer

From: Tom Zanussi <[email protected]>

meta-intel contains a set of BSP layers, but is not itself a layer. Make it a layer to make it easy to share common intel-specific files between BSPs.

---
 conf/layer.conf |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 conf/layer.conf
conf/layer.conf new file +10 -0
new file mode 100644
index 0000000..a5db163
@@ -0,0 +1,10 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH := "${BBPATH}:${LAYERDIR}"
+
+# We have a packages directory, add to BBFILES
+BBFILES := "${BBFILES} ${LAYERDIR}/common/recipes-*/*/*.bb \
+            ${LAYERDIR}/common/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "intel"
+BBFILE_PATTERN_intel := "^${LAYERDIR}/"
+BBFILE_PRIORITY_intel = "5"
Signature · 1 line
1.7.0.4
#3 lore raw

PATCH 3/17 ia32-base.inc: new include file

In reply to [email protected]

From: Tom Zanussi <[email protected]>

The meta-intel BSPs currently have a number of machine settings common to all - factor these out into a common include file.

Also add several new intel-specific XSERVER variables for building XSERVER variables in BSPs.

---
 conf/machine/include/ia32-base.inc |   58 ++++++++++++++++++++++++++++++++++++
 1 files changed, 58 insertions(+), 0 deletions(-)
 create mode 100644 conf/machine/include/ia32-base.inc
conf/machine/include/ia32-base.inc new file +58 -0
new file mode 100644
index 0000000..5cf2f4f
@@ -0,0 +1,58 @@
+#
+# base machine settings for ia32-architecture BSPs
+#
+
+#
+# common settings for Intel-based machines
+#
+MACHINE_FEATURES += "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
+                     acpi serial usbgadget"
+
+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"
+GLIBC_EXTRA_OECONF += "--with-tls"
+
+#
+# kernel-related variables
+#
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.0%"
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
+
+#
+# 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-i965 \
+           "
+
+XSERVER_IA32_EMGD = "emgd-driver-bin"
+
+XSERVER_IA32_VESA = "xf86-video-vesa"
Signature · 1 line
1.7.0.4
#4 lore raw

PATCH 4/17 Have sugarbay.conf use the common ia32-base .inc file and remove the open-coded machine settings.

In reply to [email protected]

From: Tom Zanussi <[email protected]>

---
 meta-sugarbay/conf/machine/sugarbay.conf |   42 +++--------------------------
 1 files changed, 5 insertions(+), 37 deletions(-)
meta-sugarbay/conf/machine/sugarbay.conf +5 -37
index 0b4541f..25b3aad 100644
@@ -5,41 +5,9 @@
 # i.e. Sandy Bridge + Cougar Point
 
 require conf/machine/include/tune-x86_64.inc
+require conf/machine/include/ia32-base.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto = "3.0%"
-
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-XSERVER ?= "xserver-xorg \
-           xserver-xorg-extension-dri \
-           xserver-xorg-extension-dri2 \
-           xserver-xorg-extension-glx \
-           xserver-xorg-extension-extmod \
-           xserver-xorg-extension-dbe \
-           xserver-xorg-module-libint10 \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-input-synaptics \
-           xf86-video-intel \
-           mesa-dri \
-           mesa-dri-driver-i965"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz live"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
+XSERVER ?= "${XSERVER_IA32_BASE} \
+           ${XSERVER_IA32_EXT} \
+           ${XSERVER_IA32_I915} \
+           "
Signature · 1 line
1.7.0.4
#5 lore raw

PATCH 5/17 Have fishriver.conf use the common ia32-base .inc file and remove the open-coded machine settings.

In reply to [email protected]

From: Tom Zanussi <[email protected]>

---
 meta-fishriver/conf/machine/fishriver.conf |   41 +++------------------------
 1 files changed, 5 insertions(+), 36 deletions(-)
meta-fishriver/conf/machine/fishriver.conf +5 -36
index 8cc43f8..b43282e 100644
@@ -5,42 +5,11 @@
 # i.e. Z530/E660 + EG20T
 
 include conf/machine/include/tune-atom.inc
+require conf/machine/include/ia32-base.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.0%"
-
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-XSERVER ?= "xserver-xorg \
-           xserver-xorg-extension-dri \
-           xserver-xorg-extension-dri2 \
-           xserver-xorg-extension-glx \
-           xserver-xorg-extension-extmod \
-           xserver-xorg-extension-dbe \
-           xserver-xorg-module-libint10 \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-input-synaptics \
-           xf86-video-vesa"
-
-SERIAL_CONSOLE = "115200 ttyS0"
+XSERVER ?= "${XSERVER_IA32_BASE} \
+           ${XSERVER_IA32_EXT} \
+           ${XSERVER_IA32_VESA} \
+           "
 
 APPEND += "video=vesafb vga=0x318"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz live"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
-
Signature · 1 line
1.7.0.4
#6 lore raw

PATCH 6/17 Have crownbay.conf use the common ia32-base .inc file and remove the open-coded machine settings.

In reply to [email protected]

From: Tom Zanussi <[email protected]>

---
 meta-crownbay/conf/machine/crownbay.conf |   42 ++++-------------------------
 1 files changed, 6 insertions(+), 36 deletions(-)
meta-crownbay/conf/machine/crownbay.conf +6 -36
index 9315e82..a57cc1c 100644
@@ -5,45 +5,15 @@
 # i.e. E660 + EG20T
 
 include conf/machine/include/tune-atom.inc
+include conf/machine/include/ia32-base.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto = "3.0%"
-
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-XSERVER ?= "xserver-xorg \
-           xserver-xorg-extension-dri \
-           xserver-xorg-extension-dri2 \
-           xserver-xorg-extension-glx \
-           xserver-xorg-extension-extmod \
-           xserver-xorg-extension-dbe \
-           xserver-xorg-module-libint10 \
-           emgd-driver-bin \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-input-synaptics \
-           xf86-video-vesa"
+XSERVER ?= "${XSERVER_IA32_BASE} \
+           ${XSERVER_IA32_EXT} \
+           ${XSERVER_IA32_EMGD} \
+           "
 
 PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
+PREFERRED_VERSION_mesa-dri ?= "7.11"
 PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
-SERIAL_CONSOLE = "115200 ttyS0"
-
 APPEND += "video=vesafb vga=0x318"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz live"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
Signature · 1 line
1.7.0.4
#7 lore raw

PATCH 7/17 Have crownbay-noemgd.conf use the common ia32-base .inc file and remove the open-coded machine settings.

In reply to [email protected]

From: Tom Zanussi <[email protected]>

---
 meta-crownbay/conf/machine/crownbay-noemgd.conf |   42 +++--------------------
 1 files changed, 5 insertions(+), 37 deletions(-)
meta-crownbay/conf/machine/crownbay-noemgd.conf +5 -37
index aa9e732..80fc2a6 100644
@@ -5,43 +5,11 @@
 # i.e. E660 + EG20T
 
 include conf/machine/include/tune-atom.inc
+include conf/machine/include/ia32-base.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto = "3.0%"
-
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-XSERVER ?= "xserver-xorg \
-           xserver-xorg-extension-dri \
-           xserver-xorg-extension-dri2 \
-           xserver-xorg-extension-glx \
-           xserver-xorg-extension-extmod \
-           xserver-xorg-extension-dbe \
-           xserver-xorg-module-libint10 \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-input-synaptics \
-           xf86-video-vesa"
-
-PREFERRED_VERSION_xserver-xorg ?= "1.11.1"
-
-SERIAL_CONSOLE = "115200 ttyS0"
+XSERVER ?= "${XSERVER_IA32_BASE} \
+           ${XSERVER_IA32_EXT} \
+           ${XSERVER_IA32_VESA} \
+           "
 
 APPEND += "video=vesafb vga=0x318"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz live"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
Signature · 1 line
1.7.0.4
#8 lore raw

PATCH 8/17 Have fri2.conf use the common ia32-base .inc file and remove the open-coded machine settings.

In reply to [email protected]

From: Tom Zanussi <[email protected]>

---
 meta-fri2/conf/machine/fri2.conf |   42 ++++++-------------------------------
 1 files changed, 7 insertions(+), 35 deletions(-)
meta-fri2/conf/machine/fri2.conf +7 -35
index 80fa43b..15036a4 100644
@@ -5,45 +5,17 @@
 # i.e. E660 + EG20T
 
 include conf/machine/include/tune-atom.inc
+include conf/machine/include/ia32-base.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget wifi 3g"
+MACHINE_FEATURES += "wifi 3g"
 
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.0%"
-
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-XSERVER ?= "xserver-xorg \
-           xserver-xorg-extension-dri \
-           xserver-xorg-extension-dri2 \
-           xserver-xorg-extension-glx \
-           xserver-xorg-extension-extmod \
-           xserver-xorg-extension-dbe \
-           xserver-xorg-module-libint10 \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-input-synaptics \
-           emgd-driver-bin"
+XSERVER ?= "${XSERVER_IA32_BASE} \
+           ${XSERVER_IA32_EXT} \
+           ${XSERVER_IA32_EMGD} \
+           "
 
 PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
+PREFERRED_VERSION_mesa-dri ?= "7.11"
 PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
-SERIAL_CONSOLE = "115200 ttyS0"
-
 APPEND += "video=vesafb vga=0x318"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz live"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
-
Signature · 1 line
1.7.0.4
#9 lore raw

PATCH 9/17 Have fri2-noemgd.conf use the common ia32-base .inc file and remove the open-coded machine settings.

In reply to [email protected]

From: Tom Zanussi <[email protected]>

---
 meta-fri2/conf/machine/fri2-noemgd.conf |   42 ++++--------------------------
 1 files changed, 6 insertions(+), 36 deletions(-)
meta-fri2/conf/machine/fri2-noemgd.conf +6 -36
index d70e06f..1871cad 100644
@@ -5,43 +5,13 @@
 # i.e. E660 + EG20T
 
 include conf/machine/include/tune-atom.inc
+include conf/machine/include/ia32-base.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget wifi 3g"
+MACHINE_FEATURES += "wifi 3g"
 
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.0%"
-
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-XSERVER ?= "xserver-xorg \
-           xserver-xorg-extension-dri \
-           xserver-xorg-extension-dri2 \
-           xserver-xorg-extension-glx \
-           xserver-xorg-extension-extmod \
-           xserver-xorg-extension-dbe \
-           xserver-xorg-module-libint10 \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-input-synaptics \
-           xf86-video-vesa"
-
-PREFERRED_VERSION_xserver-xorg ?= "1.11.1"
-
-SERIAL_CONSOLE = "115200 ttyS0"
+XSERVER ?= "${XSERVER_IA32_BASE} \
+           ${XSERVER_IA32_EXT} \
+           ${XSERVER_IA32_VESA} \
+           "
 
 APPEND += "video=vesafb vga=0x318"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz live"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
Signature · 1 line
1.7.0.4
#10 lore raw

PATCH 10/17 Have jasperforest.conf use the common ia32-base .inc file and remove the open-coded machine settings.

In reply to [email protected]

From: Tom Zanussi <[email protected]>

---
 meta-jasperforest/conf/machine/jasperforest.conf |   41 +++-------------------
 1 files changed, 5 insertions(+), 36 deletions(-)
meta-jasperforest/conf/machine/jasperforest.conf +5 -36
index c668c64..9767010 100644
@@ -5,42 +5,11 @@
 # systems i.e. Xeon C5500/C3500 + Intel 3420 chipset (Ibex Peak)
 
 require conf/machine/include/tune-x86_64.inc
+require conf/machine/include/ia32-base.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.0%"
-
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-XSERVER ?= "xserver-xorg \
-           xserver-xorg-extension-dri \
-           xserver-xorg-extension-dri2 \
-           xserver-xorg-extension-glx \
-           xserver-xorg-extension-extmod \
-           xserver-xorg-extension-dbe \
-           xserver-xorg-module-libint10 \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-input-synaptics \
-           xf86-video-vesa"
-
-SERIAL_CONSOLE = "115200 ttyS0"
+XSERVER ?= "${XSERVER_IA32_BASE} \
+           ${XSERVER_IA32_EXT} \
+           ${XSERVER_IA32_VESA} \
+           "
 
 APPEND += "video=vesafb vga=0x318"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz live"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
-
Signature · 1 line
1.7.0.4
#11 lore raw

PATCH 11/17 Have n450.conf use the common ia32-base .inc file and remove the open-coded machine settings.

In reply to [email protected]

From: Tom Zanussi <[email protected]>

---
 meta-n450/conf/machine/n450.conf |   39 +++++--------------------------------
 1 files changed, 6 insertions(+), 33 deletions(-)
meta-n450/conf/machine/n450.conf +6 -33
index b28f57f..7210da8 100644
@@ -4,44 +4,17 @@
 #@DESCRIPTION: Machine configuration for Intel 1-N450 based systems
 
 include conf/machine/include/tune-atom.inc
+include conf/machine/include/ia32-base.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto = "3.0%"
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-XSERVER ?= "xserver-xorg \
-           xserver-xorg-extension-dri \
-           xserver-xorg-extension-dri2 \
-           xserver-xorg-extension-glx \
-           xserver-xorg-extension-extmod \
-           xserver-xorg-extension-dbe \
-           xserver-xorg-module-libint10 \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-input-synaptics \
-           xf86-video-intel \
-           mesa-dri-driver-i915"
+XSERVER ?= "${XSERVER_IA32_BASE} \
+           ${XSERVER_IA32_EXT} \
+           ${XSERVER_IA32_I915} \
+           "
 
 SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0" 
 APPEND += "console=ttyS0,115200 console=tty0" 
 
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts n450-audio"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz live"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
+MACHINE_EXTRA_RRECOMMENDS += "n450-audio"
 
 ROOTLESS_X = "1"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
-
Signature · 1 line
1.7.0.4
#12 lore raw

PATCH 12/17 Have romley.conf use the common ia32-base .inc file and remove the open-coded machine settings.

In reply to [email protected]

From: Tom Zanussi <[email protected]>

---
 meta-romley/conf/machine/romley.conf |   39 +++------------------------------
 1 files changed, 4 insertions(+), 35 deletions(-)
meta-romley/conf/machine/romley.conf +4 -35
index 3d41db5..7b6014c 100644
@@ -5,41 +5,10 @@
 # i.e. Sandy Bridge + Patsburg Chipset
 
 require conf/machine/include/tune-x86_64.inc
+include conf/machine/include/ia32-base.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto = "3.0%"
-
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-XSERVER ?= "xserver-xorg \
-           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 ?= "${XSERVER_IA32_BASE} \
+           ${XSERVER_IA32_EXT} \
            xserver-xorg-module-xaa \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-input-synaptics \
 	   xf86-video-mga \
-           mesa-dri"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz live"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
+           "
Signature · 1 line
1.7.0.4
#13 lore raw

PATCH 13/17 Have emenlow.conf use the common ia32-base .inc file and remove the open-coded machine settings.

In reply to [email protected]

From: Tom Zanussi <[email protected]>

---
 meta-emenlow/conf/machine/emenlow.conf |   23 ++---------------------
 1 files changed, 2 insertions(+), 21 deletions(-)
meta-emenlow/conf/machine/emenlow.conf +2 -21
index 06cba37..5a14b26 100644
@@ -5,21 +5,14 @@
 # Webs-2120 box.
 
 include conf/machine/include/tune-atom.inc
+include conf/machine/include/ia32-base.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.0%"
-
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo"
 PREFERRED_PROVIDER_drm = "libdrm-poulsbo"
 PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-psb"
+PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb"
 PREFERRED_PROVIDER_mesa-dri = "xpsb-glx"
 XSERVER ?= "xserver-psb \
            xserver-psb-extension-dri \
@@ -32,16 +25,4 @@ XSERVER ?= "xserver-psb \
            xf86-input-keyboard \
            xf86-input-evdev"
 
-SERIAL_CONSOLE = "115200 ttyS0"
-
 APPEND += "video=vesafb vga=0x318"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz live"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
-
Signature · 1 line
1.7.0.4
#14 lore raw

PATCH 14/17 meta-intel: update READMEs with new layer info

In reply to [email protected]

From: Tom Zanussi <[email protected]>

The affected BSPs now need to access common metadata in locations off of the top level of meta-intel, so need to add meta-intel itself to their layer configuration. This updates the READMEs for those BSPs to mention that.

---
 meta-crownbay/README     |    4 +++-
 meta-emenlow/README      |    4 +++-
 meta-fishriver/README    |    4 +++-
 meta-fri2/README         |    5 ++++-
 meta-jasperforest/README |    8 +++++---
 meta-romley/README       |    4 +++-
 meta-sugarbay/README     |    4 +++-
 7 files changed, 24 insertions(+), 9 deletions(-)
meta-crownbay/README +3 -1
index de9f1f1..7d96bc2 100644
@@ -26,8 +26,10 @@ Package (BSP) Downloads' page of the Yocto Project website.
 Having done that, and assuming you extracted the BSP tarball contents
 at the top-level of your yocto build tree, you can build a crownbay
 image by adding the location of the meta-crownbay layer to
-bblayers.conf e.g.:
+bblayers.conf, along with the meta-intel layer itself (to access
+common metadata shared between BSPs) e.g.:
 
+  yocto/meta-intel \
   yocto/meta-intel/meta-crownbay \
 
 The meta-crownbay layer contains support for two different machine
meta-emenlow/README +3 -1
index fc3317e..d802bfb 100644
@@ -30,8 +30,10 @@ Package (BSP) Downloads' page of the Yocto Project website.
 Having done that, and assuming you extracted the BSP tarball contents
 at the top-level of your yocto build tree, you can build an emenlow
 image by adding the location of the meta-emenlow layer to
-bblayers.conf e.g.:
+bblayers.conf, along with the meta-intel layer itself (to access
+common metadata shared between BSPs) e.g.:
 
+  yocto/meta-intel \
   yocto/meta-intel/meta-emenlow \
 
 To enable the emenlow layer, add the emenlow MACHINE to local.conf:
meta-fishriver/README +3 -1
index b76056c..6425432 100644
@@ -20,8 +20,10 @@ Package (BSP) Downloads' page of the Yocto Project website.
 Having done that, and assuming you extracted the BSP tarball contents
 at the top-level of your yocto build tree, you can build a fishriver
 image by adding the location of the meta-fishriver layer to
-bblayers.conf e.g.:
+bblayers.conf, along with the meta-intel layer itself (to access
+common metadata shared between BSPs) e.g.:
 
+  yocto/meta-intel \
   yocto/meta-intel/meta-fishriver \
 
 To enable the fishriver layer, add the fishriver MACHINE to local.conf:
meta-fri2/README +4 -1
index 4dc135b..12b0b37 100644
@@ -28,8 +28,11 @@ Package (BSP) Downloads' page of the Yocto Project website.
 
 Having done that, and assuming you extracted the BSP tarball contents
 at the top-level of your yocto build tree, you can build an fri2 image
-by adding the location of the meta-fri2 layer to bblayers.conf e.g.:
+by adding the location of the meta-fri2 layer to bblayers.conf, along
+with the meta-intel layer itself (to access common metadata shared
+between BSPs) e.g.:
 
+  yocto/meta-intel \
   yocto/meta-intel/meta-fri2 \
 
 The meta-fri2 layer contains support for two different machine
meta-jasperforest/README +5 -3
index 7652da0..a464a11 100644
@@ -23,10 +23,12 @@ need to download the corresponding BSP tarball from the 'Board Support
 Package (BSP) Downloads' page of the Yocto Project website.
 
 Having done that, and assuming you extracted the BSP tarball contents
-at the top-level of your yocto build tree, you can build a jasperforest
-image by adding the location of the meta-jasperforest layer to
-bblayers.conf e.g.:
+at the top-level of your yocto build tree, you can build a
+jasperforest image by adding the location of the meta-jasperforest
+layer to bblayers.conf, along with the meta-intel layer itself (to
+access common metadata shared between BSPs) e.g.:
 
+  yocto/meta-intel \
   yocto/meta-intel/meta-jasperforest \
 
 To enable the jasperforest layer, add the jasperforest MACHINE to local.conf:
meta-romley/README +3 -1
index d242534..6c13ea6 100644
@@ -22,8 +22,10 @@ Package (BSP) Downloads' page of the Yocto Project website.
 Having done that, and assuming you extracted the BSP tarball contents
 at the top-level of your yocto build tree, you can build a romley
 image by adding the location of the meta-romley layer to
-bblayers.conf e.g.:
+bblayers.conf, along with the meta-intel layer itself (to access
+common metadata shared between BSPs) e.g.:
 
+  yocto/meta-intel \
   yocto/meta-intel/meta-romley \
 
 To enable the romley layer, add the romley MACHINE to local.conf:
meta-sugarbay/README +3 -1
index 2d72f8a..72b1faf 100644
@@ -23,8 +23,10 @@ Package (BSP) Downloads' page of the Yocto Project website.
 Having done that, and assuming you extracted the BSP tarball contents
 at the top-level of your yocto build tree, you can build a sugarbay
 image by adding the location of the meta-sugarbay layer to
-bblayers.conf e.g.:
+bblayers.conf, along with the meta-intel layer itself (to access
+common metadata shared between BSPs) e.g.:
 
+  yocto/meta-intel \
   yocto/meta-intel/meta-sugarbay \
 
 To enable the sugarbay layer, add the sugarbay MACHINE to local.conf:
Signature · 1 line
1.7.0.4
#15 lore raw

PATCH 15/17 meta-crownbay: remove common from BBFILES

In reply to [email protected]

From: Tom Zanussi <[email protected]>

metadata in /common is now pulled in by the meta-intel layer, so remove it here.

---
 meta-crownbay/conf/layer.conf |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
meta-crownbay/conf/layer.conf +1 -3
index 9b71700..52581e1 100644
@@ -3,9 +3,7 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES
 BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend \
-	${LAYERDIR}/../common/recipes-graphics/*/*.bb \
-	${LAYERDIR}/../common/recipes-graphics/*/*.bbappend"
+	${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "crownbay"
 BBFILE_PATTERN_crownbay := "^${LAYERDIR}/"
Signature · 1 line
1.7.0.4
#16 lore raw

PATCH 16/17 meta-fri2: remove common from BBFILES

In reply to [email protected]

From: Tom Zanussi <[email protected]>

metadata in /common is now pulled in by the meta-intel layer, so remove it here.

---
 meta-fri2/conf/layer.conf |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
meta-fri2/conf/layer.conf +1 -3
index 261cccc..b30e776 100644
@@ -3,9 +3,7 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES
 BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend \
-	${LAYERDIR}/../common/recipes-graphics/*/*.bb \
-	${LAYERDIR}/../common/recipes-graphics/*/*.bbappend"
+	${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "fri2"
 BBFILE_PATTERN_fri2 := "^${LAYERDIR}/"
Signature · 1 line
1.7.0.4
#17 lore raw

PATCH 17/17 meta-intel: update READMEs with layer dependency list

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Add a new 'Dependencies' section listing all the layer dependencies for each BSP.

---
 meta-crownbay/README     |   18 ++++++++++++++++++
 meta-emenlow/README      |   17 +++++++++++++++++
 meta-fishriver/README    |   17 +++++++++++++++++
 meta-fri2/README         |   17 +++++++++++++++++
 meta-jasperforest/README |   17 +++++++++++++++++
 meta-n450/ReleaseNotes   |    4 ++++
 meta-romley/README       |   18 ++++++++++++++++++
 meta-sugarbay/README     |   18 ++++++++++++++++++
 8 files changed, 126 insertions(+), 0 deletions(-)
meta-crownbay/README +18 -0
index 7d96bc2..c0e8119 100644
@@ -8,6 +8,24 @@ plus the Intel EG20T Platform Controller Hub (Tunnel Creek + Topcliff).
 It also supports the E6xx embedded on-chip graphics via the Intel
 Embedded Media and Graphics Driver (EMGD) 1.8 Driver.
 
+
+Dependencies
+============
+
+This layer depends on:
+
+  URI: git://git.openembedded.org/bitbake
+  branch: master
+
+  URI: git://git.openembedded.org/openembedded-core
+  layers: meta
+  branch: master
+
+  URI: git://git.yoctoproject.org/meta-intel
+  layers: intel
+  branch: master
+
+
 Table of Contents
 =================
 
meta-emenlow/README +17 -0
index d802bfb..53c0528 100644
@@ -13,6 +13,23 @@ depending on which BSP tarball you downloaded.
 Please see the corresponding sections below for details.
 
 
+Dependencies
+============
+
+This layer depends on:
+
+  URI: git://git.openembedded.org/bitbake
+  branch: master
+
+  URI: git://git.openembedded.org/openembedded-core
+  layers: meta
+  branch: master
+
+  URI: git://git.yoctoproject.org/meta-intel
+  layers: intel
+  branch: master
+
+
 Table of Contents
 =================
 
meta-fishriver/README +17 -0
index 6425432..77262de 100644
@@ -3,6 +3,23 @@ BSP layer, and booting the images contained in the /binary directory.
 Please see the corresponding sections below for details.
 
 
+Dependencies
+============
+
+This layer depends on:
+
+  URI: git://git.openembedded.org/bitbake
+  branch: master
+
+  URI: git://git.openembedded.org/openembedded-core
+  layers: meta
+  branch: master
+
+  URI: git://git.yoctoproject.org/meta-intel
+  layers: intel
+  branch: master
+
+
 Table of Contents
 =================
 
meta-fri2/README +17 -0
index 12b0b37..d337b2a 100644
@@ -11,6 +11,23 @@ It also supports the E6xx embedded on-chip graphics via the Intel
 Embedded Media and Graphics Driver (EMGD) 1.8 Driver.
 
 
+Dependencies
+============
+
+This layer depends on:
+
+  URI: git://git.openembedded.org/bitbake
+  branch: master
+
+  URI: git://git.openembedded.org/openembedded-core
+  layers: meta
+  branch: master
+
+  URI: git://git.yoctoproject.org/meta-intel
+  layers: intel
+  branch: master
+
+
 Table of Contents
 =================
 
meta-jasperforest/README +17 -0
index a464a11..6af4b37 100644
@@ -8,6 +8,23 @@ combined with the Intel 3420 PCH chipset (Ibex Peak) make up the
 'Picket Post' CRB this BSP was developed on.
 
 
+Dependencies
+============
+
+This layer depends on:
+
+  URI: git://git.openembedded.org/bitbake
+  branch: master
+
+  URI: git://git.openembedded.org/openembedded-core
+  layers: meta
+  branch: master
+
+  URI: git://git.yoctoproject.org/meta-intel
+  layers: intel
+  branch: master
+
+
 Table of Contents
 =================
 
meta-n450/ReleaseNotes +4 -0
index 5eb1225..2d08f1c 100644
@@ -16,6 +16,10 @@ This layer depends on:
   layers: meta
   branch: master
 
+  URI: git://git.yoctoproject.org/meta-intel
+  layers: intel
+  branch: master
+
   URI: git://git.yoctoproject.org/poky
   layers: meta-yocto
   branch: master
meta-romley/README +18 -0
index 6c13ea6..a6be1d5 100644
@@ -5,6 +5,24 @@ Please see the corresponding sections below for details.
 The 'romley' platform consists of the Intel Sandy Bridge processor,
 plus the Patsburg chipset.  This BSP assumes Matrox graphics is being used.
 
+
+Dependencies
+============
+
+This layer depends on:
+
+  URI: git://git.openembedded.org/bitbake
+  branch: master
+
+  URI: git://git.openembedded.org/openembedded-core
+  layers: meta
+  branch: master
+
+  URI: git://git.yoctoproject.org/meta-intel
+  layers: intel
+  branch: master
+
+
 Table of Contents
 =================
 
meta-sugarbay/README +18 -0
index 72b1faf..d198f61 100644
@@ -6,6 +6,24 @@ The 'Sugar Bay' platform consists of the Intel Sandy Bridge processor,
 plus the Cougar Point PCH (Q67 Express or B65 Express chipsets).  This
 BSP assumes that the Sandy Bridge integrated graphics are being used.
 
+
+Dependencies
+============
+
+This layer depends on:
+
+  URI: git://git.openembedded.org/bitbake
+  branch: master
+
+  URI: git://git.openembedded.org/openembedded-core
+  layers: meta
+  branch: master
+
+  URI: git://git.yoctoproject.org/meta-intel
+  layers: intel
+  branch: master
+
+
 Table of Contents
 =================
 
Signature · 1 line
1.7.0.4