From 3d41421f63ec20fb88418eb006509e323f4f9c78 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 15 Apr 2025 09:52:12 -0400 Subject: [PATCH] meta-agl-demo-control-panel: merge layer Now that Qt6 has been integrated and Qt5 support dropped, the contents of meta-agl-demo-control-panel can be merged back into the main demo layer, and the duplicated recipes dropped. Bug-AGL: SPEC-5412 Change-Id: I5e115b164630cc4640c1177089f1f2da887ead11 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30919 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- meta-agl-demo-control-panel/SECURITY.md | 19 ------- meta-agl-demo-control-panel/conf/layer.conf | 18 ------- .../kuksa-val/kuksa-certificates-agl.bb | 61 ---------------------- .../kuksa-val/kuksa-certificates-agl/CA.pem | 23 -------- .../kuksa-val/kuksa-certificates-agl/Client.key | 27 ---------- .../kuksa-val/kuksa-certificates-agl/Client.pem | 24 --------- .../kuksa-val/kuksa-certificates-agl/Server.key | 27 ---------- .../kuksa-val/kuksa-certificates-agl/Server.pem | 24 --------- .../kuksa-certificates-agl/genCertsAGL.sh | 58 -------------------- .../kuksa-val/kuksa-certificates-agl/jwt.key.pub | 14 ----- .../wayland/weston-agl-driver-conf.bb | 22 -------- .../weston-agl-driver-conf/weston-agl-driver.conf | 5 -- .../recipes-platform/images/agl-demo-features.inc | 10 ---- .../packagegroups/packagegroup-agl-networking.bb | 21 -------- .../agl-demo-control-panel_git.bb | 0 .../files/agl-demo-control-panel.service | 0 recipes-devtools/python/python3-pyqt6_%.bbappend | 1 + .../python/python3-pyqt6_agldemo.inc | 0 ...ivi-demo-control-panel-preconfigured-gateway.bb | 0 .../agl-ivi-demo-control-panel-preconfigured.bb | 0 .../images/agl-ivi-demo-control-panel.bb | 0 .../agl-demo-control-panel/50_bblayers.conf.inc | 12 ----- .../agl-demo-control-panel/50_local.conf.inc | 2 - .../README_feature_agl-demo-control-panel.md | 16 ------ .../feature/agl-demo-control-panel/included.dep | 1 - 25 files changed, 1 insertion(+), 384 deletions(-) delete mode 100644 meta-agl-demo-control-panel/SECURITY.md delete mode 100644 meta-agl-demo-control-panel/conf/layer.conf delete mode 100644 meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb delete mode 100644 meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/CA.pem delete mode 100644 meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Client.key delete mode 100644 meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Client.pem delete mode 100644 meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Server.key delete mode 100644 meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Server.pem delete mode 100755 meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/genCertsAGL.sh delete mode 100644 meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/jwt.key.pub delete mode 100644 meta-agl-demo-control-panel/recipes-graphics/wayland/weston-agl-driver-conf.bb delete mode 100644 meta-agl-demo-control-panel/recipes-graphics/wayland/weston-agl-driver-conf/weston-agl-driver.conf delete mode 100644 meta-agl-demo-control-panel/recipes-platform/images/agl-demo-features.inc delete mode 100644 meta-agl-demo-control-panel/recipes-platform/packagegroups/packagegroup-agl-networking.bb rename {meta-agl-demo-control-panel/recipes-demo => recipes-demo}/agl-demo-control-panel/agl-demo-control-panel_git.bb (100%) rename {meta-agl-demo-control-panel/recipes-demo => recipes-demo}/agl-demo-control-panel/files/agl-demo-control-panel.service (100%) create mode 100644 recipes-devtools/python/python3-pyqt6_%.bbappend rename meta-agl-demo-control-panel/dynamic-layers/meta-qt6/recipes-python/pyqt6/python3-pyqt6_%.bbappend => recipes-devtools/python/python3-pyqt6_agldemo.inc (100%) rename {meta-agl-demo-control-panel/recipes-platform => recipes-platform}/images/agl-ivi-demo-control-panel-preconfigured-gateway.bb (100%) rename {meta-agl-demo-control-panel/recipes-platform => recipes-platform}/images/agl-ivi-demo-control-panel-preconfigured.bb (100%) rename {meta-agl-demo-control-panel/recipes-platform => recipes-platform}/images/agl-ivi-demo-control-panel.bb (100%) delete mode 100644 templates/feature/agl-demo-control-panel/50_bblayers.conf.inc delete mode 100644 templates/feature/agl-demo-control-panel/50_local.conf.inc delete mode 100644 templates/feature/agl-demo-control-panel/README_feature_agl-demo-control-panel.md delete mode 100644 templates/feature/agl-demo-control-panel/included.dep diff --git a/meta-agl-demo-control-panel/SECURITY.md b/meta-agl-demo-control-panel/SECURITY.md deleted file mode 100644 index a3c80fdd3..000000000 --- a/meta-agl-demo-control-panel/SECURITY.md +++ /dev/null @@ -1,19 +0,0 @@ -How to Report a Potential Vulnerability? -======================================== - -If you would like to report a public issue (for example, one with a released -CVE number), please report it to security AT automotivelinux DOT org - -If you are dealing with a not-yet released or urgent issue, please send a -message to security AT automotivelinux DOT org, including as many details as -possible: the layer or software module affected, the recipe and its version, -and any example code, if available. - -Branches maintained with security fixes ---------------------------------------- - -See [https://wiki.automotivelinux.org/schedule this page] -for detailed info regarding the policies and maintenance of Stable branches. - -The [https://wiki.automotivelinux.org/agl-distro/release-notes Release page] -contains a list of all releases of Automotive Grade Linux. diff --git a/meta-agl-demo-control-panel/conf/layer.conf b/meta-agl-demo-control-panel/conf/layer.conf deleted file mode 100644 index 09e7a8abf..000000000 --- a/meta-agl-demo-control-panel/conf/layer.conf +++ /dev/null @@ -1,18 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH =. "${LAYERDIR}:" - -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILES_DYNAMIC += " \ - qt6-layer:${LAYERDIR}/dynamic-layers/meta-qt6/*/*/*.bbappend \ -" - -BBFILE_COLLECTIONS += "agldemocontrolpanel" -BBFILE_PATTERN_agldemocontrolpanel = "^${LAYERDIR}/" -BBFILE_PRIORITY_agldemocontrolpanel = "70" - -LAYERSERIES_COMPAT_agldemocontrolpanel = "scarthgap" - -LAYERDEPENDS_agldemocontrolpanel = "aglcore qt6-layer networking-layer" diff --git a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb b/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb deleted file mode 100644 index 0264ebbd7..000000000 --- a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "AGL certificates for KUKSA.val, the KUKSA Vehicle Abstraction Layer" -HOMEPAGE = "https://github.com/eclipse/kuksa.val" -BUGTRACKER = "https://github.com/eclipse/kuksa.val/issues" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI = "file://CA.pem \ - file://Client.key \ - file://Client.pem \ - file://Server.key \ - file://Server.pem \ - file://jwt.key.pub \ -" - -inherit allarch useradd - -USERADD_PACKAGES = "${PN}-server" -USERADDEXTENSION = "useradd-staticids" -GROUPADD_PARAM:${PN}-server = "-g 900 kuksa ;" - -do_install() { - # Install replacement CA certificate, server key + certificate, - # and client key + certificate. - # These are AGL specific versions generated using a tweaked - # genCerts.sh script to have different expiry dates than the - # upstream defaults, and use AGL as the organization. - install -d ${D}${sysconfdir}/kuksa-val/ - install -m 0644 ${WORKDIR}/CA.pem ${D}${sysconfdir}/kuksa-val/ - install -m 0640 -g 900 ${WORKDIR}/Server.key ${D}${sysconfdir}/kuksa-val/ - install -m 0640 -g 900 ${WORKDIR}/Server.pem ${D}${sysconfdir}/kuksa-val/ - install -m 0644 -g 900 ${WORKDIR}/jwt.key.pub ${D}${sysconfdir}/kuksa-val/ - install -m 0644 ${WORKDIR}/Client.key ${D}${sysconfdir}/kuksa-val/ - install -m 0644 ${WORKDIR}/Client.pem ${D}${sysconfdir}/kuksa-val/ -} - -PACKAGE_BEFORE_PN += "${PN}-ca ${PN}-server ${PN}-client" - -FILES:${PN}-ca = " \ - ${sysconfdir}/kuksa-val/CA.pem \ -" -RPROVIDES:${PN}-ca += "kuksa-val-certificates-ca" - -FILES:${PN}-server = " \ - ${sysconfdir}/kuksa-val/Server.key \ - ${sysconfdir}/kuksa-val/Server.pem \ - ${sysconfdir}/kuksa-val/jwt.key.pub \ -" -RPROVIDES:${PN}-server += "kuksa-val-certificates-server" -RDEPENDS:${PN}-server += "${PN}-ca" - -FILES:${PN}-client = " \ - ${sysconfdir}/kuksa-val/Client.key \ - ${sysconfdir}/kuksa-val/Client.pem \ -" -RPROVIDES:${PN}-client += "kuksa-val-certificates-client" -RDEPENDS:${PN}-client += "${PN}-ca" - -ALLOW_EMPTY:${PN} = "1" - -RDEPENDS:${PN} += "${PN}-ca ${PN}-server ${PN}-client" diff --git a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/CA.pem b/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/CA.pem deleted file mode 100644 index b3fa17d69..000000000 --- a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/CA.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID3zCCAscCFDixxnLKOE9pr9sDQynjRqX7u+TlMA0GCSqGSIb3DQEBCwUAMIGr -MQswCQYDVQQGEwJVUzEWMBQGA1UECAwNU2FuIEZyYW5jaXNjbzETMBEGA1UEBwwK -Q2FsaWZvcm5pYTEcMBoGA1UECgwTYXV0b21vdGl2ZWxpbnV4Lm9yZzEVMBMGA1UE -AwwMbG9jYWxob3N0LWNhMTowOAYJKoZIhvcNAQkBFithZ2wtZGV2LWNvbW11bml0 -eUBsaXN0cy5hdXRvbW90aXZlbGludXgub3JnMB4XDTIzMDcyMDIwMzg1NVoXDTMz -MDcxNzIwMzg1NVowgasxCzAJBgNVBAYTAlVTMRYwFAYDVQQIDA1TYW4gRnJhbmNp -c2NvMRMwEQYDVQQHDApDYWxpZm9ybmlhMRwwGgYDVQQKDBNhdXRvbW90aXZlbGlu -dXgub3JnMRUwEwYDVQQDDAxsb2NhbGhvc3QtY2ExOjA4BgkqhkiG9w0BCQEWK2Fn -bC1kZXYtY29tbXVuaXR5QGxpc3RzLmF1dG9tb3RpdmVsaW51eC5vcmcwggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDJZvopAg03G1TuyukI2QdVTzHQxnG -iPePMVIBAQ8M5tBWBOZxxkOgwRBTqZ1GJRvgPPediPHb3+/j+k5/+NE8TT2smDfk -4u9+NBNFXGhC9jqoEe0nkxca85RHP1Jx1iIp8SJ1TTtzEu4q/O/9bCnA+05NPLWQ -YbDZr++lR4Bwhpz0ZVD69uZE/7aXPKVoVQPyeiwNgP7sfn5XOx+THpYz2Lwl2ew/ -490Mm5Wrw5pQkq49s5On5tR7cdms3CWnVKe+qpeJo/ShZg8mJesMusZRLZ3slSPp -GMVBbdFPhIv0L4HFzoJcnEzo1j6+h7fhu4v5T2qNkCkBlxehqvsy3DwfAgMBAAEw -DQYJKoZIhvcNAQELBQADggEBALNHiz8a86sZv6Pii/rtrlctD2x1qIobOAjQID55 -/ylAVPc0JuzGEpc8Hcl9jQXBFz2ZBBYTEn0iAB+nn9BnxWYpF/G9LQsz61uzdJJs -0WlR3FyjN8PwCysMwzGEmG2BH43vfg9oltAKxY4rZ3l5c8eL/a9o2vDzNjKNibll -NdLB+8NkZz33pjyru1sG2lw6Y1gxhcOMSU7MuHgW1YI06slBu56e92OQt5atRc6l -rY9faELSJpLhtKYF9spsS/LsITJrKdVkMZRgqrhoWAIB9qyehtBGk+Agk8MvBba8 -nRAF332SyeLeN/ytJTbjOmcYVh9daGADdyRb5d+5ALBuutU= ------END CERTIFICATE----- diff --git a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Client.key b/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Client.key deleted file mode 100644 index 73b67f5c4..000000000 --- a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Client.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAyISsHMGwy8dvhx+tPQOGtgtb9YDWS0kRMPcOou3QlUjAcXmz -vT2dLIwOnnRYBS9nENDqI4x52yECUBwVNIvoeiZlQqjKhSr2BOpwJIgJgqeKr4he -sU9M9s3ODqR2sdUhv7e54sRYSFv5Hs35Horr3guSRh12FtWh+iLT2PI75jbi3KjP -mK4yZGJmoSQWh+q/vhB5CQtdAcA/08aoZnhyMOGqBMzmhr1PDm7UbzZIcp2Lxs3x -q3PBJq5eMF6N3S8ssETz7WOqX0vnBdgl4DhMYCVgrjppXzmcYYbkm4uluKVf8sR7 -cAbSaoUUft2G4mLXNBE1RJVpYrzHIQW7OphjqQIDAQABAoIBAGfnl+gu1hZCeiBi -4bpEIYIj0Lsez+yjKC1fWE5FPVieIlqq3eCqFNAIo2qojxPgxF+KYkmZeWt7Z19r -rfFUrlrdmos4O/lVkbZqZUII3CS//LWIzMjEdvVNIAGmZ3svHhXidohzheu4/RZh -VT3mbuLYzCtZCOA8Q3sCoRRCMZfQ3jrTEvak4xrgotihL3bEUOIrA8Tyv8AaAhmP -nIKV+0pS/d8xCkpIBmkNxVtNRAGvsQK5i7DsQYFEDKzbFjhXz7jRapfesAQACEgJ -0yLYKSoiHktuyHIPspj37BdTZva6vNkabJVcDKXMIuRd5xnypiygv7vo+onHJ5Rw -T9TzryECgYEA6oe9qYdiXsKygUji9W6rqYGPAl6o56nyAX6QrKnKhCQBmyVYgBB5 -YmehULzjK1Xvno5ophiBkojnCE8y99liEWZWnE9p2pr8O028ZfQficfbjWgkqmL5 -awmUTON40wK7QkpWj81YwbARYAQuC611R4MfzLWlnxxHacvBZc8x2j8CgYEA2t/a -s6dW2XuqfEgfS/oKI/9i1/CXnPFVAueAPCCl/Ee/QAGJMdmSf4yonnbnOycGMdSh -QGYUHb/PT7i04U+92T+rniprXn3QFz6iwF6X6nCkdlw9RxcWAOmg5l0yIoo9bp7J -LmVnbn2Y2TOy8/Djq47gypTH8H0VSVg5BjKgOBcCgYAG3giosSUpPyw46uhyZVYz -dW65lAoAFpLWhl04IRSj/+XoJBTOUy0qu3wWwCEqwK5uhx77VhZdMxMIxEDqzvu3 -JLb+hrjDxOwD1IfiuF5AC5EbN+Ry9Mj24GXuRm7gRuEy1LhqJ4okycIIfLbYcrDP -ckB5HwyFdy+EIoo8L+/2wwKBgQDallPJteaTvuCtzC2NaEK2XritZjdUYuR+yQqV -ghmjEVhcKOyGX37iaWyBDciyl6+lFnCQayHN8CCvwozKtCOrEt5nUH/4V3f5rvFF -Y3MejK6DEm2UUOcFtE2foxWNzze5AVV0Q4t/mmmLCgm/fCUz0baIOvxPHeyjWjth -CDBgswKBgQDj5QlFkdlgJvdJweHUSWm0vssFCgCucWEPgy5iOo4MDxEHq0r1AZWU -K5j1xabtD73K6JmO3ElvSELGAd1MlvRzeZMsSP8goCk3e8a85js2sRPwDxGHa0Dd -Ef7DoyFp6UIDOUAX6R2ylPyZYqM7bowoLdGIwh9jo8fZnvHn/UCw0w== ------END RSA PRIVATE KEY----- diff --git a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Client.pem b/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Client.pem deleted file mode 100644 index fcd92b6e5..000000000 --- a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Client.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEBjCCAu6gAwIBAgIUeUuog3JmZGhkE0nRcATDuclsVvkwDQYJKoZIhvcNAQEL -BQAwgasxCzAJBgNVBAYTAlVTMRYwFAYDVQQIDA1TYW4gRnJhbmNpc2NvMRMwEQYD -VQQHDApDYWxpZm9ybmlhMRwwGgYDVQQKDBNhdXRvbW90aXZlbGludXgub3JnMRUw -EwYDVQQDDAxsb2NhbGhvc3QtY2ExOjA4BgkqhkiG9w0BCQEWK2FnbC1kZXYtY29t -bXVuaXR5QGxpc3RzLmF1dG9tb3RpdmVsaW51eC5vcmcwHhcNMjMwNzIwMjAzODU1 -WhcNMjcwNzE5MjAzODU1WjCBpTELMAkGA1UEBhMCVVMxFjAUBgNVBAgMDVNhbiBG -cmFuY2lzY28xEzARBgNVBAcMCkNhbGlmb3JuaWExHDAaBgNVBAoME2F1dG9tb3Rp -dmVsaW51eC5vcmcxDzANBgNVBAMMBkNsaWVudDE6MDgGCSqGSIb3DQEJARYrYWds -LWRldi1jb21tdW5pdHlAbGlzdHMuYXV0b21vdGl2ZWxpbnV4Lm9yZzCCASIwDQYJ -KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMiErBzBsMvHb4cfrT0DhrYLW/WA1ktJ -ETD3DqLt0JVIwHF5s709nSyMDp50WAUvZxDQ6iOMedshAlAcFTSL6HomZUKoyoUq -9gTqcCSICYKniq+IXrFPTPbNzg6kdrHVIb+3ueLEWEhb+R7N+R6K694LkkYddhbV -ofoi09jyO+Y24tyoz5iuMmRiZqEkFofqv74QeQkLXQHAP9PGqGZ4cjDhqgTM5oa9 -Tw5u1G82SHKdi8bN8atzwSauXjBejd0vLLBE8+1jql9L5wXYJeA4TGAlYK46aV85 -nGGG5JuLpbilX/LEe3AG0mqFFH7dhuJi1zQRNUSVaWK8xyEFuzqYY6kCAwEAAaMm -MCQwIgYDVR0RBBswGYIGQ2xpZW50gglsb2NhbGhvc3SHBH8AAAEwDQYJKoZIhvcN -AQELBQADggEBAGtM7LGk4PhEgrjLXr7tdRn/VSwUv+HLDmtgkMFsAqYolTwtK7eK -1XgNF2j6Yo4ma/efd8Td9wjKkrfkxQRCpM5gjNLhiZsBRO/HW4GiC3GKz0ELijE2 -7JU7xikawSE6Zvvj1t33KJ5uGDowv2tvDbCB76ecGohTb5O7mpe+fxMlt+d4vPku -uTfAaNfl8+oSo7suy3842ANpxteoxfVHZgG0FjdMKjSKxCyxI3buLltlQ7G+39QS -/cwuRTOp0UNPpiHWDKVOXL8qW/ZHpocGFlErstEQjUz+3/WglMlTK07ocRVQjQc6 -mAo4aKRaaHi5Khn+KPrRDnS+Rl8xEzSsBeo= ------END CERTIFICATE----- diff --git a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Server.key b/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Server.key deleted file mode 100644 index 8b9c6ac66..000000000 --- a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Server.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAzGvmH7adlcMVdfblKg56EkgiSkR45IrRaIMH/AKUcK/4EJdk -Jx3NoHuYuiTTreiovt9b5FjqV8txuJ579e4O9GyDELN1r9stR5y8zEbFQuf8afxK -Bl0JPnhXOxi7nUq92rn0H7jpm0a9WQvmbdRsFVfafNoeC4Dz1PeGMN4tHYtHHCnq -Ye5Sr7yT/eZ8RMUoXB560akRctA/pQWEwYbNps02HJs+jeNsJuXTgXpsirTy2RR5 -TKLmZjQMovxW85zYpSS9fRprwpzqeHhWbJBWWNeP8Y20nkRbAaAktc8IrlmhFMLh -4n0L1B0s0+Xn/9kt98pNSDCJPzH6Ar4LoDPDfwIDAQABAoIBAAyG0CNBXYa/3aDM -8F4TZQeZxAApEf9vQkXVQbf/sHj3T4w0ur5q5R7gdAt0FkSh7TVFGqxzhmi63s0h -aRc471GrFJ0BYkTUeYHZ6PfbnlrrPFyCSUb6jIZ3eWD1swmAewHcQ0luW2JYg2Hh -iM1SJw1nxMvB0fWCgW6bfG2iL8GPmyrVyhyrfebZdEaUUnjvfqLWroIoBZ2B0roa -dZ/VDlXzN8wspyziCqlumiq+R3b9+abBtHLyG13DQAhVYGksbX+5W4s1Yy6nwG0S -yyRh2cK5c2MPrjqHmJr1GqlXItmEnqkjiVlg/qZDEyalWHcKFNGNaURSz7RWNwo2 -cWZv8AECgYEA/h76+2yjvYfDeZRiKRfN9imfT9F6T4VoGgfoZODIe6uLsOQOeiKR -lqjj6bdIP8CDsfcHhb38FblYsgm6GFZiROQafRjVfj2yWiasQszFTOzLDRqR8LNs -nZSUv7zlPziJ28VBs1DF5lZSNbzFXEKxAWdGAINC1POdKZOi2UCUwYECgYEAze7X -7ML1QV+ZipnszLiRvccQ7kMUw51g/hi0Fw//tkCC8FnsbR489GDb8l+V/IR9tNov -7y5cd/NRziGVUhXH67ZnXa2k5yRYxhFWQxpgEEUWUhsfYVqppMj7vMjcxVa85A0R -2hzI/kWWWWcowwuHSmuoU8xRZlNdA2cbefeBBP8CgYEArm8hpRhLxTu+CGS8hKyc -ak7j1mxaYt+WN9gZw7UwqQN2HfRNo7S67wn7eGChLXG+dJi3By0ELv1NTtiybyZM -yjExpZE4azF6jbtiH3BkNouMTfBhITJoajqlaIAHdMAgkUTz9lyJm7TBNbXgW5ZD -3ky/lnaDl52p0fJPpIVaFwECgYEAyhsRYTUJPGqVpxhf9Z9isY0wCZZeR4kqStZ1 -0HiMLxLrLvYh+gmGKxTwZ9P1wIlLUfYcuzGV4Mc1TwdYo+HqfmRa1+52e78JPQKA -1YSKKQ2U1Wn3BzXSbn4tyd6cBTSWV36YOaasgBhNcVqz/5BN6/Tyk6Nfc/x2ucM0 -jSQiRIMCgYADss1PeYdANwbw8n29mXEGkk6qfVh54MU/AoS2v6kk6fqAHNFsb9vJ -m3JkRYSh3kSKwKgD97oGMpbxLr0wVj69s4s8wPjhNo4RZALCB/sj9hra7rsoRzmQ -apSPbfLaWVZEqg3fj0gCamSq8PGjY4fA9RNHOB751M2oszpQb8bdpA== ------END RSA PRIVATE KEY----- diff --git a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Server.pem b/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Server.pem deleted file mode 100644 index 4b181e9a3..000000000 --- a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/Server.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEBjCCAu6gAwIBAgIUeUuog3JmZGhkE0nRcATDuclsVvgwDQYJKoZIhvcNAQEL -BQAwgasxCzAJBgNVBAYTAlVTMRYwFAYDVQQIDA1TYW4gRnJhbmNpc2NvMRMwEQYD -VQQHDApDYWxpZm9ybmlhMRwwGgYDVQQKDBNhdXRvbW90aXZlbGludXgub3JnMRUw -EwYDVQQDDAxsb2NhbGhvc3QtY2ExOjA4BgkqhkiG9w0BCQEWK2FnbC1kZXYtY29t -bXVuaXR5QGxpc3RzLmF1dG9tb3RpdmVsaW51eC5vcmcwHhcNMjMwNzIwMjAzODU1 -WhcNMjcwNzE5MjAzODU1WjCBpTELMAkGA1UEBhMCVVMxFjAUBgNVBAgMDVNhbiBG -cmFuY2lzY28xEzARBgNVBAcMCkNhbGlmb3JuaWExHDAaBgNVBAoME2F1dG9tb3Rp -dmVsaW51eC5vcmcxDzANBgNVBAMMBlNlcnZlcjE6MDgGCSqGSIb3DQEJARYrYWds -LWRldi1jb21tdW5pdHlAbGlzdHMuYXV0b21vdGl2ZWxpbnV4Lm9yZzCCASIwDQYJ -KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxr5h+2nZXDFXX25SoOehJIIkpEeOSK -0WiDB/wClHCv+BCXZCcdzaB7mLok063oqL7fW+RY6lfLcbiee/XuDvRsgxCzda/b -LUecvMxGxULn/Gn8SgZdCT54VzsYu51Kvdq59B+46ZtGvVkL5m3UbBVX2nzaHguA -89T3hjDeLR2LRxwp6mHuUq+8k/3mfETFKFweetGpEXLQP6UFhMGGzabNNhybPo3j -bCbl04F6bIq08tkUeUyi5mY0DKL8VvOc2KUkvX0aa8Kc6nh4VmyQVljXj/GNtJ5E -WwGgJLXPCK5ZoRTC4eJ9C9QdLNPl5//ZLffKTUgwiT8x+gK+C6Azw38CAwEAAaMm -MCQwIgYDVR0RBBswGYIGU2VydmVygglsb2NhbGhvc3SHBH8AAAEwDQYJKoZIhvcN -AQELBQADggEBAKLnUuIYKU7kX6hw2kWziAzvucZCwkKDnMK1/xqakcgfnFw+z8nu -XSqNsXX0KNBfy0xhZ66Uc9rL37RG+smidxJxy+QmDi3c/Ooqj7DxbZwVXzstnbBp -+iqgfqjadC8Glfci7cfCnl7X4O3oQqo99BJDo7JH3S39fe98mG4mXa1WblKiWnkc -yDtUnf7eFbFeNbVkL94HGzOtghShHokGyt9vZKyGf+szCPPWiIDldLq/CUpPFEnD -AqUhTYBXbHZNZJHAEJ0waJqLxmytt19mAv03aaIMYUpBR0CMvjfDNn5x2Bp86v3A -YW544bNsyHfbvK0ZqwvOaV3sIKG7Bzm2pOA= ------END CERTIFICATE----- diff --git a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/genCertsAGL.sh b/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/genCertsAGL.sh deleted file mode 100755 index b078fd1b2..000000000 --- a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/genCertsAGL.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - - -genCAKey() { - openssl genrsa -out CA.key 2048 -} - - -genCACert() { - openssl req -key CA.key -new -out CA.csr -subj "/C=US/ST=San Francisco/L=California/O=automotivelinux.org/CN=localhost-ca/emailAddress=agl-dev-community@lists.automotivelinux.org" - openssl x509 -signkey CA.key -in CA.csr -req -days 3650 -out CA.pem -} - -genKey() { - openssl genrsa -out $1.key 2048 -} - -genCert() { - openssl req -new -key $1.key -out $1.csr -passin pass:"temp" -subj "/C=US/ST=San Francisco/L=California/O=automotivelinux.org/CN=$1/emailAddress=agl-dev-community@lists.automotivelinux.org" - openssl x509 -req -in $1.csr -extfile <(printf "subjectAltName=DNS:$1,DNS:localhost,IP:127.0.0.1") -CA CA.pem -CAkey CA.key -CAcreateserial -days 1460 -out $1.pem - openssl verify -CAfile CA.pem $1.pem -} - -set -e -# Check if the CA is available, else make CA certificates -if [ -f "CA.key" ]; then - echo "Existing CA.key will be used" -else - echo "No CA.key found, will generate new key" - genCAKey - rm -f CA.pem - echo "" -fi - -# Check if the CA.pem is available, else generate a new CA.pem -if [ -f "CA.pem" ]; then - echo "CA.pem will not be regenerated" -else - echo "No CA.pem found, will generate new CA.pem" - genCACert - echo "" -fi - - -for i in Server Client; -do - if [ -f $i.key ]; then - echo "Existing $i.key will be used" - else - echo "No $i.key found, will generate new key" - genKey $i - fi - echo "" - echo "Generating $i.pem" - genCert $i - echo "" -done - diff --git a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/jwt.key.pub b/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/jwt.key.pub deleted file mode 100644 index d9f785341..000000000 --- a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl/jwt.key.pub +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA6ScE9EKXEWVyYhzfhfvg -+LC8NseiuEjfrdFx3HKkb31bRw/SeS0Rye0KDP7uzffwreKf6wWYGxVUPYmyKC7j -Pji5MpDBGM9r3pIZSvPUFdpTE5TiRHFBxWbqPSYt954BTLq4rMu/W+oq5Pdfnugb -voYpLf0dclBl1g9KyszkDnItz3TYbWhGMbsUSfyeSPzH0IADzLoifxbc5mgiR73N -CA/4yNSpfLoqWgQ2vdTM1182sMSmxfqSgMzIMUX/tiaXGdkoKITF1sULlLyWfTo9 -79XRZ0hmUwvfzr3OjMZNoClpYSVbKY+vtxHyux9KOOtv9lPMsgYIaPXvisrsneDZ -fCS0afOfjgR96uHIe2UPSGAXru3yGziqEfpRZoxsgXaOe905ordLD5bSX14xkN7N -Cz7rxDLlxPQyxp4Vhog7p/QeUyydBpZjq2bAE5GAJtiu+XGvG8RypzJFKFQwMNsw -g1BoZVD0mb0MtU8KQmHcZIfY0FVer/CR0mUjfl1rHbtoJB+RY03lQvYNAD04ibAG -NI1RhlTziu35Xo6NDEgs9hVs9k3WrtF+ZUxhivWmP2VXhWruRakVkC1NzKGh54e5 -/KlluFbBNpWgvWZqzWo9Jr7/fzHtR0Q0IZwkxh+Vd/bUZya1uLKqP+sTcc+aTHbn -AEiqOjPq0D6X45wCzIwjILUCAwEAAQ== ------END PUBLIC KEY----- diff --git a/meta-agl-demo-control-panel/recipes-graphics/wayland/weston-agl-driver-conf.bb b/meta-agl-demo-control-panel/recipes-graphics/wayland/weston-agl-driver-conf.bb deleted file mode 100644 index 763103d45..000000000 --- a/meta-agl-demo-control-panel/recipes-graphics/wayland/weston-agl-driver-conf.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Weston systemd configuration to run as agl-driver user" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit systemd allarch features_check - -REQUIRED_DISTRO_FEATURES = "wayland systemd" - -SRC_URI = "file://weston-agl-driver.conf" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - # Install override drop-in - install -d ${D}${systemd_system_unitdir}/weston.service.d - install -m 0644 ${WORKDIR}/weston-agl-driver.conf ${D}${systemd_system_unitdir}/weston.service.d/ -} - -FILES:${PN} += "${systemd_system_unitdir}" - -RDEPENDS:${PN} += "weston agl-users" diff --git a/meta-agl-demo-control-panel/recipes-graphics/wayland/weston-agl-driver-conf/weston-agl-driver.conf b/meta-agl-demo-control-panel/recipes-graphics/wayland/weston-agl-driver-conf/weston-agl-driver.conf deleted file mode 100644 index 75ab576ad..000000000 --- a/meta-agl-demo-control-panel/recipes-graphics/wayland/weston-agl-driver-conf/weston-agl-driver.conf +++ /dev/null @@ -1,5 +0,0 @@ -[Service] -User= -User=agl-driver -Group= -Group=agl-driver diff --git a/meta-agl-demo-control-panel/recipes-platform/images/agl-demo-features.inc b/meta-agl-demo-control-panel/recipes-platform/images/agl-demo-features.inc deleted file mode 100644 index a8112c83d..000000000 --- a/meta-agl-demo-control-panel/recipes-platform/images/agl-demo-features.inc +++ /dev/null @@ -1,10 +0,0 @@ -FEATURE_PACKAGES_can-test-tools = " \ - can-utils \ - cannelloni \ -" - -FEATURE_PACKAGES_kuksa-val-databroker-client = " \ - kuksa-certificates-agl-ca \ - ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'packagegroup-agl-kuksa-val-databroker-devel' , '', d)} \ -" -FEATURE_PACKAGES_kuksa-val-databroker = "packagegroup-agl-kuksa-val-databroker" diff --git a/meta-agl-demo-control-panel/recipes-platform/packagegroups/packagegroup-agl-networking.bb b/meta-agl-demo-control-panel/recipes-platform/packagegroups/packagegroup-agl-networking.bb deleted file mode 100644 index 74f7757a5..000000000 --- a/meta-agl-demo-control-panel/recipes-platform/packagegroups/packagegroup-agl-networking.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "The networking for AGL" -DESCRIPTION = "A set of packages for AGL cluster's networking" - -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-networking \ - " - -ALLOW_EMPTY:${PN} = "1" - - -# fonts -RDEPENDS:${PN}:append = " \ - connman \ - connman-client \ - connman-tools \ - iproute2 \ -" diff --git a/meta-agl-demo-control-panel/recipes-demo/agl-demo-control-panel/agl-demo-control-panel_git.bb b/recipes-demo/agl-demo-control-panel/agl-demo-control-panel_git.bb similarity index 100% rename from meta-agl-demo-control-panel/recipes-demo/agl-demo-control-panel/agl-demo-control-panel_git.bb rename to recipes-demo/agl-demo-control-panel/agl-demo-control-panel_git.bb diff --git a/meta-agl-demo-control-panel/recipes-demo/agl-demo-control-panel/files/agl-demo-control-panel.service b/recipes-demo/agl-demo-control-panel/files/agl-demo-control-panel.service similarity index 100% rename from meta-agl-demo-control-panel/recipes-demo/agl-demo-control-panel/files/agl-demo-control-panel.service rename to recipes-demo/agl-demo-control-panel/files/agl-demo-control-panel.service diff --git a/recipes-devtools/python/python3-pyqt6_%.bbappend b/recipes-devtools/python/python3-pyqt6_%.bbappend new file mode 100644 index 000000000..eaed7b3c8 --- /dev/null +++ b/recipes-devtools/python/python3-pyqt6_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'python3-pyqt6_agldemo.inc', '', d)} diff --git a/meta-agl-demo-control-panel/dynamic-layers/meta-qt6/recipes-python/pyqt6/python3-pyqt6_%.bbappend b/recipes-devtools/python/python3-pyqt6_agldemo.inc similarity index 100% rename from meta-agl-demo-control-panel/dynamic-layers/meta-qt6/recipes-python/pyqt6/python3-pyqt6_%.bbappend rename to recipes-devtools/python/python3-pyqt6_agldemo.inc diff --git a/meta-agl-demo-control-panel/recipes-platform/images/agl-ivi-demo-control-panel-preconfigured-gateway.bb b/recipes-platform/images/agl-ivi-demo-control-panel-preconfigured-gateway.bb similarity index 100% rename from meta-agl-demo-control-panel/recipes-platform/images/agl-ivi-demo-control-panel-preconfigured-gateway.bb rename to recipes-platform/images/agl-ivi-demo-control-panel-preconfigured-gateway.bb diff --git a/meta-agl-demo-control-panel/recipes-platform/images/agl-ivi-demo-control-panel-preconfigured.bb b/recipes-platform/images/agl-ivi-demo-control-panel-preconfigured.bb similarity index 100% rename from meta-agl-demo-control-panel/recipes-platform/images/agl-ivi-demo-control-panel-preconfigured.bb rename to recipes-platform/images/agl-ivi-demo-control-panel-preconfigured.bb diff --git a/meta-agl-demo-control-panel/recipes-platform/images/agl-ivi-demo-control-panel.bb b/recipes-platform/images/agl-ivi-demo-control-panel.bb similarity index 100% rename from meta-agl-demo-control-panel/recipes-platform/images/agl-ivi-demo-control-panel.bb rename to recipes-platform/images/agl-ivi-demo-control-panel.bb diff --git a/templates/feature/agl-demo-control-panel/50_bblayers.conf.inc b/templates/feature/agl-demo-control-panel/50_bblayers.conf.inc deleted file mode 100644 index a583f9785..000000000 --- a/templates/feature/agl-demo-control-panel/50_bblayers.conf.inc +++ /dev/null @@ -1,12 +0,0 @@ -# This layer contains the WIP feature/demo code only -#--------------------------------------------------- -BBLAYERS =+ " \ - ${METADIR}/meta-agl-demo/meta-agl-demo-control-panel \ -" - -#AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems" -#AGL_META_MULTIMEDIA = "${METADIR}/external/meta-openembedded/meta-multimedia" -AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking" -AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" -AGL_META_QT6 = "${METADIR}/external/meta-qt6" -AGL_META_CLANG = " ${METADIR}/external/meta-clang " diff --git a/templates/feature/agl-demo-control-panel/50_local.conf.inc b/templates/feature/agl-demo-control-panel/50_local.conf.inc deleted file mode 100644 index 54e9a699e..000000000 --- a/templates/feature/agl-demo-control-panel/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -#see meta-agl-demo/conf/include/agl-demo.inc -#require conf/include/agl-demo-control-panel.inc diff --git a/templates/feature/agl-demo-control-panel/README_feature_agl-demo-control-panel.md b/templates/feature/agl-demo-control-panel/README_feature_agl-demo-control-panel.md deleted file mode 100644 index 31883cd69..000000000 --- a/templates/feature/agl-demo-control-panel/README_feature_agl-demo-control-panel.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -description: Feature agl-demo -authors: Jan-Simon Möller , Martin Kelly , Matt Ranostay , Philippe Coval , Ronan Le Martret , Stephane Desneux ---- - -### Feature agl-demo - -*Description is missing - please complete file meta-agl-demo/templates/feature/agl-demo/README_feature_agl-demo.md* - -#### Dependent features pulled by agl-demo - -The following features are pulled: - -* agl-profile-graphical-qt5 -* agl-pipewire - diff --git a/templates/feature/agl-demo-control-panel/included.dep b/templates/feature/agl-demo-control-panel/included.dep deleted file mode 100644 index 4d7582cde..000000000 --- a/templates/feature/agl-demo-control-panel/included.dep +++ /dev/null @@ -1 +0,0 @@ -agl-kuksa-val -- 2.16.6