diff options
Diffstat (limited to 'meta-agl-ic-container')
62 files changed, 485 insertions, 632 deletions
diff --git a/meta-agl-ic-container/conf/layer.conf b/meta-agl-ic-container/conf/layer.conf index 7b715454..178d6f74 100644 --- a/meta-agl-ic-container/conf/layer.conf +++ b/meta-agl-ic-container/conf/layer.conf @@ -21,4 +21,4 @@ BBFILES_DYNAMIC += " \ " LAYERSERIES_COMPAT_aglcontainermc = "scarthgap" -LAYERDEPENDS_aglcontainermc = "aglcore qt5-layer openembedded-layer virtualization-layer agl-drm-lease meta-pipewire" +LAYERDEPENDS_aglcontainermc = "aglcore qt6-layer openembedded-layer virtualization-layer agl-drm-lease meta-pipewire" diff --git a/meta-agl-ic-container/recipes-core/systemd/systemd-netif-config/21-usb.network b/meta-agl-ic-container/recipes-core/systemd/systemd-netif-config/21-usb.network new file mode 100644 index 00000000..6426a64d --- /dev/null +++ b/meta-agl-ic-container/recipes-core/systemd/systemd-netif-config/21-usb.network @@ -0,0 +1,6 @@ +[Match] +Name=usb0 + +[Network] +DHCP=ipv4 + diff --git a/meta-agl-ic-container/recipes-core/systemd/systemd-netif-config_0.1.bb b/meta-agl-ic-container/recipes-core/systemd/systemd-netif-config_0.1.bb index 52e5415c..4024c278 100644 --- a/meta-agl-ic-container/recipes-core/systemd/systemd-netif-config_0.1.bb +++ b/meta-agl-ic-container/recipes-core/systemd/systemd-netif-config_0.1.bb @@ -7,11 +7,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = " \ file://20-wired.network \ file://21-wired.network \ + file://21-usb.network \ " do_install() { install -D -m0644 ${WORKDIR}/20-wired.network ${D}${sysconfdir}/systemd/network/20-wired.network install -D -m0644 ${WORKDIR}/21-wired.network ${D}${sysconfdir}/systemd/network/21-wired.network + install -D -m0644 ${WORKDIR}/21-usb.network ${D}${sysconfdir}/systemd/network/21-usb.network } PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster index 53a662be..f31a5d8f 100644 --- a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster +++ b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster @@ -1,9 +1,7 @@ -XDG_RUNTIME_DIR=/run/user/0 -QT_QPA_PLATFORM=wayland-egl +QT_QPA_PLATFORM=eglfs +QT_QPA_EGLFS_DRMLEASE=lease +QT_QPA_EGLFS_HIDECURSOR=1 +DLM_RUNTIME_PATH=/var/display/drm-lease-manager QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ QT_WAYLAND_DISABLE_WINDOWDECORATION=1 QT_QPA_FONTDIR=/usr/share/fonts/truetype -QT_WAYLAND_SHELL_INTEGRATION=xdg-shell -QML_IMPORT_PATH=/usr/lib/qml/ -QML2_IMPORT_PATH=/usr/lib/qml/ -WAYLAND_DISPLAY=wayland-1 diff --git a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster.service b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster.service index 83e957e5..9696d48a 100644 --- a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster.service +++ b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster.service @@ -1,7 +1,7 @@ [Unit] Description=AGL Cluster Reference GUI -After=multi-user.target weston.service -PartOf=cluster-service.service weston.service +After=multi-user.target +PartOf=cluster-service.service [Service] EnvironmentFile=/etc/default/cluster diff --git a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bb b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bb index d7cb85f9..7ab65235 100644 --- a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bb +++ b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bb @@ -13,11 +13,11 @@ SRC_URI = "git://git.automotivelinux.org/src/cluster-refgui;protocol=https;branc file://cluster.service \ file://cluster \ " -SRCREV = "cbb63f0e45340f6dd2cc9f360ed4da15c745186f" +SRCREV = "5c8f09d2c3c99f621b467ed5c1be4fac3a708e85" S = "${WORKDIR}/git" -inherit cmake cmake_qt5 systemd pkgconfig +inherit cmake qt6-cmake systemd pkgconfig # NOTE: # The app currently assumes the mp4 video file is in the same @@ -42,9 +42,6 @@ RDEPENDS:${PN} = " \ qtbase \ qtdeclarative \ qt3d \ - qtgraphicaleffects \ qtmultimedia \ - qtquickcontrols \ - qtquickcontrols2 \ qtwayland \ " diff --git a/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json.in b/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json.in deleted file mode 100644 index c241b788..00000000 --- a/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json.in +++ /dev/null @@ -1,70 +0,0 @@ -{ - "screen": [ - { - "name": "ivi-screen", - "dispname": "@DRM_IVI_DEVICE@" - } - ], - "layer": [ - { - "name": "ivi-layer", - "id": 2000, - "width": 1920, - "height": 1080, - "x": 0, - "y": 0, - "z": 10, - "attach": "ivi-screen" - } - ], - "surface": [ - { - "name": "momiscreen", - "id": 2000, - "x": 0, - "y": 988, - "z": 10, - "attach": "ivi-layer" - }, - { - "name": "mominavi", - "id": 2010, - "x": 0, - "y": 0, - "z": 100, - "attach": "ivi-layer" - }, - { - "name": "momiplay", - "id": 2011, - "x": 0, - "y": 0, - "z": 110, - "attach": "ivi-layer" - }, - { - "name": "momiradio", - "id": 2012, - "x": 0, - "y": 0, - "z": 120, - "attach": "ivi-layer" - }, - { - "name": "momisetting", - "id": 2013, - "x": 0, - "y": 0, - "z": 130, - "attach": "ivi-layer" - }, - { - "name": "xdg-test", - "id": 9801, - "x": 0, - "y": 0, - "z": 300, - "attach": "ivi-layer" - } - ] -} diff --git a/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/ilm-manager.service b/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/ilm-manager.service deleted file mode 100644 index b91b65f1..00000000 --- a/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/ilm-manager.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Tiny Window Manager -After=weston.service -Wants=weston.service - -[Service] -Type=simple -EnvironmentFile=/etc/default/weston -ExecStart=/usr/bin/ilmmanager - -[Install] -WantedBy=weston.service diff --git a/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager_git.bb b/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager_git.bb deleted file mode 100644 index 072613fc..00000000 --- a/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager_git.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Tiny window manager for wayland-ivi-extension" -DESCRIPTION = "Tiny window manager for wayland-ivi-extension" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=89aea4e17d99a7cacdbeed46a0096b10" - -DEPENDS = "jsoncpp wayland-ivi-extension" - -PV = "0.1.0+rev${SRCPV}" - -SRCREV = "e3a33d47195e4656f7117753d27a0f2d6b21aab9" -SRC_URI = " \ - git://github.com/AGLExport/ilm-manager.git;branch=master;protocol=https \ - file://agl.json.in \ - file://ilm-manager.service \ - " -S = "${WORKDIR}/git" - -inherit autotools pkgconfig systemd - -DRM_IVI_DEVICE = "HDMI-A-1" -DRM_IVI_DEVICE:qemuall = "Virtual-1" - -do_install:append() { - #install scripts - - sed 's|@DRM_IVI_DEVICE@|${DRM_IVI_DEVICE}|g' \ - ${WORKDIR}/agl.json.in > ${B}/agl.json - - install -d ${D}${sysconfdir} - install -m 0644 ${B}/agl.json ${D}${sysconfdir} - - install -d ${D}/${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/ilm-manager.service ${D}${systemd_system_unitdir} -} - -FILES:${PN} += " ${systemd_system_unitdir} ${sysconfdir} " -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "ilm-manager.service" diff --git a/meta-agl-ic-container/recipes-demo/momikey/files/momikey.sh b/meta-agl-ic-container/recipes-demo/momikey/files/momikey.sh index d0e0b0b6..5672ee93 100644 --- a/meta-agl-ic-container/recipes-demo/momikey/files/momikey.sh +++ b/meta-agl-ic-container/recipes-demo/momikey/files/momikey.sh @@ -16,10 +16,6 @@ while sleep 1 ;do evtest /dev/input/by-id/usb-wch.cn_CH57x-event-kbd ;done | whi cmcontrol --change-active-guest-name=agl-momi-ivi-demo cmcontrol --shutdown-guest-role=ivi ;; - KEY_H) - cmcontrol --change-active-guest-name=agl-html5-ivi-demo - cmcontrol --shutdown-guest-role=ivi - ;; KEY_C) cmcontrol --force-reboot-guest-role=ivi ;; diff --git a/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi b/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi index a683c9d5..f8693419 100644 --- a/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi +++ b/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi @@ -1,10 +1,10 @@ XDG_RUNTIME_DIR=/run/user/0 QT_QPA_PLATFORM=wayland-egl -QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ QT_WAYLAND_DISABLE_WINDOWDECORATION=1 -QT_QPA_FONTDIR=/usr/share/fonts/truetype QT_IVI_SURFACE_ID=2010 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell +QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ +QT_QPA_FONTDIR=/usr/share/fonts/truetype QML_IMPORT_PATH=/usr/lib/qml/ QML2_IMPORT_PATH=/usr/lib/qml/ -WAYLAND_DISPLAY=wayland-1 +HOME=/home/root diff --git a/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi.service b/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi.service index b49609e0..1be3ceab 100644 --- a/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi.service +++ b/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi.service @@ -1,12 +1,15 @@ [Unit] Description=mominavi -After=multi-user.target weston.service network-online.target -Requires=multi-user.target weston.service network-online.target +After=multi-user.target momiscreen.service network-online.target +Requires=multi-user.target momiscreen.service network-online.target [Service] Type=simple EnvironmentFile=/etc/default/mominavi +EnvironmentFile=-/etc/default/qtwayland-common ExecStart=/usr/bin/mominavi +Restart=on-failure +RestartSec=1s [Install] WantedBy=multi-user.target diff --git a/meta-agl-ic-container/recipes-demo/mominavi/mominavi_git.bb b/meta-agl-ic-container/recipes-demo/mominavi/mominavi_git.bb index f9b36f9f..ec5463e2 100644 --- a/meta-agl-ic-container/recipes-demo/mominavi/mominavi_git.bb +++ b/meta-agl-ic-container/recipes-demo/mominavi/mominavi_git.bb @@ -6,36 +6,29 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = " \ qtbase \ - qtquickcontrols2 \ + qtdeclarative \ + qtwayland \ qtlocation \ - qtgraphicaleffects \ qtsvg \ qtwebsockets \ " -PV = "1.0.0" +PV = "2.0.0" SRC_URI = "git://git.automotivelinux.org/apps/mominavi;protocol=https;branch=${AGL_BRANCH} \ file://mominavi.service \ file://mominavi \ " -SRCREV = "10c3f7996d4bbe04d237baff2ef16573bc9eb9ed" +SRCREV = "e36c747c21907b154d6170132933d5ee6d0596eb" S = "${WORKDIR}/git" -inherit qmake5 systemd +inherit qt6-qmake systemd -MOMIMAP_MAPBOX_ACCESS_TOKEN ??= "YOU_NEED_TO_SET_IT_IN_LOCAL_CONF" -MOMIMAP_MAPBOX_STYLE ??= "mapbox://styles/wata2ki/ckoy853ue11a117nss0uxut76" MOMIMAP_INITIAL_LATITUDE ??= "36.129" MOMIMAP_INITIAL_LONGITUDE ??= "-115.1533" QT_INSTALL_PREFIX = "/usr" -do_configure:prepend() { - if [ "${MOMIMAP_MAPBOX_ACCESS_TOKEN}" = "YOU_NEED_TO_SET_IT_IN_LOCAL_CONF" ]; then - bbwarn "WARNING: You should set MapBox development key to MOMIMAP_MAPBOX_ACCESS_TOKEN variable in local.conf." - fi -} do_install:append() { install -d ${D}/${systemd_unitdir}/system install -m 0644 ${WORKDIR}/mominavi.service ${D}/${systemd_unitdir}/system @@ -43,8 +36,6 @@ do_install:append() { install -m 0755 -d ${D}${sysconfdir}/default/ install -m 0755 ${WORKDIR}/mominavi ${D}${sysconfdir}/default/ - echo 'MOMIMAP_MAPBOX_ACCESS_TOKEN=${MOMIMAP_MAPBOX_ACCESS_TOKEN}' >> ${D}${sysconfdir}/default/mominavi - echo 'MOMIMAP_MAPBOX_STYLE=${MOMIMAP_MAPBOX_STYLE}' >> ${D}${sysconfdir}/default/mominavi echo 'MOMIMAP_INITIAL_LATITUDE=${MOMIMAP_INITIAL_LATITUDE}' >> ${D}${sysconfdir}/default/mominavi echo 'MOMIMAP_INITIAL_LONGITUDE=${MOMIMAP_INITIAL_LONGITUDE}' >> ${D}${sysconfdir}/default/mominavi } diff --git a/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay b/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay index 62c21af9..9dfce0dc 100644 --- a/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay +++ b/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay @@ -1,11 +1,10 @@ XDG_RUNTIME_DIR=/run/user/0 QT_QPA_PLATFORM=wayland-egl -QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ QT_WAYLAND_DISABLE_WINDOWDECORATION=1 -QT_QPA_FONTDIR=/usr/share/fonts/truetype QT_IVI_SURFACE_ID=2011 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell +QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ +QT_QPA_FONTDIR=/usr/share/fonts/truetype QML_IMPORT_PATH=/usr/lib/qml/ QML2_IMPORT_PATH=/usr/lib/qml/ -WAYLAND_DISPLAY=wayland-1 HOME=/home/root diff --git a/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay.service b/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay.service index ef974023..69d08176 100644 --- a/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay.service +++ b/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay.service @@ -1,12 +1,15 @@ [Unit] Description=momiplayer -After=multi-user.target weston.service -Requires=multi-user.target weston.service +After=multi-user.target momiscreen.service +Requires=multi-user.target momiscreen.service [Service] Type=simple EnvironmentFile=/etc/default/momiplay +EnvironmentFile=-/etc/default/qtwayland-common ExecStart=/usr/bin/momiplay +Restart=on-failure +RestartSec=1s [Install] WantedBy=multi-user.target diff --git a/meta-agl-ic-container/recipes-demo/momiplay/momiplay_git.bb b/meta-agl-ic-container/recipes-demo/momiplay/momiplay_git.bb index b4e17ffa..793e0f3f 100644 --- a/meta-agl-ic-container/recipes-demo/momiplay/momiplay_git.bb +++ b/meta-agl-ic-container/recipes-demo/momiplay/momiplay_git.bb @@ -1,30 +1,29 @@ SUMMARY = "Momiyama mediaplayer example based on AGL sample app. at CC" DESCRIPTION = "The momiplay is a mediaplayer example based on AGL sample app. \ The momiplay is not require agl-appfw." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=17;md5=f4ad6901289f57f62d15bfefb5cc3633" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=17;md5=24274715d08cb2416c20d2907d19f413" DEPENDS = " \ + qttools-native \ qtbase \ - qtquickcontrols2 \ - qtgraphicaleffects \ + qtdeclarative \ + qtwayland \ qtsvg \ qtmultimedia \ " -PV = "1.0.0" +PV = "2.0.0" SRC_URI = "git://git.automotivelinux.org/apps/momiplayer;protocol=https;branch=${AGL_BRANCH} \ file://momiplay.service \ file://momiplay \ " -SRCREV = "cb21f0fe4259c3b427ef7b2dd2c43fa73369ae42" +SRCREV = "e22a2d57ec08bfff591a0bc3494d359e80830791" S = "${WORKDIR}/git" -inherit qmake5 systemd - -QT_INSTALL_PREFIX = "/usr" +inherit cmake qt6-cmake systemd pkgconfig do_install:append() { install -d ${D}/${systemd_unitdir}/system @@ -40,7 +39,6 @@ FILES:${PN} += " \ " SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "momiplay.service" -SYSTEMD_AUTO_ENABLE:${PN} = "disable" RDEPENDS:${PN} = " \ qtsvg qtsvg-plugins qtsvg-qmlplugins \ diff --git a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen index d10b9da4..c580380b 100644 --- a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen +++ b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen @@ -1,11 +1,9 @@ -XDG_RUNTIME_DIR=/run/user/0 -QT_QPA_PLATFORM=wayland-egl -QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ +QT_QPA_PLATFORM=eglfs +QT_QPA_EGLFS_DRMLEASE=lease +QT_QPA_EGLFS_HIDECURSOR=1 +DLM_RUNTIME_PATH=/var/display/drm-lease-manager QT_WAYLAND_DISABLE_WINDOWDECORATION=1 +QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ QT_QPA_FONTDIR=/usr/share/fonts/truetype -QT_IVI_SURFACE_ID=2000 -QT_WAYLAND_SHELL_INTEGRATION=ivi-shell -QML_IMPORT_PATH=/usr/lib/qml/ -QML2_IMPORT_PATH=/usr/lib/qml/ -WAYLAND_DISPLAY=wayland-1 +XDG_RUNTIME_DIR=/run/user/0 HOME=/home/root diff --git a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen.service b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen.service index a3f54e0c..ad68240d 100644 --- a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen.service +++ b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen.service @@ -1,12 +1,15 @@ [Unit] -Description=momiscreen -After=multi-user.target weston.service -Requires=multi-user.target weston.service +Description=Homescreen for AGL Momi IVI +After=multi-user.target +Requires=multi-user.target [Service] Type=simple EnvironmentFile=/etc/default/momiscreen +EnvironmentFile=-/etc/default/qtwayland-common ExecStart=/usr/bin/momiscreen +Restart=on-failure +StartLimitInterval=0 [Install] WantedBy=multi-user.target diff --git a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen_git.bb b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen_git.bb index 568eb066..ca642468 100644 --- a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen_git.bb +++ b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen_git.bb @@ -1,29 +1,26 @@ -SUMMARY = "Momiyama home screen example" -DESCRIPTION = "The momiscreen is a home screen example. \ - The momiscreen is not require agl-appfw." +SUMMARY = "Homescreen for AGL Momi IVI" +DESCRIPTION = "Homescreen for AGL Momi IVI." LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = " \ + qttools-native \ qtbase \ - qtquickcontrols2 \ - qtgraphicaleffects \ - qtsvg \ - " + qtdeclarative \ + qtwayland \ +" -PV = "1.0.0" +PV = "2.0.0" SRC_URI = "git://git.automotivelinux.org/apps/momiscreen;protocol=https;branch=${AGL_BRANCH} \ file://momiscreen.service \ file://momiscreen \ " -SRCREV = "22b44f911bf6c53298055626cef671a24e9e9069" +SRCREV = "bfbac0b1f78962e19ceac8356a6c0c77ccce795b" S = "${WORKDIR}/git" -inherit qmake5 systemd - -QT_INSTALL_PREFIX = "/usr" +inherit cmake qt6-cmake systemd pkgconfig do_install:append() { install -d ${D}/${systemd_unitdir}/system @@ -33,11 +30,11 @@ do_install:append() { install -m 0755 ${WORKDIR}/momiscreen ${D}${sysconfdir}/default/ } -FILES:${PN} += " \ - ${systemd_unitdir} \ - ${sysconfdir}/*/* \ - " SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "momiscreen.service" -RDEPENDS:${PN} = "qtsvg qtsvg-plugins qtsvg-qmlplugins" +RDEPENDS:${PN} = " \ + qtbase \ + qtdeclarative \ + qtwayland \ +" diff --git a/meta-agl-ic-container/recipes-demo/momiweather/momiweather/momiweather b/meta-agl-ic-container/recipes-demo/momiweather/momiweather/momiweather new file mode 100644 index 00000000..df403b5d --- /dev/null +++ b/meta-agl-ic-container/recipes-demo/momiweather/momiweather/momiweather @@ -0,0 +1,10 @@ +XDG_RUNTIME_DIR=/run/user/0 +QT_QPA_PLATFORM=wayland-egl +QT_WAYLAND_DISABLE_WINDOWDECORATION=1 +QT_IVI_SURFACE_ID=2012 +QT_WAYLAND_SHELL_INTEGRATION=ivi-shell +QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ +QT_QPA_FONTDIR=/usr/share/fonts/truetype +QML_IMPORT_PATH=/usr/lib/qml/ +QML2_IMPORT_PATH=/usr/lib/qml/ +HOME=/home/root diff --git a/meta-agl-ic-container/recipes-demo/momiweather/momiweather/momiweather.service b/meta-agl-ic-container/recipes-demo/momiweather/momiweather/momiweather.service new file mode 100644 index 00000000..45640cc8 --- /dev/null +++ b/meta-agl-ic-container/recipes-demo/momiweather/momiweather/momiweather.service @@ -0,0 +1,15 @@ +[Unit] +Description=momiweather +After=multi-user.target momiscreen.service +Requires=multi-user.target momiscreen.service + +[Service] +Type=simple +EnvironmentFile=/etc/default/momiweather +EnvironmentFile=-/etc/default/qtwayland-common +ExecStart=/usr/bin/momiweather +Restart=on-failure +RestartSec=1s + +[Install] +WantedBy=multi-user.target diff --git a/meta-agl-ic-container/recipes-demo/momiweather/momiweather_git.bb b/meta-agl-ic-container/recipes-demo/momiweather/momiweather_git.bb new file mode 100644 index 00000000..8f366f36 --- /dev/null +++ b/meta-agl-ic-container/recipes-demo/momiweather/momiweather_git.bb @@ -0,0 +1,43 @@ +SUMMARY = "Momiyama weather application example." +DESCRIPTION = "AGL sample weather application for container integration." +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = " \ + qttools-native \ + qtbase \ + qtdeclarative \ + qtwayland \ + qtsvg \ + " + +PV = "1.0.0" + +SRC_URI = "git://github.com/AGLExport/momiweather.git;protocol=https;branch=main \ + file://momiweather.service \ + file://momiweather \ + " +SRCREV = "2f742360975c944c9c9190375ce828b2de185cfb" + +S = "${WORKDIR}/git" + +inherit cmake qt6-cmake systemd pkgconfig + +do_install:append() { + install -d ${D}/${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/momiweather.service ${D}/${systemd_unitdir}/system + + install -m 0755 -d ${D}${sysconfdir}/default/ + install -m 0755 ${WORKDIR}/momiweather ${D}${sysconfdir}/default/ +} + +FILES:${PN} += " \ + ${systemd_unitdir} \ + ${sysconfdir}/*/* \ + " +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "momiweather.service" + +RDEPENDS:${PN} = " \ + qtsvg qtsvg-plugins qtsvg-qmlplugins \ + " diff --git a/meta-agl-ic-container/recipes-demo/momiweb/files/momiweb.conf b/meta-agl-ic-container/recipes-demo/momiweb/files/momiweb.conf index 0343867e..e1ad514a 100644 --- a/meta-agl-ic-container/recipes-demo/momiweb/files/momiweb.conf +++ b/meta-agl-ic-container/recipes-demo/momiweb/files/momiweb.conf @@ -8,3 +8,7 @@ alias.url = ( "/cgi-bin" => "/www/cgi-bin" ) $HTTP["url"] =~ "^/cgi-bin" { cgi.assign = ( ".cgi" => "/bin/sh") } +setenv.set-response-header = ( + "x-content-type-options" => "nosniff", +) +mimetype.assign += ( ".svg" => "image/svg+xml" ) diff --git a/meta-agl-ic-container/recipes-demo/momiweb/momiweb_git.bb b/meta-agl-ic-container/recipes-demo/momiweb/momiweb_git.bb index 0de33dd9..b95240ac 100644 --- a/meta-agl-ic-container/recipes-demo/momiweb/momiweb_git.bb +++ b/meta-agl-ic-container/recipes-demo/momiweb/momiweb_git.bb @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464" PV = "0.1.0" -SRC_URI = "git://github.com/agl-ic-eg/momiweb.git;protocol=https;branch=main \ +SRC_URI = "git://github.com/agl-ic-eg/momiweb.git;protocol=https;branch=agl-master \ file://momiweb.conf \ " -SRCREV = "cfdfdd670a83558a408bafa7b0262381313b907d" +SRCREV = "e720ea92df37da05ba33fc7abb4c4822f58dbcf1" S = "${WORKDIR}/git" diff --git a/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-ic-qt.bb b/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-ic-qt.bb index 37afbfb2..dabe9a0c 100644 --- a/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-ic-qt.bb +++ b/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-ic-qt.bb @@ -13,11 +13,8 @@ PACKAGES = "\ " RDEPENDS:${PN} += "\ qtbase qtbase-plugins qtbase-qmlplugins \ - qtdeclarative qtdeclarative-plugins qtdeclarative-qmlplugins \ - qtgraphicaleffects qtgraphicaleffects-plugins qtgraphicaleffects-qmlplugins \ - qtmultimedia qtmultimedia-plugins qtmultimedia-qmlplugins \ - qtquickcontrols qtquickcontrols-plugins qtquickcontrols-qmlplugins \ - qtquickcontrols2 qtquickcontrols2-plugins qtquickcontrols2-qmlplugins \ - qtwayland qtwayland-plugins qtwayland-qmlplugins \ - qt3d qt3d-plugins qt3d-qmlplugins \ + qtdeclarative qtdeclarative-qmlplugins \ + qt3d qt3d-plugins qt3d-qmlplugins\ + qtquick3d qtquick3d \ + qt5compat qt5compat-qmlplugins \ " diff --git a/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-momi-ivi-qt.bb b/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-momi-ivi-qt.bb new file mode 100755 index 00000000..df891428 --- /dev/null +++ b/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-momi-ivi-qt.bb @@ -0,0 +1,36 @@ +SUMMARY = "AGL Instrument Cluster Demo Qt Packages" +DESCRIPTION = "This pacage group including Qt packages for AGL Instrument Cluster Demo." +HOMEPAGE = "https://confluence.automotivelinux.org/display/IC" + +LICENSE = "Apache-2.0" + +PACKAGE_ARCH = "${TUNE_PKGARCH}" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-momi-ivi-qt \ +" +RDEPENDS:${PN} += "\ + qtbase qtbase-plugins qtbase-qmlplugins \ + qtdeclarative qtdeclarative-qmlplugins \ + qt3d qt3d-plugins qt3d-qmlplugins\ + qtquick3d qtquick3d \ + qtwayland qtwayland-plugins qtwayland-qmlplugins \ + qtlocation qtlocation-plugins qtlocation-qmlplugins \ + qtpositioning qtpositioning-plugins qtpositioning-qmlplugins \ + qtsvg qtsvg-plugins qtsvg-qmlplugins \ + qtmultimedia qtmultimedia-plugins qtmultimedia-qmlplugins \ + \ + gstreamer1.0 \ + gstreamer1.0-plugins-base-meta \ + gstreamer1.0-plugins-good-meta \ + gstreamer1.0-plugins-bad-meta \ + gstreamer1.0-plugins-ugly-meta \ + gstreamer1.0-libav \ + \ + pulseaudio-server pulseaudio-pa-info pulseaudio-misc \ + pulseaudio-module-alsa-sink pulseaudio-module-alsa-source \ + pulseaudio-module-native-protocol-unix pulseaudio-module-loopback \ + pulseaudio-module-null-sink pulseaudio-module-null-source \ +" diff --git a/meta-agl-ic-container/recipes-demo/pre-install/pre-install-video-data.bb b/meta-agl-ic-container/recipes-demo/pre-install/pre-install-video-data.bb new file mode 100644 index 00000000..e461fd9a --- /dev/null +++ b/meta-agl-ic-container/recipes-demo/pre-install/pre-install-video-data.bb @@ -0,0 +1,31 @@ +SUMMARY = "Demo video data for AGL demo" +DESCRIPTION = "AGL demo video data aim to show demo information by video." +HOMEPAGE = "https://github.com/agl-ic-eg/ic-demo-video" +SECTION = "Multimedia" +LICENSE = "CC-BY-NC-ND-4.0" +LIC_FILES_CHKSUM = "file://CC-BY-NC-ND-4.0;md5=afe664d64109562c3fa9c309bd7f73bc" + +SRC_URI = " \ + git://github.com/agl-ic-eg/ic-demo-video.git;branch=master;protocol=https \ +" +SRCREV = "a58624c3e721330d11d389a68c58bfe8f2e05a41" + +inherit allarch + +S = "${WORKDIR}/git" + +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +do_compile[noexec] = "1" +do_install() { + install -d ${D}/home/root/Music + cp ${S}/ic-container-ces2024.mp4 ${D}/home/root/Music/ +} + +PACKAGES = "\ + ${PN} \ +" + +FILES:${PN} = " \ + /home/root/Music/* \ +" diff --git a/meta-agl-ic-container/recipes-graphics/wayland/wayland-ivi-extension/0001-Update-libweston-to-version-13.patch b/meta-agl-ic-container/recipes-graphics/wayland/wayland-ivi-extension/0001-Update-libweston-to-version-13.patch deleted file mode 100644 index 008d0f4b..00000000 --- a/meta-agl-ic-container/recipes-graphics/wayland/wayland-ivi-extension/0001-Update-libweston-to-version-13.patch +++ /dev/null @@ -1,62 +0,0 @@ -From e7984b2a8a7508cdbc3f269f4e0789edcfe8b30a Mon Sep 17 00:00:00 2001 -From: James Thomas <james.thomas@codethink.co.uk> -Date: Thu, 22 Feb 2024 12:26:58 +0000 -Subject: [PATCH] Update libweston to version 13 - -Upstream-Status: Submitted [https://github.com/COVESA/wayland-ivi-extension/pull/185] -Signed-off-by: Scott Murray <scott.murray@konsulko.com> - ---- - CMakeLists.txt | 2 +- - weston-ivi-shell/src/ivi-controller.c | 10 +++++----- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d6428c2..5917875 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -28,7 +28,7 @@ include(GNUInstallDirs) - SET(IVI_EXTENSION_VERSION 2.3.2) - SET(ILM_API_VERSION 2.3.2) - --SET(LIBWESTON_VER 12) -+SET(LIBWESTON_VER 13) - - SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter" ) - SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter" ) -diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c -index 4701aec..94ca83e 100644 ---- a/weston-ivi-shell/src/ivi-controller.c -+++ b/weston-ivi-shell/src/ivi-controller.c -@@ -881,15 +881,15 @@ set_bkgnd_surface_prop(struct ivishell *shell) - wl_list_for_each(output, &compositor->output_list, link) { - if (!count) - { -- x = output->x; -- y = output->y; -+ x = output->pos.c.x; -+ y = output->pos.c.y; - count++; - } -- dest_width = output->x + output->width; -+ dest_width = output->pos.c.x + output->width; - if (output->height > dest_height) - dest_height = output->height; - weston_log("set_bkgnd_surface_prop: o_name:%s x:%d y:%d o_width:%d o_height:%d\n", -- output->name, output->x, output->y, output->width, output->height); -+ output->name, output->pos.c.x, output->pos.c.y, output->width, output->height); - } - - w_surface = view->surface; -@@ -2197,7 +2197,7 @@ launch_client_process(void *data) - setenv(IVI_CLIENT_ENABLE_CURSOR_ENV_NAME, option, 0x1); - } - -- shell->client = weston_client_start(shell->compositor, -+ shell->client = wet_client_start(shell->compositor, - shell->ivi_client_name); - - shell->client_destroy_listener.notify = ivi_shell_client_destroy; --- -2.44.0 - diff --git a/meta-agl-ic-container/recipes-graphics/wayland/wayland-ivi-extension_git.bb b/meta-agl-ic-container/recipes-graphics/wayland/wayland-ivi-extension_git.bb deleted file mode 100644 index 56090f5d..00000000 --- a/meta-agl-ic-container/recipes-graphics/wayland/wayland-ivi-extension_git.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Wayland IVI Extension" -DESCRIPTION = "GENIVI Layer Management API based on Wayland IVI Extension" -HOMEPAGE = "https://github.com/COVESA/wayland-ivi-extension" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1f1a56bb2dadf5f2be8eb342acf4ed79" - -DEPENDS = "weston virtual/libgles2 pixman wayland-native" - -PV = "2.3.2+git${SRCPV}" - -SRC_URI = " \ - git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \ - file://0001-Update-libweston-to-version-13.patch \ -" -SRCREV = "60d616ad3abd925956207b9b6ff981afa004e792" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1" -EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" - -FILES:${PN} += "${datadir}/wayland-protocols/stable/ivi-application/ivi-application.xml" -FILES:${PN} += "${libdir}/weston/*" -FILES:${PN}-dbg += "${libdir}/weston/.debug/*" - -# Need these temporarily to prevent a non-fatal do_package_qa issue -INSANE_SKIP:${PN} += "dev-deps" -INSANE_SKIP:${PN}-dev += "dev-elf dev-so" diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test.bb b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test.bb deleted file mode 100644 index 15b44ed2..00000000 --- a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Configuration files for the Weston compositors for DRM lease testing" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRC_URI = " \ - file://weston.ini.ivi \ - file://weston.ini.cluster \ -" - -S = "${WORKDIR}" - -inherit allarch update-alternatives - -# On-target weston.ini directory -weston_ini_dir = "${sysconfdir}/xdg/weston" - -do_install() { - install -d ${D}${weston_ini_dir} - install -m 0644 ${WORKDIR}/weston.ini.ivi ${D}${weston_ini_dir}/ - install -m 0644 ${WORKDIR}/weston.ini.cluster ${D}${weston_ini_dir}/ -} - -ALTERNATIVE_LINK_NAME[weston.ini] = "${weston_ini_dir}/weston.ini" - -RDEPENDS:${PN} = "${BPN}-ivi" -ALLOW_EMPTY:${PN} = "1" - -PACKAGE_BEFORE_PN += "${PN}-ivi" - -FILES:${PN}-ivi = "${weston_ini_dir}/weston.ini.ivi" - -RPROVIDES:${PN}-ivi = "weston-ini" -ALTERNATIVE:${PN}-ivi = "weston.ini" -ALTERNATIVE_TARGET_${PN}-ivi = "${weston_ini_dir}/weston.ini.ivi" - -PACKAGE_BEFORE_PN += "${PN}-cluster" - -FILES:${PN}-cluster = "${weston_ini_dir}/weston.ini.cluster" - -RPROVIDES:${PN}-cluster = "weston-ini" -RCONFLICTS:${PN}-cluster = "${PN}-ivi" -ALTERNATIVE:${PN}-cluster = "weston.ini" -ALTERNATIVE_TARGET_${PN}-cluster = "${weston_ini_dir}/weston.ini.cluster" diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test/weston.ini.cluster b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test/weston.ini.cluster deleted file mode 100644 index 13347577..00000000 --- a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test/weston.ini.cluster +++ /dev/null @@ -1,26 +0,0 @@ -[core] -backend=drm-backend.so -require-input=false -idle-time=0 -modules=systemd-notify.so - -[shell] -locking=false -panel-position=none -background-color=0xff00ff00 - -[output] -name=Virtual-1 -mode=1920x1080 - -[output] -name=Virtual-2 -mode=1920x1080 - -[output] -name=HDMI-A-1 -mode=1920x1080 - -[output] -name=HDMI-A-2 -mode=1920x1080 diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test/weston.ini.ivi b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test/weston.ini.ivi deleted file mode 100644 index 24d4ee29..00000000 --- a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test/weston.ini.ivi +++ /dev/null @@ -1,26 +0,0 @@ -[core] -backend=drm-backend.so -require-input=false -idle-time=0 -modules=systemd-notify.so - -[shell] -locking=false -panel-position=none -background-color=0xffff0000 - -[output] -name=Virtual-1 -mode=1920x1080 - -[output] -name=Virtual-2 -mode=1920x1080 - -[output] -name=HDMI-A-1 -mode=1920x1080 - -[output] -name=HDMI-A-2 -mode=1920x1080 diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-guest/weston.cluster-guest.ini b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-guest/weston.cluster-guest.ini deleted file mode 100644 index c709d60d..00000000 --- a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-guest/weston.cluster-guest.ini +++ /dev/null @@ -1,9 +0,0 @@ -[core] -backend=drm-backend.so -require-input=false -modules=systemd-notify.so -repaint-window=34 - -[shell] -panel-position=none -background-color=0xff000000 diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-guest/weston.default.ini b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-guest/weston.default.ini deleted file mode 100644 index c709d60d..00000000 --- a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-guest/weston.default.ini +++ /dev/null @@ -1,9 +0,0 @@ -[core] -backend=drm-backend.so -require-input=false -modules=systemd-notify.so -repaint-window=34 - -[shell] -panel-position=none -background-color=0xff000000 diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-guest/weston.ivi-guest.ini b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-guest/weston.ivi-guest.ini deleted file mode 100644 index a664f5e0..00000000 --- a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-guest/weston.ivi-guest.ini +++ /dev/null @@ -1,14 +0,0 @@ -[core] -shell=ivi-shell.so -backend=drm-backend.so -require-input=false -modules=systemd-notify.so,ivi-controller.so - -[ivi-shell] -ivi-input-module=ivi-input-controller.so -ivi-id-agent-module=ivi-id-agent.so - -[desktop-app-default] -default-surface-id=9801 -default-surface-id-max=9821 - diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-guest_0.1.bb b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-guest_0.1.bb deleted file mode 100644 index 740fa8ff..00000000 --- a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-guest_0.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Configuration file for the Weston and AGL Wayland compositors for guest container" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRC_URI = " \ - file://weston.default.ini \ - file://weston.cluster-guest.ini \ - file://weston.ivi-guest.ini \ -" - -S = "${WORKDIR}" - -inherit allarch - -# Default weston.ini -WESTON_INI_FILE ??= "weston.default.ini" - -# Set container specific weston.ini -WESTON_INI_FILE:aglcontainercluster ?= "weston.cluster-guest.ini" -WESTON_INI_FILE:aglcontainerivi ?= "weston.ivi-guest.ini" - -do_install() { - install -D -p -m0644 ${WORKDIR}/${WESTON_INI_FILE} ${D}${sysconfdir}/xdg/weston/weston.ini -} - -FILES:${PN} += " \ - ${sysconfdir}/xdg/weston/weston.ini \ - " -CONFFILES:${PN} += " \ - ${sysconfdir}/xdg/weston/weston.ini \ - " -RDEPENDS:${PN} = "weston-init-guest" -RPROVIDES:${PN} = "weston-ini" -RCONFLICTS:${PN} = "weston-ini-conf" diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest/weston.env b/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest/weston.env deleted file mode 100644 index 7df25aa2..00000000 --- a/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest/weston.env +++ /dev/null @@ -1,6 +0,0 @@ -XDG_RUNTIME_DIR=/run/user/0 -DLM_RUNTIME_PATH=/var/display/drm-lease-manager -DRM_LEASE_DEVICE=lease -WAYLAND_DISPLAY=wayland-1 -LIBSEAT_BACKEND=builtin -SEATD_VTBOUND=0 diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest/weston.service b/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest/weston.service deleted file mode 100644 index 94a2a530..00000000 --- a/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest/weston.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Weston Wayland Compositor -RequiresMountsFor=/run -After=multi-user.target -Wants=multi-user.target - -[Service] -User=root -PAMName=login -EnvironmentFile=-/etc/default/weston -StandardError=journal -PermissionsStartOnly=true -IgnoreSIGPIPE=no -Type=notify -Restart=on-failure -StartLimitInterval=0 - -ExecStart=/usr/bin/weston --config /etc/xdg/weston/weston.ini --idle-time=0 --drm-lease=${DRM_LEASE_DEVICE} --log=/var/log/weston.log - -[Install] -WantedBy=multi-user.target diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest_0.1.bb b/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest_0.1.bb deleted file mode 100644 index c95f92e0..00000000 --- a/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest_0.1.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor in guest cotainer" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI = "file://weston.env \ - file://weston.service \ - " - -S = "${WORKDIR}" - -inherit features_check systemd - -do_install() { - install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston - - # Install Weston systemd service and accompanying udev rule - install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service - sed -i -e s:/etc:${sysconfdir}:g \ - -e s:/usr/bin:${bindir}:g \ - -e s:/var:${localstatedir}:g \ - ${D}${systemd_unitdir}/system/weston.service -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -# rdepends on weston-init-guest which depends on wayland -REQUIRED_DISTRO_FEATURES = "wayland" - -FILES:${PN} += " \ - ${sysconfdir}/xdg/weston/weston.ini \ - ${systemd_system_unitdir}/weston.service \ - ${sysconfdir}/default/weston \ - " -CONFFILES:${PN} += " \ - ${sysconfdir}/xdg/weston/weston.ini \ - ${sysconfdir}/default/weston \ - " -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "weston.service" -SYSTEMD_AUTO_ENABLE = "enable" - -RDEPENDS:${PN} = " \ - weston \ - weston-ini \ - " -RCONFLICTS:${PN} = "weston-init" diff --git a/meta-agl-ic-container/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-agl-ic-container/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend new file mode 100644 index 00000000..6a0d14b3 --- /dev/null +++ b/meta-agl-ic-container/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -0,0 +1,3 @@ +PACKAGECONFIG:append = " \ + openh264 \ +" diff --git a/meta-agl-ic-container/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend b/meta-agl-ic-container/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend new file mode 100644 index 00000000..c882a035 --- /dev/null +++ b/meta-agl-ic-container/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend @@ -0,0 +1,3 @@ +PACKAGECONFIG:append = " \ + pulseaudio \ +" diff --git a/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/daemon.conf b/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/daemon.conf new file mode 100644 index 00000000..58a2ab6f --- /dev/null +++ b/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/daemon.conf @@ -0,0 +1,92 @@ +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. + +## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for +## more information. Default values are commented out. Use either ; or # for +## commenting. + +; daemonize = no +; fail = yes +; allow-module-loading = yes +; allow-exit = yes +; use-pid-file = yes +; system-instance = no +; local-server-type = user +; enable-shm = yes +; enable-memfd = yes +; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB +; lock-memory = no +; cpu-limit = no + +; high-priority = yes +; nice-level = -11 + +realtime-scheduling = yes +realtime-priority = 5 + +; exit-idle-time = 20 +; scache-idle-time = 20 + +; dl-search-path = (depends on architecture) + +; load-default-script-file = yes +; default-script-file = /etc/pulse/default.pa + +; log-target = auto +; log-level = notice +; log-meta = no +; log-time = no +; log-backtrace = 0 + +; resample-method = speex-float-1 +; avoid-resampling = false +; enable-remixing = yes +; remixing-use-all-sink-channels = yes +; remixing-produce-lfe = no +; remixing-consume-lfe = no +; lfe-crossover-freq = 0 + +; flat-volumes = no + +; rescue-streams = yes + +; rlimit-fsize = -1 +; rlimit-data = -1 +; rlimit-stack = -1 +; rlimit-core = -1 +; rlimit-as = -1 +; rlimit-rss = -1 +; rlimit-nproc = -1 +; rlimit-nofile = 256 +; rlimit-memlock = -1 +; rlimit-locks = -1 +; rlimit-sigpending = -1 +; rlimit-msgqueue = -1 +; rlimit-nice = 31 +; rlimit-rtprio = 9 +; rlimit-rttime = 200000 + +default-sample-format = s16le +default-sample-rate = 48000 +alternate-sample-rate = 48000 +default-sample-channels = 2 +default-channel-map = front-left,front-right + +default-fragments = 2 +default-fragment-size-msec = 5 + +; enable-deferred-volume = yes +; deferred-volume-safety-margin-usec = 8000 +; deferred-volume-extra-delay-usec = 0 diff --git a/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/nanopct6/system.pa b/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/nanopct6/system.pa new file mode 100644 index 00000000..f9bffb05 --- /dev/null +++ b/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/nanopct6/system.pa @@ -0,0 +1,33 @@ +#!/usr/bin/pulseaudio -nF +# +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. + +# This startup script is used only if PulseAudio is started in system +# mode. + +### Automatically restore the volume of streams and devices +load-module module-device-restore +load-module module-stream-restore +load-module module-card-restore + +### Use the static hardware detection module (for systems that lack udev/hal support) +load-module module-alsa-sink device=hw:1,0 + +### Load several protocols +load-module module-native-protocol-unix auth-anonymous=1 + +.nofail +.include /etc/pulse/system.pa.d diff --git a/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio.service b/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio.service new file mode 100644 index 00000000..2cafafcd --- /dev/null +++ b/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio.service @@ -0,0 +1,13 @@ +[Unit] +Description=Pulse Audio Service +After=basic.target +Before=multi-user.target + +[Service] +Type=notify +ExecStart=/usr/bin/pulseaudio --system --daemonize=no --disallow-exit --disallow-module-loading --log-target=journal +MemoryDenyWriteExecute=yes +Restart=on-failure + +[Install] +WantedBy=basic.target diff --git a/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/raspberrypi4-64/system.pa b/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/raspberrypi4-64/system.pa new file mode 100644 index 00000000..5bb33743 --- /dev/null +++ b/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/raspberrypi4-64/system.pa @@ -0,0 +1,33 @@ +#!/usr/bin/pulseaudio -nF +# +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. + +# This startup script is used only if PulseAudio is started in system +# mode. + +### Automatically restore the volume of streams and devices +load-module module-device-restore +load-module module-stream-restore +load-module module-card-restore + +### Use the static hardware detection module (for systems that lack udev/hal support) +load-module module-alsa-sink device=hw:"Device" + +### Load several protocols +load-module module-native-protocol-unix auth-anonymous=1 + +.nofail +.include /etc/pulse/system.pa.d diff --git a/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/rcar-gen3/system.pa b/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/rcar-gen3/system.pa new file mode 100644 index 00000000..6891574f --- /dev/null +++ b/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio/rcar-gen3/system.pa @@ -0,0 +1,33 @@ +#!/usr/bin/pulseaudio -nF +# +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. + +# This startup script is used only if PulseAudio is started in system +# mode. + +### Automatically restore the volume of streams and devices +load-module module-device-restore +load-module module-stream-restore +load-module module-card-restore + +### Use the static hardware detection module (for systems that lack udev/hal support) +load-module module-alsa-sink device=hw:0,0 + +### Load several protocols +load-module module-native-protocol-unix auth-anonymous=1 + +.nofail +.include /etc/pulse/system.pa.d diff --git a/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend new file mode 100644 index 00000000..ae1a20c6 --- /dev/null +++ b/meta-agl-ic-container/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend @@ -0,0 +1,27 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/pulseaudio:" + +SRC_URI:append = " \ + file://pulseaudio.service \ + file://system.pa \ + file://daemon.conf \ + " + +do_install:append() { + install -Dm644 ${WORKDIR}/system.pa ${D}${sysconfdir}/pulse/system.pa + install -Dm644 ${WORKDIR}/daemon.conf ${D}${sysconfdir}/pulse/daemon.conf + rm ${D}${sysconfdir}/pulse/default.pa + + install -d ${D}/${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/pulseaudio.service ${D}/${systemd_unitdir}/system + rm ${D}/${systemd_unitdir}/user/* +} + +FILES:${PN}-server:append = " ${systemd_unitdir}/*" +CONFFILES:pulseaudio-server = "\ + ${sysconfdir}/pulse/daemon.conf \ + ${sysconfdir}/pulse/system.pa \ +" + +SYSTEMD_PACKAGES:append = " ${PN}-server" +SYSTEMD_SERVICE:${PN}-server = "pulseaudio.service" +SYSTEMD_AUTO_ENABLE:${PN}-server = "enable" diff --git a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_%.bbappend b/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_%.bbappend deleted file mode 100644 index fe6dab86..00000000 --- a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -do_install:append() { - config_dir="${D}${sysconfdir}/wireplumber/" - systemd_dir="${D}${sysconfdir}/systemd/system/sockets.target.wants" - - # enable additional systemd services - install -d ${systemd_dir} - ln -s ${systemd_system_unitdir}/wireplumber@.service ${systemd_dir}/wireplumber@policy.service -} diff --git a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch b/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch deleted file mode 100644 index ba400211..00000000 --- a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 512e9ee130841e3b6c379511234afc07d66d99d7 Mon Sep 17 00:00:00 2001 -From: Ashok Sidipotu <ashok.sidipotu@collabora.com> -Date: Mon, 28 Feb 2022 06:46:19 +0530 -Subject: [PATCH] systemd: changes to run wireplumber instances in containers - -- remove the pipewire daemon dependencies so that -only wireplumber policy daemon can run in containers. -- remove pipewire user - -Upstream-Status: Inappropriate [configuration] ---- - src/systemd/system/wireplumber@.service.in | 8 +++----- - src/systemd/user/wireplumber@.service.in | 5 ++--- - 2 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/src/systemd/system/wireplumber@.service.in b/src/systemd/system/wireplumber@.service.in -index 0766d4e0..50ddf4c6 100644 ---- a/src/systemd/system/wireplumber@.service.in -+++ b/src/systemd/system/wireplumber@.service.in -@@ -5,8 +5,7 @@ - # wireplumber@policy.service loads the "policy" profile, etc. - [Unit] - Description=Multimedia Service Session Manager (%i) --After=pipewire.service --BindsTo=pipewire.service -+After=sockets.target - Conflicts=pipewire-media-session.service - - [Service] -@@ -19,9 +18,8 @@ Type=simple - AmbientCapabilities=CAP_SYS_NICE - ExecStart=@WP_BINARY@ -p %i - Restart=on-failure --User=pipewire --Environment=PIPEWIRE_RUNTIME_DIR=%t/pipewire -+Environment=PIPEWIRE_RUNTIME_DIR=/var - Environment=GIO_USE_VFS=local - - [Install] --WantedBy=pipewire.service -+WantedBy=multi-user.target -diff --git a/src/systemd/user/wireplumber@.service.in b/src/systemd/user/wireplumber@.service.in -index 5c1096fc..7368f683 100644 ---- a/src/systemd/user/wireplumber@.service.in -+++ b/src/systemd/user/wireplumber@.service.in -@@ -5,8 +5,7 @@ - # wireplumber@policy.service loads the "policy" profile, etc. - [Unit] - Description=Multimedia Service Session Manager (%i) --After=pipewire.service --BindsTo=pipewire.service -+After=sockets.target - Conflicts=pipewire-media-session.service - - [Service] -@@ -22,4 +21,4 @@ Slice=session.slice - Environment=GIO_USE_VFS=local - - [Install] --WantedBy=pipewire.service -+WantedBy=multi-user.target diff --git a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber_%.bbappend b/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber_%.bbappend deleted file mode 100644 index 56f03a4c..00000000 --- a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/wireplumber:" - -SRC_URI += "\ - file://0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch \ -" diff --git a/meta-agl-ic-container/recipes-platform/images/agl-instrument-cluster-container-demo.bb b/meta-agl-ic-container/recipes-platform/images/agl-instrument-cluster-container-demo.bb index 8eb24c61..a958b217 100644 --- a/meta-agl-ic-container/recipes-platform/images/agl-instrument-cluster-container-demo.bb +++ b/meta-agl-ic-container/recipes-platform/images/agl-instrument-cluster-container-demo.bb @@ -11,6 +11,7 @@ CONTAINER_IMAGES ?= "agl-container-cluster:guest-image-cluster-demo \ IMAGE_INSTALL += " \ kernel-modules \ alsa-utils \ + alsa-states \ " # packages required for network bridge settings via lxc-net diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb index d783054b..1d67ec08 100644 --- a/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb +++ b/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb @@ -5,12 +5,8 @@ require guest-image-minimal.bb IMAGE_INSTALL += " \ packagegroup-agl-ic-core \ - weston \ - weston-init-guest \ - weston-ini-conf-guest \ - cluster-refgui \ packagegroup-agl-ic-qt \ - pipewire-ic-ipc \ + cluster-refgui \ " IMAGE_INSTALL:append:rpi = " mesa-megadriver" diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb index 22184578..f9dbabd6 100644 --- a/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb +++ b/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb @@ -1,18 +1,16 @@ -SUMMARY = "LXC ivi demo guest image" +SUMMARY = "Momi IVI demo guest image" LICENSE = "MIT" require guest-image-minimal.bb IMAGE_INSTALL += " \ - weston \ - weston-init-guest \ - weston-ini-conf-guest \ - wayland-ivi-extension \ - ilm-manager \ + packagegroup-agl-momi-ivi-qt \ + qtwayland-setting \ + momiscreen \ mominavi \ momiplay \ - momiscreen \ - packagegroup-agl-ic-qt \ + momiweather \ + chrony \ systemd-netif-config \ ttf-dejavu-sans \ ttf-dejavu-sans-mono \ @@ -22,9 +20,7 @@ IMAGE_INSTALL += " \ ttf-dejavu-mathtexgyre \ ttf-dejavu-common \ ca-certificates \ - wireplumber \ - packagegroup-pipewire-base \ - wireplumber-policy-config-agl \ + pre-install-video-data \ " IMAGE_INSTALL:append:rpi = " mesa-megadriver" diff --git a/meta-agl-ic-container/recipes-qt/qt/qtmultimedia_%.bbappend b/meta-agl-ic-container/recipes-qt/qt/qtmultimedia_%.bbappend new file mode 100644 index 00000000..4c76a4c3 --- /dev/null +++ b/meta-agl-ic-container/recipes-qt/qt/qtmultimedia_%.bbappend @@ -0,0 +1,2 @@ +#PACKAGECONFIG:append = " alsa" +#PACKAGECONFIG:remove = "ffmpeg pulseaudio" diff --git a/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/qtwayland-common b/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/qtwayland-common new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/qtwayland-common diff --git a/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/rcar-gen3/qtwayland-common b/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/rcar-gen3/qtwayland-common new file mode 100755 index 00000000..bf0cad2c --- /dev/null +++ b/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/rcar-gen3/qtwayland-common @@ -0,0 +1 @@ +QT_WAYLAND_HARDWARE_INTEGRATION=linux-dmabuf-unstable-v1 diff --git a/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/rpi/qtwayland-common b/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/rpi/qtwayland-common new file mode 100644 index 00000000..bf0cad2c --- /dev/null +++ b/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/rpi/qtwayland-common @@ -0,0 +1 @@ +QT_WAYLAND_HARDWARE_INTEGRATION=linux-dmabuf-unstable-v1 diff --git a/meta-agl-ic-container/recipes-qt/qtwayland-setting/qtwayland-setting_1.0.bb b/meta-agl-ic-container/recipes-qt/qtwayland-setting/qtwayland-setting_1.0.bb new file mode 100644 index 00000000..001a204c --- /dev/null +++ b/meta-agl-ic-container/recipes-qt/qtwayland-setting/qtwayland-setting_1.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Environment variable setting for Qt Wayland" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" + + +SRC_URI = "file://qtwayland-common \ + " + +do_install() { + install -Dm644 ${WORKDIR}/qtwayland-common ${D}${sysconfdir}/default/qtwayland-common +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +FILES:${PN} += " \ + ${sysconfdir}/default/* \ + " + diff --git a/meta-agl-ic-container/recipes-qt5/qt5/qtbase_git.bbappend b/meta-agl-ic-container/recipes-qt5/qt5/qtbase_git.bbappend deleted file mode 100644 index 7f2e9aa3..00000000 --- a/meta-agl-ic-container/recipes-qt5/qt5/qtbase_git.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG:append:aglcontainerivi = " sql-sqlite" diff --git a/meta-agl-ic-container/wic/agl-ic-container-bootpart-uuid.wks b/meta-agl-ic-container/wic/agl-ic-container-bootpart-uuid.wks index 94e88a8d..feaf2979 100644 --- a/meta-agl-ic-container/wic/agl-ic-container-bootpart-uuid.wks +++ b/meta-agl-ic-container/wic/agl-ic-container-bootpart-uuid.wks @@ -6,5 +6,4 @@ part /boot --source bootimg-partition --fstype=vfat --label boot --use-uuid --ac part / --source rootfs --fstype=ext4 --label host --align 4096 --size 1024 part --source rawcopy --sourceparams="file=guest-image-cluster-demo.ext4" part --source rawcopy --sourceparams="file=guest-image-ivi-demo.ext4" -part --fstype=ext4 --label agl-qt-ivi --align 4096 --size 3072 -part --fstype=ext4 --label agl-flutter-ivi --align 4096 --size 3072 +part --fstype=ext4 --label blabk --align 4096 --size 128 diff --git a/meta-agl-ic-container/wic/agl-ic-container-noloader.wks b/meta-agl-ic-container/wic/agl-ic-container-noloader.wks index d299ae66..e2fc8394 100644 --- a/meta-agl-ic-container/wic/agl-ic-container-noloader.wks +++ b/meta-agl-ic-container/wic/agl-ic-container-noloader.wks @@ -6,5 +6,3 @@ bootloader --ptable gpt part / --source rootfs --fstype=ext4 --label host --align 4096 --size 1024 part --source rawcopy --sourceparams="file=guest-image-cluster-demo.ext4" part --source rawcopy --sourceparams="file=guest-image-ivi-demo.ext4" -part --fstype=ext4 --label agl-qt-ivi --align 4096 --size 3072 -part --fstype=ext4 --label agl-flutter-ivi --align 4096 --size 3072 diff --git a/meta-agl-ic-container/wic/agl-ic-container-rockchip.wks b/meta-agl-ic-container/wic/agl-ic-container-rockchip.wks index 5e7fe73e..1441fb24 100644 --- a/meta-agl-ic-container/wic/agl-ic-container-rockchip.wks +++ b/meta-agl-ic-container/wic/agl-ic-container-rockchip.wks @@ -9,5 +9,3 @@ part --source rawcopy --sourceparams="file=boot.img" --part-name boot part / --source rootfs --fstype=ext4 --label host --align 4096 --size 1024 part --source rawcopy --sourceparams="file=guest-image-cluster-demo.ext4" part --source rawcopy --sourceparams="file=guest-image-ivi-demo.ext4" -part --fstype=ext4 --label agl-qt-ivi --align 4096 --size 3072 -part --fstype=ext4 --label agl-flutter-ivi --align 4096 --size 3072 |