From b43165328658087277b667152fdbc04fe07cba08 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Tue, 15 May 2018 14:46:21 +0200 Subject: 3rd part of the layer/profile rework [1/2] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the last larger commit in this series and deals with the graphical part. We introduce the graphical profiles: - meta-agl-profile-graphical -- meta-agl-profile-graphical-html5 -- meta-agl-profile-graphical-qt5 Notable changes: - weston-ini-conf moved to the meta-agl-bsp layer. Most BSPs have bbappends, so we need to have the recipes present (but unused) even in the console images. - new image: agl-image-boot = terminal-only + network + package-manaager. Ready for using package-feeds - new image/sdk: agl-image-minimal-crosssdk - agl-service-mediaplayer has a dependency on weston, thus it cannot be in the 'core'. Moved it to profile-graphical. - The wayland-ivi-extension moved to the agl-demo-platform. - The app-framework layer included and pulled 'web-runtime' as dependency. This broke console-only images. This has been moved to be in meta-agl-demo only for now. - added and massaged the agl-features. - found and added a useful script 'oe-depends-dot' that helps to work with the dot files (produced with bitbake -g) Todo: - we'll need another pass through the packagegroups. The dependencies for the layers/profiles are now sorted-out but we might have to add/shuffle a few packages. For further details, see meta-agl/docs/profiles.md. v2: fix meta-agl/meta-security/conf/layer.conf - the immediate expansion previously used in there caused some recipes not being added to BBFILES. v3: fix packagegroup renaming (packagegroup-agl-devel -> packagegroup-agl-core-devel) v4: fix missing packagegroup inclusion (tnx Jose, Scott, Stephane) v5: fix missing packagegroup inclusion v6: explicitely put profile-graphical-qt5 on-top of profile-graphical v7: re-add 'procps' when agl-devel feature is on Bug-AGL: SPEC-145 Change-Id: I24cdcd1118932758d0c55d333338238f2a770877 Signed-off-by: Jan-Simon Möller --- templates/base/bblayers.conf.sample | 8 -------- .../feature/agl-profile-graphical-html5/50_bblayers.conf.inc | 3 +++ templates/feature/agl-profile-graphical-html5/included.dep | 1 + templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc | 9 +++++++++ templates/feature/agl-profile-graphical-qt5/included.dep | 1 + templates/feature/agl-profile-graphical/50_bblayers.conf.inc | 3 +++ templates/feature/agl-profile-hud/50_bblayers.conf.inc | 3 +++ templates/feature/agl-profile-telematics/50_bblayers.conf.inc | 3 +++ 8 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc create mode 100644 templates/feature/agl-profile-graphical-html5/included.dep create mode 100644 templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc create mode 100644 templates/feature/agl-profile-graphical-qt5/included.dep create mode 100644 templates/feature/agl-profile-graphical/50_bblayers.conf.inc create mode 100644 templates/feature/agl-profile-hud/50_bblayers.conf.inc create mode 100644 templates/feature/agl-profile-telematics/50_bblayers.conf.inc (limited to 'templates') diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample index 0c3114f8c..97537f490 100644 --- a/templates/base/bblayers.conf.sample +++ b/templates/base/bblayers.conf.sample @@ -47,20 +47,12 @@ AGL_CORE_DEPENDENCY_LAYERS = " \ ${METADIR}/meta-openembedded/meta-filesystems \ " -# temporary ... to avoid build breakage. To move to upper layers. -AGL_TEMP_GFX_LAYERS = " \ - ${METADIR}/meta-agl/meta-agl-profile-graphical \ - ${METADIR}/meta-agl/meta-agl-profile-demo \ - " - - #################### # Combine the layers BBLAYERS ?= " \ ${AGL_CORE_DEPENDENCY_LAYERS} \ ${AGL_CORE_LAYERS} \ ${AGL_APPFW_LAYERS} \ - ${AGL_TEMP_GFX_LAYERS} \ ${YOCTO_LAYERS} \ " diff --git a/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc b/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc new file mode 100644 index 000000000..97b44a21e --- /dev/null +++ b/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc @@ -0,0 +1,3 @@ +BBLAYERS =+ " \ + ${METADIR}/meta-agl/meta-agl-profile-graphical-html5 \ +" diff --git a/templates/feature/agl-profile-graphical-html5/included.dep b/templates/feature/agl-profile-graphical-html5/included.dep new file mode 100644 index 000000000..5b54430da --- /dev/null +++ b/templates/feature/agl-profile-graphical-html5/included.dep @@ -0,0 +1 @@ +agl-profile-graphical \ No newline at end of file diff --git a/templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc b/templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc new file mode 100644 index 000000000..b0ac5bf14 --- /dev/null +++ b/templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc @@ -0,0 +1,9 @@ +BBLAYERS =+ " \ + ${METADIR}/meta-agl/meta-agl-profile-graphical-qt5 \ +" + +# These are the dependencies +#--------------------------- +BBLAYERS =+ " \ + ${METADIR}/meta-qt5 \ +" diff --git a/templates/feature/agl-profile-graphical-qt5/included.dep b/templates/feature/agl-profile-graphical-qt5/included.dep new file mode 100644 index 000000000..5b54430da --- /dev/null +++ b/templates/feature/agl-profile-graphical-qt5/included.dep @@ -0,0 +1 @@ +agl-profile-graphical \ No newline at end of file diff --git a/templates/feature/agl-profile-graphical/50_bblayers.conf.inc b/templates/feature/agl-profile-graphical/50_bblayers.conf.inc new file mode 100644 index 000000000..44b0885dc --- /dev/null +++ b/templates/feature/agl-profile-graphical/50_bblayers.conf.inc @@ -0,0 +1,3 @@ +BBLAYERS =+ " \ + ${METADIR}/meta-agl/meta-agl-profile-graphical \ +" diff --git a/templates/feature/agl-profile-hud/50_bblayers.conf.inc b/templates/feature/agl-profile-hud/50_bblayers.conf.inc new file mode 100644 index 000000000..047383710 --- /dev/null +++ b/templates/feature/agl-profile-hud/50_bblayers.conf.inc @@ -0,0 +1,3 @@ +BBLAYERS =+ " \ + ${METADIR}/meta-agl/meta-agl-profile-hud \ +" diff --git a/templates/feature/agl-profile-telematics/50_bblayers.conf.inc b/templates/feature/agl-profile-telematics/50_bblayers.conf.inc new file mode 100644 index 000000000..874b438f0 --- /dev/null +++ b/templates/feature/agl-profile-telematics/50_bblayers.conf.inc @@ -0,0 +1,3 @@ +BBLAYERS =+ " \ + ${METADIR}/meta-agl/meta-agl-profile-telematics \ +" -- cgit 1.2.3-korg