meta-intel: improve interactions with common layer

PATCH In review Paul Eggleton 2 participants 4 messages Feb 24, 2012 – Feb 25, 2012

Share & tools

Paul Eggleton

author

2012-02-24 09:39 UTC #0 lore raw

cover meta-intel: improve interactions with common layer

At the moment it is possible to enable one of the sub-layers of meta-intel (e.g. meta-n450) without also enabling the meta-intel common layer, which can lead to some nasty parsing errors. Here are two patches to handle this situation in a nicer way.

(Note that BitBake currently does not actually terminate when LAYERDEPENDS are not satisfied - I've got a patch queued to fix this.)

The following changes since commit 1ca68394faf33416f2aabee27323da7510ad6609:

netbase: put sys940x specific interfaces file in MACHINE directory (2012-02-10 17:27:27 -0800)

are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contrib paule/layerdepends
http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=paule/layerdepends

Paul Eggleton (2):
meta-intel: replace "include" with "require"
meta-intel: add LAYERDEPENDS for layers needing the meta-intel common
layer

 meta-cedartrail/conf/layer.conf                 |    2 ++
 meta-cedartrail/conf/machine/cedartrail.conf    |    2 +-
 meta-crownbay/conf/layer.conf                   |    2 ++
 meta-crownbay/conf/machine/crownbay-noemgd.conf |    4 ++--
 meta-crownbay/conf/machine/crownbay.conf        |    4 ++--
 meta-emenlow/conf/layer.conf                    |    2 ++
 meta-emenlow/conf/machine/emenlow.conf          |    4 ++--
 meta-fishriver/conf/layer.conf                  |    2 ++
 meta-fishriver/conf/machine/fishriver.conf      |    2 +-
 meta-fri2/conf/layer.conf                       |    2 ++
 meta-fri2/conf/machine/fri2-noemgd.conf         |    4 ++--
 meta-fri2/conf/machine/fri2.conf                |    4 ++--
 meta-jasperforest/conf/layer.conf               |    2 ++
 meta-n450/conf/layer.conf                       |    2 ++
 meta-n450/conf/machine/n450.conf                |    4 ++--
 meta-romley/conf/layer.conf                     |    2 ++
 meta-romley/conf/machine/romley.conf            |    2 +-
 meta-sugarbay/conf/layer.conf                   |    2 ++
 meta-sys940x/conf/layer.conf                    |    2 ++
 meta-sys940x/conf/machine/sys940x-noemgd.conf   |    4 ++--
 meta-sys940x/conf/machine/sys940x.conf          |    4 ++--
 21 files changed, 39 insertions(+), 19 deletions(-)

Signature · 1 line

1.7.5.4

Paul Eggleton

author

2012-02-24 09:39 UTC #1 lore raw

PATCH 1/2 meta-intel: replace "include" with "require"

We want a failure to occur if the files specified in these statements can't be found (e.g. when there is a misconfiguration), so use require instead of include.

Signed-off-by Paul Eggleton <[email protected]>

---
 meta-cedartrail/conf/machine/cedartrail.conf    |    2 +-
 meta-crownbay/conf/machine/crownbay-noemgd.conf |    4 ++--
 meta-crownbay/conf/machine/crownbay.conf        |    4 ++--
 meta-emenlow/conf/machine/emenlow.conf          |    4 ++--
 meta-fishriver/conf/machine/fishriver.conf      |    2 +-
 meta-fri2/conf/machine/fri2-noemgd.conf         |    4 ++--
 meta-fri2/conf/machine/fri2.conf                |    4 ++--
 meta-n450/conf/machine/n450.conf                |    4 ++--
 meta-romley/conf/machine/romley.conf            |    2 +-
 meta-sys940x/conf/machine/sys940x-noemgd.conf   |    4 ++--
 meta-sys940x/conf/machine/sys940x.conf          |    4 ++--
 11 files changed, 19 insertions(+), 19 deletions(-)

meta-cedartrail/conf/machine/cedartrail.conf +1 -1

index ec84347..3bd5cf8 100644
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for Cedartrail systems
 # i.e. Cedarview processor + Tiger Point Chipset
 
-include conf/machine/include/tune-atom.inc
+require conf/machine/include/tune-atom.inc
 require conf/machine/include/ia32-base.inc
 
 XSERVER ?= "${XSERVER_IA32_BASE} \

meta-crownbay/conf/machine/crownbay-noemgd.conf +2 -2

index 80fc2a6..2c80bd8 100644
@@ -4,8 +4,8 @@
 #@DESCRIPTION: Machine configuration for Crown Bay systems, without Intel-proprietary graphics bits
 # i.e. E660 + EG20T
 
-include conf/machine/include/tune-atom.inc
-include conf/machine/include/ia32-base.inc
+require conf/machine/include/tune-atom.inc
+require conf/machine/include/ia32-base.inc
 
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \

meta-crownbay/conf/machine/crownbay.conf +2 -2

index 15bfd52..2c1ef3d 100644
@@ -4,8 +4,8 @@
 #@DESCRIPTION: Machine configuration for Crown Bay systems
 # i.e. E660 + EG20T
 
-include conf/machine/include/tune-atom.inc
-include conf/machine/include/ia32-base.inc
+require conf/machine/include/tune-atom.inc
+require conf/machine/include/ia32-base.inc
 
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \

meta-emenlow/conf/machine/emenlow.conf +2 -2

index cf43d4f..78020ba 100644
@@ -4,8 +4,8 @@
 #@DESCRIPTION: Machine configuration for eMenlow based systems, like the
 # Webs-2120 box.
 
-include conf/machine/include/tune-atom.inc
-include conf/machine/include/ia32-base.inc
+require conf/machine/include/tune-atom.inc
+require conf/machine/include/ia32-base.inc
 
 PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo"
 PREFERRED_PROVIDER_drm = "libdrm-poulsbo"

meta-fishriver/conf/machine/fishriver.conf +1 -1

index b43282e..aa066db 100644
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for Fish River Island systems
 # i.e. Z530/E660 + EG20T
 
-include conf/machine/include/tune-atom.inc
+require conf/machine/include/tune-atom.inc
 require conf/machine/include/ia32-base.inc
 
 XSERVER ?= "${XSERVER_IA32_BASE} \

meta-fri2/conf/machine/fri2-noemgd.conf +2 -2

index 911a449..a0eb8a0 100644
@@ -4,8 +4,8 @@
 #@DESCRIPTION: Machine configuration for Fish River Island II systems
 # i.e. E660 + EG20T
 
-include conf/machine/include/tune-atom.inc
-include conf/machine/include/ia32-base.inc
+require conf/machine/include/tune-atom.inc
+require conf/machine/include/ia32-base.inc
 
 MACHINE_FEATURES += "wifi 3g pcbios efi"
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"

meta-fri2/conf/machine/fri2.conf +2 -2

index c69aa40..3947736 100644
@@ -4,8 +4,8 @@
 #@DESCRIPTION: Machine configuration for Fish River Island II systems
 # i.e. E660 + EG20T
 
-include conf/machine/include/tune-atom.inc
-include conf/machine/include/ia32-base.inc
+require conf/machine/include/tune-atom.inc
+require conf/machine/include/ia32-base.inc
 
 MACHINE_FEATURES += "wifi 3g pcbios efi"
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"

meta-n450/conf/machine/n450.conf +2 -2

index 6ffdce9..dac63ed 100644
@@ -3,8 +3,8 @@
 
 #@DESCRIPTION: Machine configuration for Intel 1-N450 based systems
 
-include conf/machine/include/tune-atom.inc
-include conf/machine/include/ia32-base.inc
+require conf/machine/include/tune-atom.inc
+require conf/machine/include/ia32-base.inc
 
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \

meta-romley/conf/machine/romley.conf +1 -1

index 7b6014c..aa334c0 100644
@@ -5,7 +5,7 @@
 # i.e. Sandy Bridge + Patsburg Chipset
 
 require conf/machine/include/tune-x86_64.inc
-include conf/machine/include/ia32-base.inc
+require conf/machine/include/ia32-base.inc
 
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \

meta-sys940x/conf/machine/sys940x-noemgd.conf +2 -2

index 8a1c20f..537e419 100644
@@ -4,8 +4,8 @@
 #@DESCRIPTION: Machine configuration for Inforce SYS940X systems
 # i.e. E660 + EG20T
 
-include conf/machine/include/tune-atom.inc
-include conf/machine/include/ia32-base.inc
+require conf/machine/include/tune-atom.inc
+require conf/machine/include/ia32-base.inc
 
 # Add "pcbios" if you have a non-efi version of the firmware
 MACHINE_FEATURES += "efi pcbios"

meta-sys940x/conf/machine/sys940x.conf +2 -2

index ceb6e0f..2315564 100644
@@ -4,8 +4,8 @@
 #@DESCRIPTION: Machine configuration for Inforce SYS940x systems
 # i.e. E660 + EG20T
 
-include conf/machine/include/tune-atom.inc
-include conf/machine/include/ia32-base.inc
+require conf/machine/include/tune-atom.inc
+require conf/machine/include/ia32-base.inc
 
 # Add "pcbios" if you have a non-efi version of the firmware
 MACHINE_FEATURES += "efi pcbios"

Signature · 1 line

1.7.5.4

Paul Eggleton

author

2012-02-24 09:39 UTC #2 lore raw

PATCH 2/2 meta-intel: add LAYERDEPENDS for layers needing the meta-intel common layer

In reply to Paul Eggleton

These layers all contain machine configuration that depends on having the meta-intel common layer enabled as well, so use LAYERDEPENDS in the layer configuration for each one to make this explicit.

Signed-off-by Paul Eggleton <[email protected]>

---
 meta-cedartrail/conf/layer.conf   |    2 ++
 meta-crownbay/conf/layer.conf     |    2 ++
 meta-emenlow/conf/layer.conf      |    2 ++
 meta-fishriver/conf/layer.conf    |    2 ++
 meta-fri2/conf/layer.conf         |    2 ++
 meta-jasperforest/conf/layer.conf |    2 ++
 meta-n450/conf/layer.conf         |    2 ++
 meta-romley/conf/layer.conf       |    2 ++
 meta-sugarbay/conf/layer.conf     |    2 ++
 meta-sys940x/conf/layer.conf      |    2 ++
 10 files changed, 20 insertions(+), 0 deletions(-)

meta-cedartrail/conf/layer.conf +2 -0

index cb4142d..c19c4c1 100644
@@ -8,3 +8,5 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "cedartrail"
 BBFILE_PATTERN_cedartrail := "^${LAYERDIR}/"
 BBFILE_PRIORITY_cedartrail = "6"
+
+LAYERDEPENDS_cedartrail = "intel"

meta-crownbay/conf/layer.conf +2 -0

index 52581e1..cb17298 100644
@@ -8,3 +8,5 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "crownbay"
 BBFILE_PATTERN_crownbay := "^${LAYERDIR}/"
 BBFILE_PRIORITY_crownbay = "6"
+
+LAYERDEPENDS_crownbay = "intel"

meta-emenlow/conf/layer.conf +2 -0

index 563b9c8..dda80c0 100644
@@ -8,3 +8,5 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "emenlow"
 BBFILE_PATTERN_emenlow := "^${LAYERDIR}/"
 BBFILE_PRIORITY_emenlow = "6"
+
+LAYERDEPENDS_emenlow = "intel"

meta-fishriver/conf/layer.conf +2 -0

index 9162b5e..61e292b 100644
@@ -8,3 +8,5 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "fishriver"
 BBFILE_PATTERN_fishriver := "^${LAYERDIR}/"
 BBFILE_PRIORITY_fishriver = "6"
+
+LAYERDEPENDS_fishriver = "intel"

meta-fri2/conf/layer.conf +2 -0

index b30e776..4d140f9 100644
@@ -8,3 +8,5 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "fri2"
 BBFILE_PATTERN_fri2 := "^${LAYERDIR}/"
 BBFILE_PRIORITY_fri2 = "6"
+
+LAYERDEPENDS_fri2 = "intel"

meta-jasperforest/conf/layer.conf +2 -0

index bfd7fc3..09f1647 100644
@@ -8,3 +8,5 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "jasperforest"
 BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/"
 BBFILE_PRIORITY_jasperforest = "6"
+
+LAYERDEPENDS_jasperforest = "intel"

meta-n450/conf/layer.conf +2 -0

index f9cc7fe..2c905c2 100644
@@ -8,3 +8,5 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "n450"
 BBFILE_PATTERN_n450 = "^${LAYERDIR}/"
 BBFILE_PRIORITY_n450 = "6"
+
+LAYERDEPENDS_n450 = "intel"

meta-romley/conf/layer.conf +2 -0

index c5eeaab..8ce1a4d 100644
@@ -8,3 +8,5 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "romley"
 BBFILE_PATTERN_romley := "^${LAYERDIR}/"
 BBFILE_PRIORITY_romley = "6"
+
+LAYERDEPENDS_romley = "intel"

meta-sugarbay/conf/layer.conf +2 -0

index 05ef1cd..eb8ec45 100644
@@ -8,3 +8,5 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "sugarbay"
 BBFILE_PATTERN_sugarbay := "^${LAYERDIR}/"
 BBFILE_PRIORITY_sugarbay = "6"
+
+LAYERDEPENDS_sugarbay = "intel"

meta-sys940x/conf/layer.conf +2 -0

index 459c710..5d588ad 100644
@@ -8,3 +8,5 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "sys940x"
 BBFILE_PATTERN_sys940x := "^${LAYERDIR}/"
 BBFILE_PRIORITY_sys940x = "6"
+
+LAYERDEPENDS_sys940x = "intel"

Signature · 1 line

1.7.5.4

Tom Zanussi

2012-02-25 16:28 UTC #3 lore raw

In reply to Paul Eggleton

Quoted 8 lines · Paul Eggleton

At the moment it is possible to enable one of the sub-layers of meta-intel (e.g. meta-n450) without also enabling the meta-intel common layer, which can lead to some nasty parsing errors. Here are two patches to handle this situation in a nicer way.
(Note that BitBake currently does not actually terminate when LAYERDEPENDS are not satisfied - I've got a patch queued to fix this.)

Quoted 8 lines

The following changes since commit 1ca68394faf33416f2aabee27323da7510ad6609:
netbase: put sys940x specific interfaces file in MACHINE directory (2012-02-10 17:27:27 -0800)
are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contrib paule/layerdepends
http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=paule/layerdepends

Pulled into meta-intel/master. Thanks, Paul!

Tom

Quoted 28 lines

Paul Eggleton (2):
meta-intel: replace "include" with "require"
meta-intel: add LAYERDEPENDS for layers needing the meta-intel common
layer

 meta-cedartrail/conf/layer.conf                 |    2 ++
 meta-cedartrail/conf/machine/cedartrail.conf    |    2 +-
 meta-crownbay/conf/layer.conf                   |    2 ++
 meta-crownbay/conf/machine/crownbay-noemgd.conf |    4 ++--
 meta-crownbay/conf/machine/crownbay.conf        |    4 ++--
 meta-emenlow/conf/layer.conf                    |    2 ++
 meta-emenlow/conf/machine/emenlow.conf          |    4 ++--
 meta-fishriver/conf/layer.conf                  |    2 ++
 meta-fishriver/conf/machine/fishriver.conf      |    2 +-
 meta-fri2/conf/layer.conf                       |    2 ++
 meta-fri2/conf/machine/fri2-noemgd.conf         |    4 ++--
 meta-fri2/conf/machine/fri2.conf                |    4 ++--
 meta-jasperforest/conf/layer.conf               |    2 ++
 meta-n450/conf/layer.conf                       |    2 ++
 meta-n450/conf/machine/n450.conf                |    4 ++--
 meta-romley/conf/layer.conf                     |    2 ++
 meta-romley/conf/machine/romley.conf            |    2 +-
 meta-sugarbay/conf/layer.conf                   |    2 ++
 meta-sys940x/conf/layer.conf                    |    2 ++
 meta-sys940x/conf/machine/sys940x-noemgd.conf   |    4 ++--
 meta-sys940x/conf/machine/sys940x.conf          |    4 ++--
 21 files changed, 39 insertions(+), 19 deletions(-)