summaryrefslogtreecommitdiffstats
path: root/recipes-platform/packagegroups
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2023-06-05 10:08:59 -0400
committerScott Murray <scott.murray@konsulko.com>2023-06-07 13:33:53 -0400
commit2507e4a69862808a6331b0e4c665b694f49a49b9 (patch)
tree7031fe828a07407a21dcf82dd37fbd1774d5f6af /recipes-platform/packagegroups
parentcce52591f8e00ae41ae380a597d620b0856d004d (diff)
Remove systemd user session and clean up packagegroups and imagespike_15.91.0pike/15.91.015.91.0
Remove the use of systemd user session to align with how upstream runs Weston, and to allow using all systemd sandboxing features with the compositor and homescreen, launcher, etc. applications. The changes for this touched enough packagegroups and images that further rework was done to address some of the cleanup described in SPEC-4813, see below for details. Changes: - Rework systemd units and recipes of affected applications. - Rework images to pull in image .bb files instead of .inc files. - Pull in the new agl-image-compositor as a base image where appropriate. - Update weston-terminal-conf recipe to use new split out weston-terminal package. - Use new agl-crosssdk bbclass where appropriate. - Pull some local common cross-SDK additions into a new agl-ivi-crosssdk.inc include file and use as appropriate. Note that this does have a side effect of likely correcting the contents of agl-image-ivi-crosssdk for some recent additions. - Remove flutter-gallery bbappend that turned it into an app, as we are not using it in images, have other examples now, and it seems better to not affect the contents of agl-image-flutter. - Remove unused agl-image-graphical-html5. If a downstream user does desire an image with Chromium+WAM without applications, restoring it can be considered. - Remove unused agl-image-graphical-qt5-crosssdk. - Remove all packagegroup-agl-profile-* packagegroups, as they were either empty or not providing value at this point. Any future plans for defining profiles can start from a clean sheet. - Added new packagegroup-agl-ivi-multimedia-hardware to hold some rcar3 specific additions (via override) that were previously being appended onto packagegroup-agl-graphical-multimedia even though they are machine-specific and that packagegroup is not. This may be a stopgap solution if the agl-ivi-* packagegroups are reworked further. - Replace some :append usage with += to avoid creating problems for downstream users. Bug-AGL: SPEC-4714, SPEC-4813 Change-Id: I544b1495bed1e2e2412a8e46b7d20d7622ec28c9 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'recipes-platform/packagegroups')
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb1
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb1
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb2
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb3
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-demo.bb1
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bbappend1
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc5
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb3
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-image-ivi.bbappend4
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-ivi-identity.bb8
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia-hardware.bb21
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb18
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb22
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb34
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-profile-cluster.bb20
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-profile-graphical-html5.bb22
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb21
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-profile-telematics.bb22
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb14
-rw-r--r--recipes-platform/packagegroups/packagegroup-hmi-framework.bb20
20 files changed, 40 insertions, 203 deletions
diff --git a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb
index c414adf4..4cd03b66 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb
@@ -12,7 +12,6 @@ PACKAGES = "\
ALLOW_EMPTY:${PN} = "1"
RDEPENDS:${PN} += "\
- packagegroup-agl-profile-cluster-qt5 \
packagegroup-agl-ttf-fonts \
packagegroup-agl-source-han-sans-ttf-fonts \
packagegroup-agl-networking \
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb
index 71c2d17c..6ae16d42 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb
@@ -12,7 +12,6 @@ PACKAGES = "\
RDEPENDS:${PN} += "\
packagegroup-agl-image-ivi \
- packagegroup-agl-profile-graphical-qt5 \
packagegroup-agl-demo \
"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
index 1f1984d8..7ea23e79 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
@@ -12,7 +12,6 @@ PACKAGES = "\
RDEPENDS:${PN} += "\
packagegroup-agl-image-ivi \
- packagegroup-agl-profile-graphical-html5 \
packagegroup-agl-demo \
"
@@ -32,6 +31,7 @@ AGL_APPS = " \
"
RDEPENDS:${PN}:append = " \
+ virtual/webruntime \
weston-ini-conf-landscape-no-activate \
${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \
qtquickcontrols2-agl \
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index c4900425..f0e3a22e 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -12,8 +12,6 @@ PACKAGES = "\
RDEPENDS:${PN} += "\
packagegroup-agl-image-ivi \
- packagegroup-agl-profile-graphical-qt5 \
- packagegroup-hmi-framework \
packagegroup-agl-demo \
"
@@ -31,6 +29,7 @@ AGL_APPS = " \
RDEPENDS:${PN}:append = " \
weston-ini-conf-no-activate \
+ homescreen \
launcher \
qtquickcontrols2-agl \
qtquickcontrols2-agl-style \
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
index 6b7e5239..02926d34 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@ -38,5 +38,4 @@ RDEPENDS:${PN} += " \
iproute2 \
${DEMO_PLATFORM_CONF} \
${TTF_FONTS} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'webruntime', 'virtual/webruntime', '', d)} \
"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bbappend b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bbappend
deleted file mode 100644
index aa401a71..00000000
--- a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'packagegroup-agl-graphical-weston_agldemo.inc', '', d)}
diff --git a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
deleted file mode 100644
index 2b91c177..00000000
--- a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-RDEPENDS:${PN}:remove = "weston-init"
-
-RDEPENDS:${PN} += " \
- agl-compositor-init \
- "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb b/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb
index ea165eff..c3d6f57c 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb
@@ -18,6 +18,9 @@ RDEPENDS:${PN} += "\
packagegroup-agl-ivi-connectivity \
packagegroup-agl-ivi-graphics \
packagegroup-agl-ivi-multimedia \
+ packagegroup-agl-ivi-multimedia-hardware \
packagegroup-agl-ivi-navigation \
+ packagegroup-agl-ivi-identity \
+ packagegroup-agl-ivi-services \
"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bbappend b/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bbappend
deleted file mode 100644
index a80d9de7..00000000
--- a/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-RDEPENDS:${PN} += " \
- packagegroup-agl-ivi-identity \
- packagegroup-agl-ivi-services \
-"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-identity.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-identity.bb
index c81aa807..3cd16378 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-ivi-identity.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-identity.bb
@@ -1,7 +1,11 @@
+SUMMARY = "The middlewares for AGL IVI profile"
+DESCRIPTION = "The set of packages required for identity services"
+LICENSE = "MIT"
+
inherit packagegroup
+ALLOW_EMPTY:${PN} = "1"
+
RDEPENDS:${PN} += "\
"
-LICENSE = "MIT"
-
diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia-hardware.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia-hardware.bb
new file mode 100644
index 00000000..e52e8ef5
--- /dev/null
+++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia-hardware.bb
@@ -0,0 +1,21 @@
+SUMMARY = "The middlewares for AGL IVI profile"
+DESCRIPTION = "Hardware-specific packages required by Multimedia Subsystem"
+LICENSE = "MIT"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+
+PACKAGES = "\
+ packagegroup-agl-ivi-multimedia-hardware \
+ "
+
+ALLOW_EMPTY:${PN} = "1"
+
+RDEPENDS:${PN} = ""
+
+RDEPENDS:${PN}:append:rcar-gen3 = "\
+ ${@bb.utils.contains('MACHINE_FEATURES', 'multimedia', 'packagegroup-multimedia-kernel-modules', '', d)} \
+ ${@bb.utils.contains('MACHINE_FEATURES', 'multimedia', 'packagegroup-multimedia-libs', '', d)} \
+ ${@bb.utils.contains('MACHINE_FEATURES', 'multimedia', 'packagegroup-gstreamer1.0-plugins', '', d)} \
+ "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb
index dc60e9e1..8865a9f0 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb
@@ -10,18 +10,16 @@ PACKAGES = "\
ALLOW_EMPTY:${PN} = "1"
+PIPEWIRE_PACKAGES = " \
+ packagegroup-pipewire \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'packagegroup-pipewire-tools alsa-utils', '', d)} \
+ wireplumber-config-agl \
+ wireplumber-policy-config-agl \
+ "
+
RDEPENDS:${PN} += "\
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', '${PIPEWIRE_PACKAGES}', '', d)} \
gstreamer1.0-plugins-base-meta \
gstreamer1.0-plugins-good-meta \
mpd \
"
-
-# for now: enable here for the AGL IVI demo (image-ivi and demo-platform)
-# tbd: change based on usage in profiles
-PIPEWIRE = "\
- ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'packagegroup-pipewire', '', d)}\
- "
-
-RDEPENDS:${PN} += "\
- ${PIPEWIRE} \
- "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb
deleted file mode 100644
index 1cf20937..00000000
--- a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "The middleware for AGL Qt5 based cluster profile"
-DESCRIPTION = "The set of packages required for AGL Qt5 based Cluster Distribution"
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
- packagegroup-agl-profile-cluster-qt5 \
- profile-cluster-qt5-wayland \
- profile-cluster-qt5 \
- "
-
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} += "\
- packagegroup-agl-image-boot \
- packagegroup-agl-core-security \
- packagegroup-agl-graphical-weston \
-"
-
-RDEPENDS:profile-cluster-qt5-wayland = "${PN}"
-RDEPENDS:profile-cluster-qt5 = "profile-cluster-qt5-wayland"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb
deleted file mode 100644
index 0539ae12..00000000
--- a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SUMMARY = "The middleware for AGL Qt5 based cluster qtcompositor"
-DESCRIPTION = "The set of packages required for AGL Qt5 based Cluster Demo Qtcompositor Distribution"
-LICENSE = "MIT"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup
-
-PACKAGES = "\
- packagegroup-agl-profile-cluster-qtcompositor \
- profile-cluster-qt5-egl \
- "
-
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} += "\
- packagegroup-agl-image-boot \
- packagegroup-agl-core-security \
- packagegroup-agl-core-connectivity \
-"
-
-QT_LITE = " \
- qtbase \
- qtdeclarative \
- qtwayland \
- qtgraphicaleffects-qmlplugins \
- qtsvg-plugins \
-"
-
-RDEPENDS:${PN}:append = " \
- ${QT_LITE} \
-"
-
-RDEPENDS:profile-cluster-qt5-egl = "${PN}"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster.bb
deleted file mode 100644
index 8b1099f3..00000000
--- a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY = "The middleware for AGL cluster profile"
-DESCRIPTION = "The set of packages required for AGL Cluster Distribution"
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
- packagegroup-agl-profile-cluster \
- profile-cluster \
- "
-
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} += "\
- packagegroup-agl-image-boot \
- packagegroup-agl-core-security \
- packagegroup-agl-graphical-weston \
-"
-
-RDEPENDS:profile-cluster = "${PN}"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-html5.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-html5.bb
deleted file mode 100644
index 62c30ea9..00000000
--- a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-html5.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "AGL web runtime profile"
-DESCRIPTION = "The full set of packages required for AGL web runtime"
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
- packagegroup-agl-profile-graphical-html5 \
- profile-graphical-html5 \
- "
-
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} += "\
- packagegroup-agl-profile-graphical \
-"
-
-RDEPENDS:${PN} += "\
- wam \
- "
-
-RDEPENDS:profile-graphical-html5 = "${PN}"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb
deleted file mode 100644
index 9f4e7f4f..00000000
--- a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "The middlewares for AGL IVI profile"
-DESCRIPTION = "The set of packages required for AGL Distribution"
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
- packagegroup-agl-profile-graphical-qt5 \
- profile-graphical-qt5 \
- "
-
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} += "\
- packagegroup-agl-profile-graphical \
-"
-
-RDEPENDS:${PN} += "\
- "
-
-RDEPENDS:profile-graphical-qt5 = "${PN}"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-telematics.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-telematics.bb
deleted file mode 100644
index 4377dbbc..00000000
--- a/recipes-platform/packagegroups/packagegroup-agl-profile-telematics.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "The middleware for AGL telematics profile"
-DESCRIPTION = "The set of packages required for AGL Telematics Distribution"
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
- packagegroup-agl-profile-telematics \
- profile-telematics \
- "
-
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} += "\
- packagegroup-agl-image-boot \
- packagegroup-agl-core-security \
- ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','connman','connman connman-client','',d)} \
- ${@bb.utils.contains("DISTRO_FEATURES", "3g", "libqmi", "", d)} \
- can-utils \
-"
-
-RDEPENDS:profile-telematics = "${PN}"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb
index d598de4e..96ad7138 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb
@@ -9,24 +9,10 @@ PACKAGES = "\
packagegroup-agl-telematics-demo-platform \
"
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} += "\
- packagegroup-agl-profile-telematics \
- "
-
-AGL_APPS = " \
- "
-
-AGL_APIS = " \
- "
-
RDEPENDS:${PN}:append = " \
gpsd \
sw-gpsd-udev-conf \
usb-can-udev-conf \
simple-can-simulator \
${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'ofono-tests gps-utils' , '', d)} \
- ${AGL_APPS} \
- ${AGL_APIS} \
"
diff --git a/recipes-platform/packagegroups/packagegroup-hmi-framework.bb b/recipes-platform/packagegroups/packagegroup-hmi-framework.bb
deleted file mode 100644
index facd1827..00000000
--- a/recipes-platform/packagegroups/packagegroup-hmi-framework.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY = "The software for the AGL hmi framework 2017"
-DESCRIPTION = "A set of packages belong to the hmi framework 2017"
-
-LICENSE = "MIT"
-
-# need to bump manually due to:
-# - nothing provides libqthomescreenwrapper0 needed by packagegroup-hmi-framework-1.0-r0.noarch
-PR = "2"
-
-inherit packagegroup
-
-PROVIDES = "${PACKAGES}"
-PACKAGES = "\
- packagegroup-hmi-framework \
- packagegroup-hmi-framework-devel \
- "
-
-RDEPENDS:${PN} = " \
- homescreen \
- "