diff mbox series

[kirkstone] meta-arago-demos: extract demo applications into own layer

Message ID 20230523180451.3514220-1-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [kirkstone] meta-arago-demos: extract demo applications into own layer | expand

Commit Message

Denys Dmytriyenko May 23, 2023, 6:04 p.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

Over the years, meta-arago-extras has grown quite a bit and gained lots of
dependencies. Besides hosting a set of independent components or modifying
and customizing upstream components in support of TI platforms and SDKs,
while potentially being useful for end products, many demonstration and
evaluation applications were added to showcase specific features. Such demo
applications are not used for end products, unnecessarily polluting layer
dependencies and making re-use of meta-arago-extras very difficult.

Let's move demos into own sub-layer and clean up dependencies for the extras
sub-layer.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../classes/qt5.bbclass                          |  0
 .../conf/layer.conf                              | 15 +++++----------
 .../acontis-atemsys_3.0.1.28.bb                  |  0
 .../recipes-apps/barcode-demo/barcode-roi_git.bb |  0
 .../big-data-ipc-demo/big-data-ipc-demo_git.bb   |  0
 .../dual-camera-demo/desc_dual-camera.html       |  0
 .../dual-camera-demo/dual-camera.desktop         |  0
 .../dual-camera-demo/dual_camera_qt4.sh          |  0
 .../dual-camera-demo/dual_camera_qt5.sh          |  0
 .../dual-camera-demo/dual-camera-demo_1.0.bb     |  0
 .../recipes-apps/evse-hmi/evse-hmi_git.bb        |  0
 .../image-gallery/image-gallery_git.bb           |  0
 .../mmwavegesture-hmi/mmwavegesture-hmi_git.bb   |  0
 .../pdm-anomaly-detection_git.bb                 |  0
 .../point-cloud-viewer/point-cloud-viewer_git.bb |  0
 .../protection-relays-hmi_git.bb                 |  0
 ...-with-QtWidgets-per-Qt5-migration-guide.patch |  0
 ...scii-toAscii-with-fromLatin1-toLatin1-p.patch |  0
 .../recipes-apps/thermostat-demo/qt-tstat_2.0.bb |  0
 .../qt-opencv-opencl-opengl-multithreaded_git.bb |  0
 .../matrix/matrix-gui-3d-demos_2.0.bb            |  0
 .../matrix/matrix-gui-analytics-demos_2.0.bb     |  0
 .../recipes-core/matrix/matrix-gui-apps-git.inc  |  0
 .../matrix/matrix-gui-apps-images_2.0.bb         |  0
 .../recipes-core/matrix/matrix-gui-apps.inc      |  0
 .../matrix/matrix-gui-armbenchmarks-demos_2.0.bb |  0
 .../matrix/matrix-gui-browser-demos_2.0.bb       |  0
 .../matrix/matrix-gui-browser_2.0.bb             |  0
 .../matrix/matrix-gui-camera-loopback_2.0.bb     |  0
 .../recipes-core/matrix/matrix-gui-clocks_2.0.bb |  0
 .../matrix/matrix-gui-crypto-demos_2.0.bb        |  0
 .../matrix/matrix-gui-display-control_2.0.bb     |  0
 .../matrix-gui-ethernet-demos/udhcpd_eth1.conf   |  0
 .../matrix/matrix-gui-ethernet-demos_2.0.bb      |  0
 .../matrix/matrix-gui-generic-pm_2.0.bb          |  0
 .../matrix/matrix-gui-helper-scripts.bb          |  0
 .../matrix/matrix-gui-hmi-demos_2.0.bb           |  0
 .../matrix/matrix-gui-machinevision-demos_2.0.bb |  0
 .../matrix/matrix-gui-mc-demos_2.0.bb            |  0
 .../matrix/matrix-gui-multimedia-demos_2.0.bb    |  0
 .../matrix/matrix-gui-opencl-demos_2.0.bb        |  0
 .../matrix/matrix-gui-oprofile-demos_2.0.bb      |  0
 .../recipes-core/matrix/matrix-gui-paths.inc     |  0
 .../matrix/matrix-gui-pm-demos_2.0.bb            |  0
 .../matrix/matrix-gui-pru-demos_2.0.bb           |  0
 .../matrix/matrix-gui-qt4-demos_2.0.bb           |  0
 .../matrix/matrix-gui-qt5-demos_2.0.bb           |  0
 .../matrix/matrix-gui-settings-demos_2.0.bb      |  0
 .../matrix/matrix-gui-submenus_2.0.bb            |  0
 .../matrix/matrix-gui-tidl-demos_2.0.bb          |  0
 .../matrix/matrix-gui-touch-demos_2.0.bb         |  0
 .../matrix/matrix-gui-usb-demos_2.0.bb           |  0
 .../matrix/matrix-gui-utility-demos_2.0.bb       |  0
 .../matrix/matrix-gui-v4l2-demos_2.0.bb          |  0
 .../matrix-gui-video-analytics-demos_2.0.bb      |  0
 .../matrix/matrix-gui-wifi-demos_2.0.bb          |  0
 ...and-Stop-matrix-when-running-a-GUI-demo.patch |  0
 ...and-workaround-for-GUI-apps-with-weston.patch |  0
 .../recipes-core/matrix/matrix-gui/init          |  0
 .../recipes-core/matrix/matrix-gui/init.eglfs    |  0
 .../matrix/matrix-gui/matrix-gui-2.0.service     |  0
 .../recipes-core/matrix/matrix-gui/php.ini       |  0
 .../recipes-core/matrix/matrix-gui_2.0.bb        |  0
 .../matrix/matrix-lighttpd-config.bb             |  0
 .../matrix/matrix-lighttpd-config/COPYING        |  0
 .../matrix-lighttpd-config/lighttpd.conf.matrix  |  0
 .../recipes-core/matrix/refresh-screen_2.0.bb    |  0
 .../recipes-qt/examples/qtwebbrowser_5.15.1.bb   |  0
 meta-arago-extras/conf/layer.conf                | 16 ----------------
 69 files changed, 5 insertions(+), 26 deletions(-)
 rename {meta-arago-extras => meta-arago-demos}/classes/qt5.bbclass (100%)
 copy {meta-arago-extras => meta-arago-demos}/conf/layer.conf (69%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-apps/acontis-ethercat-demo/acontis-atemsys_3.0.1.28.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-apps/barcode-demo/barcode-roi_git.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-apps/big-data-ipc-demo/big-data-ipc-demo_git.bb (100%)
 rename {meta-arago-extras/recipes-multimedia => meta-arago-demos/recipes-apps}/dual-camera-demo/dual-camera-demo/desc_dual-camera.html (100%)
 rename {meta-arago-extras/recipes-multimedia => meta-arago-demos/recipes-apps}/dual-camera-demo/dual-camera-demo/dual-camera.desktop (100%)
 rename {meta-arago-extras/recipes-multimedia => meta-arago-demos/recipes-apps}/dual-camera-demo/dual-camera-demo/dual_camera_qt4.sh (100%)
 rename {meta-arago-extras/recipes-multimedia => meta-arago-demos/recipes-apps}/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh (100%)
 rename {meta-arago-extras/recipes-multimedia => meta-arago-demos/recipes-apps}/dual-camera-demo/dual-camera-demo_1.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-apps/evse-hmi/evse-hmi_git.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-apps/image-gallery/image-gallery_git.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-apps/mmwavegesture-hmi/mmwavegesture-hmi_git.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-apps/thermostat-demo/qt-tstat/0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-apps/thermostat-demo/qt-tstat/0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-apps/thermostat-demo/qt-tstat_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-analytics-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-apps-git.inc (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-apps-images_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-apps.inc (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-armbenchmarks-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-browser-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-browser_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-camera-loopback_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-clocks_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-display-control_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-ethernet-demos/udhcpd_eth1.conf (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-ethernet-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-generic-pm_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-helper-scripts.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-hmi-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-mc-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-multimedia-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-opencl-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-oprofile-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-paths.inc (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-pm-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-pru-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-qt4-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-settings-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-submenus_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-tidl-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-touch-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-usb-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-utility-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-v4l2-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui-wifi-demos_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui/0001-execute_command-Stop-matrix-when-running-a-GUI-demo.patch (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui/0001-execute_command-workaround-for-GUI-apps-with-weston.patch (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui/init (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui/init.eglfs (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui/matrix-gui-2.0.service (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui/php.ini (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-gui_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-lighttpd-config.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-lighttpd-config/COPYING (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/matrix-lighttpd-config/lighttpd.conf.matrix (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-core/matrix/refresh-screen_2.0.bb (100%)
 rename {meta-arago-extras => meta-arago-demos}/recipes-qt/examples/qtwebbrowser_5.15.1.bb (100%)
diff mbox series

Patch

diff --git a/meta-arago-extras/classes/qt5.bbclass b/meta-arago-demos/classes/qt5.bbclass
similarity index 100%
rename from meta-arago-extras/classes/qt5.bbclass
rename to meta-arago-demos/classes/qt5.bbclass
diff --git a/meta-arago-extras/conf/layer.conf b/meta-arago-demos/conf/layer.conf
similarity index 69%
copy from meta-arago-extras/conf/layer.conf
copy to meta-arago-demos/conf/layer.conf
index 6df62162..0ffd3849 100644
--- a/meta-arago-extras/conf/layer.conf
+++ b/meta-arago-demos/conf/layer.conf
@@ -4,18 +4,13 @@  BBPATH .= ":${LAYERDIR}"
 # We have a recipes directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "meta-arago-extras"
-BBFILE_PATTERN_meta-arago-extras := "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-arago-extras = "10"
+BBFILE_COLLECTIONS += "meta-arago-demos"
+BBFILE_PATTERN_meta-arago-demos := "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-arago-demos = "10"
 
-LAYERSERIES_COMPAT_meta-arago-extras = "kirkstone langdale"
+LAYERSERIES_COMPAT_meta-arago-demos = "kirkstone langdale"
 
-# Set a variable to get to the top of the metadata location
-ARAGOBASE := '${@os.path.normpath("${LAYERDIR}/../")}'
-
-LICENSE_PATH += "${LAYERDIR}/licenses"
-
-LAYERDEPENDS_meta-arago-extras = " \
+LAYERDEPENDS_meta-arago-demos = " \
     core \
     meta-ti-bsp \
     meta-ti-extras \
diff --git a/meta-arago-extras/recipes-apps/acontis-ethercat-demo/acontis-atemsys_3.0.1.28.bb b/meta-arago-demos/recipes-apps/acontis-ethercat-demo/acontis-atemsys_3.0.1.28.bb
similarity index 100%
rename from meta-arago-extras/recipes-apps/acontis-ethercat-demo/acontis-atemsys_3.0.1.28.bb
rename to meta-arago-demos/recipes-apps/acontis-ethercat-demo/acontis-atemsys_3.0.1.28.bb
diff --git a/meta-arago-extras/recipes-apps/barcode-demo/barcode-roi_git.bb b/meta-arago-demos/recipes-apps/barcode-demo/barcode-roi_git.bb
similarity index 100%
rename from meta-arago-extras/recipes-apps/barcode-demo/barcode-roi_git.bb
rename to meta-arago-demos/recipes-apps/barcode-demo/barcode-roi_git.bb
diff --git a/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo_git.bb b/meta-arago-demos/recipes-apps/big-data-ipc-demo/big-data-ipc-demo_git.bb
similarity index 100%
rename from meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo_git.bb
rename to meta-arago-demos/recipes-apps/big-data-ipc-demo/big-data-ipc-demo_git.bb
diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/desc_dual-camera.html b/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/desc_dual-camera.html
similarity index 100%
rename from meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/desc_dual-camera.html
rename to meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/desc_dual-camera.html
diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual-camera.desktop b/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual-camera.desktop
similarity index 100%
rename from meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual-camera.desktop
rename to meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual-camera.desktop
diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt4.sh b/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual_camera_qt4.sh
similarity index 100%
rename from meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt4.sh
rename to meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual_camera_qt4.sh
diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh b/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
similarity index 100%
rename from meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
rename to meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb b/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo_1.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
rename to meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo_1.0.bb
diff --git a/meta-arago-extras/recipes-apps/evse-hmi/evse-hmi_git.bb b/meta-arago-demos/recipes-apps/evse-hmi/evse-hmi_git.bb
similarity index 100%
rename from meta-arago-extras/recipes-apps/evse-hmi/evse-hmi_git.bb
rename to meta-arago-demos/recipes-apps/evse-hmi/evse-hmi_git.bb
diff --git a/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb b/meta-arago-demos/recipes-apps/image-gallery/image-gallery_git.bb
similarity index 100%
rename from meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb
rename to meta-arago-demos/recipes-apps/image-gallery/image-gallery_git.bb
diff --git a/meta-arago-extras/recipes-apps/mmwavegesture-hmi/mmwavegesture-hmi_git.bb b/meta-arago-demos/recipes-apps/mmwavegesture-hmi/mmwavegesture-hmi_git.bb
similarity index 100%
rename from meta-arago-extras/recipes-apps/mmwavegesture-hmi/mmwavegesture-hmi_git.bb
rename to meta-arago-demos/recipes-apps/mmwavegesture-hmi/mmwavegesture-hmi_git.bb
diff --git a/meta-arago-extras/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb b/meta-arago-demos/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb
similarity index 100%
rename from meta-arago-extras/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb
rename to meta-arago-demos/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb
diff --git a/meta-arago-extras/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb b/meta-arago-demos/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb
similarity index 100%
rename from meta-arago-extras/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb
rename to meta-arago-demos/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb
diff --git a/meta-arago-extras/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb b/meta-arago-demos/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb
similarity index 100%
rename from meta-arago-extras/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb
rename to meta-arago-demos/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb
diff --git a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat/0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch b/meta-arago-demos/recipes-apps/thermostat-demo/qt-tstat/0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch
similarity index 100%
rename from meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat/0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch
rename to meta-arago-demos/recipes-apps/thermostat-demo/qt-tstat/0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch
diff --git a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat/0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch b/meta-arago-demos/recipes-apps/thermostat-demo/qt-tstat/0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch
similarity index 100%
rename from meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat/0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch
rename to meta-arago-demos/recipes-apps/thermostat-demo/qt-tstat/0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch
diff --git a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb b/meta-arago-demos/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
rename to meta-arago-demos/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
diff --git a/meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb b/meta-arago-demos/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb
similarity index 100%
rename from meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb
rename to meta-arago-demos/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-analytics-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-analytics-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-analytics-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-analytics-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc b/meta-arago-demos/recipes-core/matrix/matrix-gui-apps-git.inc
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-apps-git.inc
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-images_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-apps-images_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-apps-images_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-apps-images_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps.inc b/meta-arago-demos/recipes-core/matrix/matrix-gui-apps.inc
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-apps.inc
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-apps.inc
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-armbenchmarks-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-armbenchmarks-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-armbenchmarks-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-armbenchmarks-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-browser-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-browser-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-browser-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-browser_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-browser_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-camera-loopback_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-camera-loopback_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-camera-loopback_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-camera-loopback_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-clocks_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-clocks_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-clocks_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-clocks_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-display-control_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-display-control_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-display-control_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-display-control_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-ethernet-demos/udhcpd_eth1.conf b/meta-arago-demos/recipes-core/matrix/matrix-gui-ethernet-demos/udhcpd_eth1.conf
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-ethernet-demos/udhcpd_eth1.conf
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-ethernet-demos/udhcpd_eth1.conf
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-ethernet-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-ethernet-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-ethernet-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-ethernet-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-generic-pm_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-generic-pm_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-generic-pm_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-generic-pm_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-helper-scripts.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-helper-scripts.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-helper-scripts.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-helper-scripts.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-hmi-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-hmi-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-hmi-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-hmi-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-mc-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-mc-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-mc-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-mc-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-multimedia-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-multimedia-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-multimedia-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-multimedia-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-opencl-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-opencl-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-opencl-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-opencl-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-oprofile-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-oprofile-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-oprofile-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-oprofile-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-paths.inc b/meta-arago-demos/recipes-core/matrix/matrix-gui-paths.inc
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-paths.inc
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-paths.inc
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-pm-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-pm-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-pm-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-pm-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-pru-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-pru-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-pru-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-pru-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-qt4-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-qt4-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-qt4-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-qt4-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-settings-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-settings-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-settings-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-settings-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-submenus_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-submenus_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-tidl-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-tidl-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-tidl-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-tidl-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-touch-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-touch-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-touch-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-touch-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-usb-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-usb-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-usb-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-usb-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-utility-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-utility-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-utility-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-utility-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-v4l2-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-v4l2-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-v4l2-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-v4l2-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-wifi-demos_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui-wifi-demos_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui-wifi-demos_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui-wifi-demos_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui/0001-execute_command-Stop-matrix-when-running-a-GUI-demo.patch b/meta-arago-demos/recipes-core/matrix/matrix-gui/0001-execute_command-Stop-matrix-when-running-a-GUI-demo.patch
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui/0001-execute_command-Stop-matrix-when-running-a-GUI-demo.patch
rename to meta-arago-demos/recipes-core/matrix/matrix-gui/0001-execute_command-Stop-matrix-when-running-a-GUI-demo.patch
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui/0001-execute_command-workaround-for-GUI-apps-with-weston.patch b/meta-arago-demos/recipes-core/matrix/matrix-gui/0001-execute_command-workaround-for-GUI-apps-with-weston.patch
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui/0001-execute_command-workaround-for-GUI-apps-with-weston.patch
rename to meta-arago-demos/recipes-core/matrix/matrix-gui/0001-execute_command-workaround-for-GUI-apps-with-weston.patch
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui/init b/meta-arago-demos/recipes-core/matrix/matrix-gui/init
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui/init
rename to meta-arago-demos/recipes-core/matrix/matrix-gui/init
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui/init.eglfs b/meta-arago-demos/recipes-core/matrix/matrix-gui/init.eglfs
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui/init.eglfs
rename to meta-arago-demos/recipes-core/matrix/matrix-gui/init.eglfs
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui/matrix-gui-2.0.service b/meta-arago-demos/recipes-core/matrix/matrix-gui/matrix-gui-2.0.service
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui/matrix-gui-2.0.service
rename to meta-arago-demos/recipes-core/matrix/matrix-gui/matrix-gui-2.0.service
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui/php.ini b/meta-arago-demos/recipes-core/matrix/matrix-gui/php.ini
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui/php.ini
rename to meta-arago-demos/recipes-core/matrix/matrix-gui/php.ini
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-gui_2.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config.bb b/meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config.bb
rename to meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config/COPYING b/meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config/COPYING
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config/COPYING
rename to meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config/COPYING
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config/lighttpd.conf.matrix b/meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config/lighttpd.conf.matrix
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config/lighttpd.conf.matrix
rename to meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config/lighttpd.conf.matrix
diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb b/meta-arago-demos/recipes-core/matrix/refresh-screen_2.0.bb
similarity index 100%
rename from meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
rename to meta-arago-demos/recipes-core/matrix/refresh-screen_2.0.bb
diff --git a/meta-arago-extras/recipes-qt/examples/qtwebbrowser_5.15.1.bb b/meta-arago-demos/recipes-qt/examples/qtwebbrowser_5.15.1.bb
similarity index 100%
rename from meta-arago-extras/recipes-qt/examples/qtwebbrowser_5.15.1.bb
rename to meta-arago-demos/recipes-qt/examples/qtwebbrowser_5.15.1.bb
diff --git a/meta-arago-extras/conf/layer.conf b/meta-arago-extras/conf/layer.conf
index 6df62162..8c4b474e 100644
--- a/meta-arago-extras/conf/layer.conf
+++ b/meta-arago-extras/conf/layer.conf
@@ -20,22 +20,6 @@  LAYERDEPENDS_meta-arago-extras = " \
     meta-ti-bsp \
     meta-ti-extras \
     openembedded-layer \
-    networking-layer \
-    meta-python \
-    arm-toolchain \
-    qt5-layer \
-"
-
-SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
-    matrix-gui-multimedia-demos->amsdk-av-files \
-    matrix-gui-oprofile-demos->oprofile \
-    matrix-gui-oprofile-demos->oprofile-example \
-    matrix-gui-usb-demos->bonnie++ \
-    matrix-gui-armbenchmarks-demos->arm-benchmarks \
-    matrix-gui-armbenchmarks-demos->lmbench \
-    matrix-gui-armbenchmarks-demos->nbench-byte \
-    matrix-gui-machinevision-demos->point-cloud-viewer \
-    matrix-lighttpd-config->lighttpd \
 "
 
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \