[meta-raspberrypi][PATCH 0/1] layer.conf: set layer depends

[meta-raspberrypi][PATCH 0/1] layer.conf: set layer depends

[Petter Mabäcker]

The following changes since commit b99a09b25757ea2afe15fcf31323420edca1137d:

  Merge "devicetree: Add support for DT overlays with RPi bootloader" (2015-02-07 22:14:22 +0100)

are available in the git repository at:


  git://git.yoctoproject.org/poky-contrib petmab/rpi_redmine_46
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/rpi_redmine_46

Petter Mabäcker (1):
  layer.conf: set layer depends

 README          | 4 ++++
 conf/layer.conf | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

-- 
1.9.1

[meta-raspberrypi][PATCH 1/1] layer.conf: set layer depends

[Petter Mabäcker]

Ensure that build fails in a informative way if not all layer
requirements are fulfilled.

To disable strict layer depend set 'LAYERDEPENDS_raspberrypi = ""'
in local.conf.

Also set a high layer prio to ensure that meta-raspberrypi addons
are always prioritized above the depended layers.

[Feature #46]

Change-Id: I8df772a59975ae379c3a1e93e2770e83be752bfd
Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 README          | 4 ++++
 conf/layer.conf | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/README b/README
index bb2f4be..3dad1ea 100644
--- a/README
+++ b/README
@@ -143,6 +143,10 @@ See: http://wayland.freedesktop.org/raspberrypi.html
 
 2.H. Images
 ===========
+Note: 'rpi-hwup-image' and 'rpi-basic-image' can be build without
+      meta-multimedia. Set 'LAYERDEPENDS_raspberrypi = ""' in local.conf
+      to enable build without 'meta-multimedia'.
+
 * rpi-hwup-image
     Hardware up image
 * rpi-basic-image
diff --git a/conf/layer.conf b/conf/layer.conf
index 7bffd4b..b5ab695 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -7,7 +7,8 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
 
 BBFILE_COLLECTIONS += "raspberrypi"
 BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/"
-BBFILE_PRIORITY_raspberrypi = "6"
+BBFILE_PRIORITY_raspberrypi = "9"
+LAYERDEPENDS_raspberrypi = "multimedia-layer"
 
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
-- 
1.9.1

Re: [meta-raspberrypi][PATCH 1/1] layer.conf: set layer depends

[Petter Mabäcker]

[-- Attachment #1: Type: text/plain, Size: 2041 bytes --]

 

After discussions with meta-raspberrypi maintainers we have come to
the conclusion that we will not set any layer depends. We shouldn't
break most of the builds which don't use the test image and therefore
don't need the multimedia layer. So will instead break out the 'layer
prio' part and send out in a separate review. 

/Petter 

2015-02-10
23:39 skrev Petter Mabäcker: 

> Ensure that build fails in a
informative way if not all layer
> requirements are fulfilled.
> 
> To
disable strict layer depend set 'LAYERDEPENDS_raspberrypi = ""'
> in
local.conf.
> 
> Also set a high layer prio to ensure that
meta-raspberrypi addons
> are always prioritized above the depended
layers.
> 
> [Feature #46]
> 
> Change-Id:
I8df772a59975ae379c3a1e93e2770e83be752bfd
> Signed-off-by: Petter
Mabäcker <petter@technux.se>
> ---
> README | 4 ++++
> conf/layer.conf |
3 ++-
> 2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git
a/README b/README
> index bb2f4be..3dad1ea 100644
> --- a/README
> +++
b/README
> @@ -143,6 +143,10 @@ See:
http://wayland.freedesktop.org/raspberrypi.html [1]
> 
> 2.H. Images
>
===========
> +Note: 'rpi-hwup-image' and 'rpi-basic-image' can be build
without
> + meta-multimedia. Set 'LAYERDEPENDS_raspberrypi = ""' in
local.conf
> + to enable build without 'meta-multimedia'.
> +
> *
rpi-hwup-image
> Hardware up image
> * rpi-basic-image
> diff --git
a/conf/layer.conf b/conf/layer.conf
> index 7bffd4b..b5ab695 100644
>
--- a/conf/layer.conf
> +++ b/conf/layer.conf
> @@ -7,7 +7,8 @@ BBFILES
+= "${LAYERDIR}/recipes*/*/*.bb 
> 
> BBFILE_COLLECTIONS +=
"raspberrypi"
> BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/"
>
-BBFILE_PRIORITY_raspberrypi = "6"
> +BBFILE_PRIORITY_raspberrypi =
"9"
> +LAYERDEPENDS_raspberrypi = "multimedia-layer"
> 
> # Additional
license directories.
> LICENSE_PATH +=
"${LAYERDIR}/files/custom-licenses"
> -- 
> 1.9.1
 

Links:
------
[1]
http://wayland.freedesktop.org/raspberrypi.html

[-- Attachment #2: Type: text/html, Size: 2368 bytes --]