diff mbox series

[meta-arago,master,PATCHv3] meta-arago: remove dependency on meta-arago-demos

Message ID 20250124212918.1756417-1-rs@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,master,PATCHv3] meta-arago: remove dependency on meta-arago-demos | expand

Commit Message

Randolph Sapp Jan. 24, 2025, 9:29 p.m. UTC 
From: Randolph Sapp <rs@ti.com>

Remove any explicit dependencies on meta-arago-demos. These were the
last of the "demos" in this layer and they were only being built for
legacy devices. Demos should primarily be in layers above this unless
they are used for functionality testing.

This patch does not modify this layer's dependency list because
meta-arago-demos was not previously listed as an explicit dependency,
despite default package groups requiring it.

These modifications are required as part of the effort to make this
layer less dependent on meta-qt5. Moving forward TI builds of arago will
enable and test Qt6 by default, but unlike before this will not be done
in a way that creates an explicit dependency in this layer. This should
allow customers and layers that consume or extend this layer to toggle
Qt support more easily.

A corresponding patch will be sent following this to remove
meta-arago-demos from master oe-layersetup configs and then one more
patch will be submitted to delete the now unreachable contents of
meta-arago-demos.

Signed-off-by: Randolph Sapp <rs@ti.com>
---

v2: Update commit message to be more verbose about planed actions here following
feedback on v1

v3: Properly remove packagegroup-arago-tisdk-hmi and pdm-anomaly-detection.
Apparently my tree mixed in a different version of this patch from master-next.

 .../recipes-core/images/tisdk-default-image.bb  | 13 -------------
 ...ackagegroup-arago-tisdk-addons-sdk-target.bb | 17 -----------------
 .../packagegroup-arago-tisdk-addons.bb          |  2 --
 .../packagegroup-arago-tisdk-hmi.bb             | 11 -----------
 .../recipes-core/packagegroups/ti-world.bb      | 10 +---------
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb
diff mbox series

Patch

diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
index 3d689c04..3ae0212c 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
@@ -23,24 +23,12 @@  IMAGE_INSTALL += "\
     packagegroup-arago-tisdk-multimedia \
     packagegroup-arago-tisdk-addons \
     packagegroup-arago-tisdk-addons-extra \
-    ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES','opengl','pdm-anomaly-detection','', d)} \
     ${ARAGO_DEFAULT_IMAGE_EXTRA_INSTALL} \
     packagegroup-arago-tisdk-sysrepo \
 "
 
 export IMAGE_BASENAME = "tisdk-default-image${ARAGO_IMAGE_SUFFIX}"
 
-EXTRABROWSERS = " \
-    qtwebbrowser-examples \
-    qtwebengine-qmlplugins \
-    qtwebengine-examples \
-"
-
-PYTHON2APPS = " \
-    ${@bb.utils.contains('DISTRO_FEATURES','opengl',"${EXTRABROWSERS}",'',d)} \
-"
-
 DEVTOOLS = " \
     linux-libc-headers-dev \
     build-essential \
@@ -50,7 +38,6 @@  DEVTOOLS = " \
 "
 
 IMAGE_INSTALL += "\
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "${PYTHON2APPS}", "", d)} \
     ${DEVTOOLS} \
     ${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 'valgrind', '', d)} \
     docker \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
index 3e0a2720..8690a874 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
@@ -31,24 +31,7 @@  EXTRA_LIBS:append:dra7xx = " libulm-dev \
                              gdbserver-c6x-dev \
 "
 
-PDM_ANOMALY_PKG_DEV = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'pdm-anomaly-detection-dev', '', d)} \
-"
-
-
 EXTRA_PACKAGES = ""
-#EXTRA_PACKAGES:append:ti33x = " \
-#                                ${PDM_ANOMALY_PKG_DEV} \
-#"
-#EXTRA_PACKAGES:append:ti43x = " \
-#                                ${PDM_ANOMALY_PKG_DEV} \
-#"
-#EXTRA_PACKAGES:append:omap-a15 = " \
-#                                ${PDM_ANOMALY_PKG_DEV} \
-#"
-#EXTRA_PACKAGES:append:am65xx = " \
-#                             ${PDM_ANOMALY_PKG_DEV} \
-#"
 
 IPCDEV = " \
 	ti-ipc-dev \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index 6b6533f5..b0d76b28 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -85,10 +85,8 @@  EXTRA_PACKAGES:omapl138 = " \
     protobuf \
 "
 
-# acontis-atemsys
 #EXTRA_PACKAGES:append:am335x-evm = " pruss-lld-apps"
 #EXTRA_PACKAGES:append:am437x-evm = " pruss-lld-apps"
-# acontis-atemsys
 #EXTRA_PACKAGES:append:am57xx-evm = " pruss-lld-apps"
 
 RDEPENDS:${PN} = "\
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb
deleted file mode 100644
index ca528d3d..00000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb
+++ /dev/null
@@ -1,11 +0,0 @@ 
-SUMMARY = "Task to add HMI related packages"
-LICENSE = "MIT"
-PR = "r0"
-
-inherit packagegroup
-
-RDEPENDS:${PN} = "\
-    evse-hmi \
-    protection-relays-hmi \
-    mmwavegesture-hmi \
-"
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
index 96bfcac8..fc3eac74 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
@@ -15,14 +15,7 @@  CHROMIUM:append:k3 = "\
     chromium-ozone-wayland \
 "
 
-EXTRABROWSERS = " \
-    qtwebbrowser-examples \
-    qtwebengine-qmlplugins \
-    qtwebengine-examples \
-"
-
 PYTHON2APPS = " \
-    ${@bb.utils.contains('DISTRO_FEATURES','opengl',"${EXTRABROWSERS}",'',d)} \
     ${@bb.utils.contains("BBFILE_COLLECTIONS","browser-layer",bb.utils.contains('DISTRO_FEATURES','wayland',"${CHROMIUM}",'',d),'',d)} \
 "
 
@@ -45,11 +38,10 @@  RDEPENDS:${PN} = "\
     packagegroup-arago-tisdk-multimedia \
     packagegroup-arago-tisdk-addons \
     packagegroup-arago-tisdk-addons-extra \
-    ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES','opengl','','packagegroup-arago-base-tisdk-server-extra',d)} \
     ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "${PYTHON2APPS}", "", d)} \
     ${DEVTOOLS} \
     ${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 'valgrind', '', d)} \
     packagegroup-arago-misc \
-    ${@bb.utils.contains('DISTRO_FEATURES','opengl','pdm-anomaly-detection','', d)} \
     ${PREFERRED_PROVIDER_virtual/docker} \
 "