diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-05-15 14:47:00 +0200 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-06-05 15:11:36 +0200 |
commit | b6852864508358930586e083e72cd2912af68674 (patch) | |
tree | 4029e33f00bbd0247524d03f7c1689672d85ef9b /recipes-platform/packagegroups | |
parent | fab778caff2041794814df54b51893965381aa66 (diff) |
3rd part of the layer/profile rework [2/2]
This is the last part of the layer rework series.
Notable changes are:
- move demo specific recipes to the demo (dlt, web-runtime mocca-usb)
- wayland-ivi-extension moved to the meta-agl-demo layer for now.
- web-runtime moved here (from appfw layer to allow console-only builds with appfw)
- adapted packagegroups and agl-features
v2: squashed with commit on sandbox to form single commit (tnx, Scott)
v3: inclusion of old packagegroup-agl-image-ivi (TODO: refactor and include in profile packagegroups. Tnx, Stephane)
v4: base packagegroup-agl-demo-platform on packagegroup-agl-profile-graphical-qt5
v5: fix MOST_DRIVERS_append (disable due to FTBS)
v6: re-add RDEPENDS for virtual/pulseaudio-config
Bug-AGL: SPEC-145
Bug-AGL: SPEC-1422
Change-Id: I20bd5b9a957ea54a7ecd08bd4f8b99a32266c9c8
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-platform/packagegroups')
7 files changed, 90 insertions, 30 deletions
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb deleted file mode 100644 index 9092b1872..000000000 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "The software for DEMO platform of AGL IVI profile" -DESCRIPTION = "A set of packages belong to AGL Demo Platform" - -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-demo-platform-html5 \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - packagegroup-agl-image-ivi \ - " - -# add packages for demo platform (include demo apps) here -RDEPENDS_${PN} += " \ - packagegroup-agl-demo \ - " - -# add packages for OpenIVI-HTML5 demo -RDEPENDS_${PN} += " \ - openivi-html5 \ - " diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index f1ba6cd20..4ab64d0bb 100755 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -16,13 +16,12 @@ RDEPENDS_${PN} += "\ " RDEPENDS_${PN} += "\ - packagegroup-agl-image-weston \ + packagegroup-agl-profile-graphical-qt5 \ packagegroup-agl-demo \ " MOST_DRIVERS = " " -# temporarily disabled on rocko to fix the build -MOST_DRIVERS_append_fixbrokenrocko = " \ +MOST_DRIVERS_append_BROKENonIntelQemuRpi3 = " \ mocca-usb \ most \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb index 0b37113fe..5cf826bdb 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb @@ -25,13 +25,14 @@ AUDIO-OLD = "audiomanager" AUDIO-NEW = "packagegroup-agl-audio" RDEPENDS_${PN} += "\ - packagegroup-agl-appfw \ libqtappfw \ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-hmi-framework', '${HOMESCREEN-NEW}', '${HOMESCREEN-OLD}', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '${AUDIO-NEW}', '${AUDIO-OLD}', d)} \ udisks \ ${SMARTDEVICELINK} \ " +# packagegroup-agl-appfw \ +# # fonts TTF_FONTS = " \ @@ -62,4 +63,7 @@ RDEPENDS_${PN} += " \ dhcp-client \ ${TTF_FONTS} \ ${EXTRA_APPS} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'webruntime', 'virtual/webruntime', '', d)} \ " + + diff --git a/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb b/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb new file mode 100644 index 000000000..0edc600ca --- /dev/null +++ b/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb @@ -0,0 +1,32 @@ +SUMMARY = "The middlewares for AGL IVI profile" +DESCRIPTION = "The set of packages required for AGL Distribution" +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-image-ivi \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += "\ + packagegroup-agl-image-minimal \ +" + +RDEPENDS_${PN} += "\ + packagegroup-agl-ivi-connectivity \ + packagegroup-agl-ivi-graphics \ + packagegroup-agl-ivi-multimedia \ + " +# packagegroup-agl-ivi-automotive \ +# packagegroup-agl-ivi-speech-services \ +# packagegroup-agl-ivi-navi-lbs \ +# packagegroup-agl-ivi-security \ +# packagegroup-agl-ivi-os-commonlibs \ +# packagegroup-agl-ivi-kernel \ +# + +RDEPENDS_${PN} += "\ + agl-login-manager \ + " diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bb new file mode 100644 index 000000000..2d45986de --- /dev/null +++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bb @@ -0,0 +1,15 @@ +SUMMARY = "The middlewares for AGL IVI profile" +DESCRIPTION = "The set of packages required by Connectivity Subsystem" +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-ivi-connectivity \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += "\ + ofono \ + " diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb new file mode 100644 index 000000000..8831e10a1 --- /dev/null +++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb @@ -0,0 +1,15 @@ +SUMMARY = "The middlewares for AGL IVI profile" +DESCRIPTION = "The set of packages required by Graphics Subsystem" +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-ivi-graphics \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += "\ + opencv \ + " diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb new file mode 100644 index 000000000..3b7cf78ac --- /dev/null +++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb @@ -0,0 +1,21 @@ +SUMMARY = "The middlewares for AGL IVI profile" +DESCRIPTION = "The set of packages required by Multimedia Subsystem" +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-ivi-multimedia \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += "\ + gstreamer1.0-plugins-base-meta \ + gstreamer1.0-plugins-good-meta \ + lightmediascanner-meta \ + " + +RDEPENDS_${PN} += "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '' , 'virtual/pulseaudio-config', d)} \ + " |