From b43165328658087277b667152fdbc04fe07cba08 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan-Simon=20M=C3=B6ller?= Date: Tue, 15 May 2018 14:46:21 +0200 Subject: [PATCH] 3rd part of the layer/profile rework [1/2] MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is the last larger commit in this series and deals with the graphical part. We introduce the graphical profiles: - meta-agl-profile-graphical -- meta-agl-profile-graphical-html5 -- meta-agl-profile-graphical-qt5 Notable changes: - weston-ini-conf moved to the meta-agl-bsp layer. Most BSPs have bbappends, so we need to have the recipes present (but unused) even in the console images. - new image: agl-image-boot = terminal-only + network + package-manaager. Ready for using package-feeds - new image/sdk: agl-image-minimal-crosssdk - agl-service-mediaplayer has a dependency on weston, thus it cannot be in the 'core'. Moved it to profile-graphical. - The wayland-ivi-extension moved to the agl-demo-platform. - The app-framework layer included and pulled 'web-runtime' as dependency. This broke console-only images. This has been moved to be in meta-agl-demo only for now. - added and massaged the agl-features. - found and added a useful script 'oe-depends-dot' that helps to work with the dot files (produced with bitbake -g) Todo: - we'll need another pass through the packagegroups. The dependencies for the layers/profiles are now sorted-out but we might have to add/shuffle a few packages. For further details, see meta-agl/docs/profiles.md. v2: fix meta-agl/meta-security/conf/layer.conf - the immediate expansion previously used in there caused some recipes not being added to BBFILES. v3: fix packagegroup renaming (packagegroup-agl-devel -> packagegroup-agl-core-devel) v4: fix missing packagegroup inclusion (tnx Jose, Scott, Stephane) v5: fix missing packagegroup inclusion v6: explicitely put profile-graphical-qt5 on-top of profile-graphical v7: re-add 'procps' when agl-devel feature is on Bug-AGL: SPEC-145 Change-Id: I24cdcd1118932758d0c55d333338238f2a770877 Signed-off-by: Jan-Simon Möller --- docs/profiles.md | 134 +++++++++++ meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc | 3 - meta-agl-bsp/conf/include/agl_qemux86-64.inc | 2 +- .../harfbuzz/harfbuzz_1.4.8.bbappend | 0 .../recipes-graphics/mesa/mesa_%.bbappend | 0 .../recipes-graphics/wayland/libva_%.bbappend | 0 .../wayland/weston-ini-conf.bbappend | 9 + .../wayland/weston-ini-conf/virtual.cfg | 0 .../recipes-graphics/wayland/weston_%.bbappend | 0 .../recipes-graphics/wayland/weston_%.bbappend | 8 +- .../recipes-graphics/wayland/weston-ini-conf.bb | 0 .../wayland/weston-ini-conf.bbappend | 20 +- .../wayland/weston-ini-conf/core.cfg | 0 .../wayland/weston-ini-conf/hdmi-a-1-270.cfg | 0 .../wayland/weston-ini-conf/hdmi-a-1-90.cfg | 0 .../wayland/weston-ini-conf/id-agent.cfg | 0 .../wayland/weston-ini-conf/ivishell.cfg | 0 .../wayland/weston-ini-conf/shell.cfg | 0 .../wayland/weston-ini-conf/virtualoutput.cfg | 0 meta-agl-distro/conf/distro/poky-agl.conf | 10 +- meta-agl-distro/scripts/oe-depends-dot | 121 ++++++++++ meta-agl-profile-core/conf/include/agl-devel.inc | 6 +- .../agl-service-can-low-level_git.bb | 0 .../recipes-config/agl-users/agl-users_0.1.bb | 0 .../dev-mapping/dev-mapping.conf.default | 0 .../recipes-config/dev-mapping/dev-mapping_0.1.bb | 0 .../bluez-alsa/bluez-alsa_git.bb | 0 .../bluez-alsa/files/bluez-alsa.service | 0 .../0001_fix_compile_issue_when_using_in_c++.patch | 0 .../bluez5/bluez5/bluetooth.conf | 0 .../recipes-connectivity/bluez5/bluez5_%.bbappend | 0 .../busybox/busybox_%.bbappend | 0 .../busybox/files/enable-wget-https.cfg | 0 .../connman-ncurses/connman-ncurses_git.bb | 0 .../recipes-connectivity/connman/.appends.core | 0 .../connman/connman_%.bbappend | 0 .../files/0001-disable-when-booting-over-nfs.patch | 0 .../recipes-connectivity/libnfc/libnfc_git.bb | 0 .../0001-remove-I-usr-include-in-pkg-config.patch | 0 .../recipes-connectivity/rtl-sdr/rtl-sdr_0.5.3.bb | 0 .../packagegroup-agl-core-automotive.bb | 13 - .../packagegroup-agl-core-graphics.bb | 10 - .../packagegroups/packagegroup-agl-core-kernel.bb | 13 - .../packagegroup-agl-core-multimedia.bb | 13 - .../packagegroup-agl-core-navi-lbs.bb | 13 - .../packagegroup-agl-core-security.bb | 13 - .../packagegroup-agl-core-speech-services.bb | 13 - .../recipes-devtools/gdb/.appends.core | 0 ...agl-devel.bb => packagegroup-agl-core-devel.bb} | 1 + .../recipes-extended/gperf/.appends.core | 0 .../recipes-ivi/images/agl-image-ivi-qa.bb | 14 -- .../recipes-ivi/images/agl-image-ivi.bb | 17 -- .../recipes-ivi/images/agl-image-ivi.inc | 3 - .../packagegroups/packagegroup-agl-image-ivi.bb | 31 --- .../packagegroup-agl-ivi-automotive.bb | 14 -- .../packagegroup-agl-ivi-connectivity.bb | 19 -- .../packagegroups/packagegroup-agl-ivi-graphics.bb | 14 -- .../packagegroups/packagegroup-agl-ivi-kernel.bb | 14 -- .../packagegroup-agl-ivi-multimedia.bb | 17 -- .../packagegroups/packagegroup-agl-ivi-navi-lbs.bb | 14 -- .../packagegroups/packagegroup-agl-ivi-security.bb | 14 -- .../packagegroup-agl-ivi-speech-services.bb | 14 -- .../0002-src-most-add-auto-conf-feature.patch | 0 ...003-core-remove-kernel-log-for-MBO-status.patch | 0 .../files/0004-most-video-set-device_caps.patch | 0 ...-most-video-set-V4L2_CAP_DEVICE_CAPS-flag.patch | 0 .../files/0006-dim2-fix-startup-sequence.patch | 0 .../most/files/0007-dim2-use-device-tree.patch | 0 ...im2-read-clock-speed-from-the-device-tree.patch | 0 ...use-device-for-coherent-memory-allocation.patch | 0 .../recipes-kernel/most/most.bb | 0 .../recipes-kernel/most/most.bbappend | 0 .../pulseaudio/pulseaudio/10-unload-modules.pa | 4 + .../pulseaudio/pulseaudio_%.bbappend | 13 + .../images/agl-image-boot.bb | 0 .../images/agl-image-boot.inc | 0 .../images/agl-image-minimal-crosssdk.bb} | 11 +- .../images/agl-image-minimal-qa.bb | 0 .../images/agl-image-minimal.bb | 0 .../images/agl-image-minimal.inc | 0 .../packagegroups/packagegroup-agl-core-boot.bb} | 0 .../packagegroup-agl-core-connectivity.bb | 1 + .../packagegroup-agl-core-multimedia.bb | 27 +++ .../packagegroup-agl-core-navigation.bb | 7 +- .../packagegroup-agl-core-os-commonlibs.bb | 3 +- .../packagegroup-agl-core-security.bb} | 2 +- .../packagegroup-agl-core-services.bb | 30 +++ .../packagegroups/packagegroup-agl-image-boot.bb | 2 +- .../packagegroup-agl-image-minimal.bb | 12 +- .../packagegroups/packagegroup-agl-appfw-agl.bb | 16 -- .../packagegroup-agl-appfw-automotive.bb | 16 -- .../packagegroup-agl-appfw-connectivity.bb | 28 --- .../packagegroup-agl-appfw-graphics.bb | 17 -- .../packagegroup-agl-appfw-multimedia.bb | 15 -- .../packagegroup-agl-appfw-security.bb | 16 -- .../packagegroup-agl-appfw-speech-services.bb | 16 -- .../packagegroups/packagegroup-agl-appfw.bb | 25 -- ...-missing-link-to-unistring-for-lms-plugin.patch | 28 --- .../recipes-connectivity/rygel/files/rygel.service | 13 - .../recipes-connectivity/rygel/rygel_%.bbappend | 25 -- .../packagegroup-ivi-common-core-multimedia.bb | 13 - .../0001-Fix-build-with-systemd-209.patch | 30 --- ...on-t-execute-processes-as-a-specific-user.patch | 81 ------- ...t-type-should-be-in-lowercase-so-use-Type.patch | 98 -------- .../0004-Modify-systemd-config-directory.patch | 24 -- .../dlt-daemon/dlt-daemon_2.11.1.bb | 54 ----- .../dlt-daemon/dlt-daemon_2.15.0.bb | 52 ---- .../recipes-kernel/mocca-usb/mocca-usb.bb | 22 -- .../0001-Fix-duplicated-command-line-arg-t.patch | 25 -- .../audiomanager/audiomanager/audiomanager.service | 17 -- .../audiomanager/audiomanager_7.4.bb | 56 ----- meta-agl-profile-graphical-html5/conf/layer.conf | 10 + .../openivi-html5/openivi-html5.service | 16 ++ .../openivi-html5/openivi-html5/openivi-html5.sh | 50 ++++ .../openivi-html5/openivi-html5_git.bb | 43 ++++ .../images/agl-demo-platform-html5-crosssdk.bb | 56 +++++ .../images/agl-demo-platform-html5.bb | 10 + .../images/agl-demo-platform-html5.inc | 2 + .../packagegroup-agl-demo-platform-html5.bb | 26 ++ meta-agl-profile-graphical-qt5/conf/layer.conf | 10 + .../packagegroups/packagegroup-agl-appfw-native.bb | 0 .../packagegroups/packagegroup-agl-appfw-qt5.bb | 8 +- .../images/agl-image-graphical-qt5-crosssdk.bb | 56 +++++ .../images/agl-image-graphical-qt5.bb | 4 +- .../images/agl-image-graphical-qt5.inc | 7 + .../packagegroup-agl-appfw-native-qt5.bb | 3 - .../packagegroup-agl-demo-qt-examples.bb | 0 .../packagegroup-agl-profile-graphical-qt5.bb | 23 ++ .../packagegroup-qt5-toolchain-target.bbappend | 0 .../qml-execscript-plugin_1.0.bb | 0 .../recipes-qt/qt5/qtbase-native_git.bbappend | 0 ...-to-make-introspect-for-every-findMetaObj.patch | 0 .../recipes-qt/qt5/qtbase_%.bbappend | 0 ...age-support-with-the-data-URL-scheme-for-.patch | 0 .../recipes-qt/qt5/qtmultimedia_%.bbappend | 0 .../recipes-qt/qt5/qtsystems_%.bbappend | 0 ...nitial-IVI-shell-support-with-shell-integ.patch | 0 ...update-3rd-party-ivi-application-protocol.patch | 0 .../qt5/qtwayland/0002-Fix-multiple-QWindow.patch | 0 ...dow-add-support-for-IVI-Surface-ID-proper.patch | 0 ...est-file-according-to-smack-3-domain-mode.patch | 0 ...Add-xdg-shell-protocol-file-version-1.4.0.patch | 0 ...dd-minimize-feature-to-QWindow-using-wayl.patch | 0 ...pgrade-to-support-current-version-weston-.patch | 0 ...-IVI-Shell-protocol-file-version-patch-v6.patch | 0 .../0021-Implement-initial-IVI-Shell-support.patch | 0 .../qt5/qtwayland/0099_qtwayland_no_evdev.patch | 0 ...018-packaging-enable-xdg-shell-at-runtime.patch | 0 ..._egl_qt_wayland_client_buffer_integration.patch | 0 .../recipes-qt/qt5/qtwayland_%.bbappend | 0 .../recipes-qt/qt5/qtwebkit_%.bbappend | 0 .../agl-service-mediaplayer_git.bb | 0 .../packagegroups/packagegroup-agl-image-weston.bb | 17 -- ...ton-crush-when-repeat-touching-very-quick.patch | 31 --- .../0001-simple-id-agent-initial-commit.patch | 264 --------------------- .../0002-ivi-controller-load-id-agent-module.patch | 69 ------ ...ler-add-resize-setting-suit-to-surface-si.patch | 62 ----- .../wayland-ivi-extension/cmake-find-gtest.patch | 22 -- .../disable-sanitizer-tests.patch | 13 - .../wayland/wayland-ivi-extension/test-path.patch | 55 ----- .../wandboard_fix_build.patch | 13 - .../wayland/wayland-ivi-extension_1.1%.bbappend | 27 --- .../wayland/wayland-ivi-extension_1.13.0.bb | 33 --- .../wayland/wayland-ivi-extension_2.0.2.bb | 31 --- .../wayland/weston-ini-conf.bbappend | 15 -- .../recipes-graphics/wayland/weston_%.bbappend | 1 - .../recipes-platform/images/agl-image-weston.bb | 9 + .../images/agl-image-weston.inc | 2 +- .../packagegroup-agl-graphical-services.bb | 14 ++ .../packagegroups/packagegroup-agl-image-weston.bb | 22 ++ .../packagegroup-agl-profile-graphical.bb | 20 ++ .../packagegroup-agl-smartdevicelink.bb | 17 -- .../conf/layer.conf | 6 +- meta-agl-profile-telematics/conf/layer.conf | 10 + .../packagegroup-agl-app-framework.bb | 1 - .../web-runtime/web-runtime/web-runtime | 2 - .../web-runtime/web-runtime/web-runtime-webkit.qml | 13 - .../web-runtime/web-runtime/web-runtime.qml | 14 -- .../recipes-core/web-runtime/web-runtime_0.1.bb | 42 ---- .../packagegroup-agl-core-security.bbappend | 0 .../packagegroup-agl-image-boot.bbappend} | 0 .../packagegroup-agl-image-minimal.bbappend | 3 + meta-security/conf/layer.conf | 6 +- templates/base/bblayers.conf.sample | 8 - .../50_bblayers.conf.inc | 3 + .../agl-profile-graphical-html5/included.dep | 1 + .../agl-profile-graphical-qt5/50_bblayers.conf.inc | 9 + .../feature/agl-profile-graphical-qt5/included.dep | 1 + .../agl-profile-graphical/50_bblayers.conf.inc | 3 + .../feature/agl-profile-hud/50_bblayers.conf.inc | 3 + .../agl-profile-telematics/50_bblayers.conf.inc | 3 + 191 files changed, 808 insertions(+), 1767 deletions(-) create mode 100644 docs/profiles.md rename meta-agl-bsp/{ => meta-agl-profile-graphical}/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bbappend (100%) rename meta-agl-bsp/{ => meta-agl-profile-graphical}/recipes-graphics/mesa/mesa_%.bbappend (100%) rename meta-agl-bsp/{ => meta-agl-profile-graphical}/recipes-graphics/wayland/libva_%.bbappend (100%) create mode 100644 meta-agl-bsp/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bbappend rename meta-agl-bsp/{ => meta-agl-profile-graphical}/recipes-graphics/wayland/weston-ini-conf/virtual.cfg (100%) rename meta-agl-bsp/{ => meta-agl-profile-graphical}/recipes-graphics/wayland/weston_%.bbappend (100%) rename {meta-agl-profile-graphical => meta-agl-bsp}/recipes-graphics/wayland/weston-ini-conf.bb (100%) rename {meta-agl-profile-graphical => meta-agl-bsp}/recipes-graphics/wayland/weston-ini-conf/core.cfg (100%) rename {meta-agl-profile-graphical => meta-agl-bsp}/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-270.cfg (100%) rename {meta-agl-profile-graphical => meta-agl-bsp}/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-90.cfg (100%) rename {meta-agl-profile-graphical => meta-agl-bsp}/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg (100%) rename {meta-agl-profile-graphical => meta-agl-bsp}/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg (100%) rename {meta-agl-profile-graphical => meta-agl-bsp}/recipes-graphics/wayland/weston-ini-conf/shell.cfg (100%) rename {meta-agl-profile-graphical => meta-agl-bsp}/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg (100%) create mode 100755 meta-agl-distro/scripts/oe-depends-dot rename {meta-app-framework/recipes-apps => meta-agl-profile-core/recipes-apis}/agl-service-can-low-level/agl-service-can-low-level_git.bb (100%) rename {meta-app-framework => meta-agl-profile-core}/recipes-config/agl-users/agl-users_0.1.bb (100%) rename {meta-app-framework => meta-agl-profile-core}/recipes-config/dev-mapping/dev-mapping/dev-mapping.conf.default (100%) rename {meta-app-framework => meta-agl-profile-core}/recipes-config/dev-mapping/dev-mapping_0.1.bb (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-connectivity/bluez-alsa/files/bluez-alsa.service (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-connectivity/bluez5/bluez5/0001_fix_compile_issue_when_using_in_c++.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-connectivity/bluez5/bluez5/bluetooth.conf (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-connectivity/bluez5/bluez5_%.bbappend (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-connectivity/busybox/busybox_%.bbappend (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-connectivity/busybox/files/enable-wget-https.cfg (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-connectivity/connman/.appends.core (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-connectivity/connman/connman_%.bbappend (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-connectivity/libnfc/libnfc_git.bb (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-connectivity/rtl-sdr/rtl-sdr/0001-remove-I-usr-include-in-pkg-config.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-connectivity/rtl-sdr/rtl-sdr_0.5.3.bb (100%) delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-automotive.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-graphics.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-kernel.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-navi-lbs.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-security.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-speech-services.bb rename meta-agl-profile-demo/recipes-connectivity/rygel/.appends.meta-multimedia => meta-agl-profile-core/recipes-devtools/gdb/.appends.core (100%) rename meta-agl-profile-core/recipes-devtools/packagegroups/{packagegroup-agl-devel.bb => packagegroup-agl-core-devel.bb} (96%) rename meta-agl-profile-demo/recipes-qt/.gitkeep => meta-agl-profile-core/recipes-extended/gperf/.appends.core (100%) delete mode 100644 meta-agl-profile-core/recipes-ivi/images/agl-image-ivi-qa.bb delete mode 100644 meta-agl-profile-core/recipes-ivi/images/agl-image-ivi.bb delete mode 100644 meta-agl-profile-core/recipes-ivi/images/agl-image-ivi.inc delete mode 100644 meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-image-ivi.bb delete mode 100644 meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-automotive.bb delete mode 100644 meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-connectivity.bb delete mode 100644 meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-graphics.bb delete mode 100644 meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-kernel.bb delete mode 100644 meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-multimedia.bb delete mode 100644 meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-navi-lbs.bb delete mode 100644 meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-security.bb delete mode 100644 meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-speech-services.bb rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-kernel/most/files/0002-src-most-add-auto-conf-feature.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-kernel/most/files/0003-core-remove-kernel-log-for-MBO-status.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-kernel/most/files/0004-most-video-set-device_caps.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-kernel/most/files/0005-most-video-set-V4L2_CAP_DEVICE_CAPS-flag.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-kernel/most/files/0006-dim2-fix-startup-sequence.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-kernel/most/files/0007-dim2-use-device-tree.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-kernel/most/files/0008-dim2-read-clock-speed-from-the-device-tree.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-kernel/most/files/0009-dim2-use-device-for-coherent-memory-allocation.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-kernel/most/most.bb (100%) rename {meta-agl-profile-demo => meta-agl-profile-core}/recipes-kernel/most/most.bbappend (100%) create mode 100644 meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/10-unload-modules.pa rename meta-agl-profile-core/{recipes-core => recipes-platform}/images/agl-image-boot.bb (100%) rename meta-agl-profile-core/{recipes-core => recipes-platform}/images/agl-image-boot.inc (100%) rename meta-agl-profile-core/{recipes-ivi/images/agl-image-ivi-crosssdk.bb => recipes-platform/images/agl-image-minimal-crosssdk.bb} (58%) mode change 100644 => 100755 rename meta-agl-profile-core/{recipes-core => recipes-platform}/images/agl-image-minimal-qa.bb (100%) rename meta-agl-profile-core/{recipes-core => recipes-platform}/images/agl-image-minimal.bb (100%) rename meta-agl-profile-core/{recipes-core => recipes-platform}/images/agl-image-minimal.inc (100%) rename meta-agl-profile-core/{recipes-core/packagegroups/packagegroup-core-boot-agl.bb => recipes-platform/packagegroups/packagegroup-agl-core-boot.bb} (100%) rename meta-agl-profile-core/{recipes-core => recipes-platform}/packagegroups/packagegroup-agl-core-connectivity.bb (96%) create mode 100644 meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb rename meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-navi-lbs.bb => meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-navigation.bb (72%) rename meta-agl-profile-core/{recipes-core => recipes-platform}/packagegroups/packagegroup-agl-core-os-commonlibs.bb (60%) rename meta-agl-profile-core/{recipes-ivi/packagegroups/packagegroup-agl-ivi-os-commonlibs.bb => recipes-platform/packagegroups/packagegroup-agl-core-security.bb} (86%) create mode 100644 meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb rename meta-agl-profile-core/{recipes-core => recipes-platform}/packagegroups/packagegroup-agl-image-boot.bb (87%) rename meta-agl-profile-core/{recipes-core => recipes-platform}/packagegroups/packagegroup-agl-image-minimal.bb (63%) delete mode 100644 meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-agl.bb delete mode 100644 meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-automotive.bb delete mode 100644 meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-connectivity.bb delete mode 100644 meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-graphics.bb delete mode 100644 meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-multimedia.bb delete mode 100644 meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-security.bb delete mode 100644 meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-speech-services.bb delete mode 100644 meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw.bb delete mode 100644 meta-agl-profile-demo/recipes-connectivity/rygel/files/0001-Fix-missing-link-to-unistring-for-lms-plugin.patch delete mode 100644 meta-agl-profile-demo/recipes-connectivity/rygel/files/rygel.service delete mode 100644 meta-agl-profile-demo/recipes-connectivity/rygel/rygel_%.bbappend delete mode 100644 meta-agl-profile-demo/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb delete mode 100644 meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch delete mode 100644 meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch delete mode 100644 meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch delete mode 100644 meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch delete mode 100644 meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb delete mode 100644 meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb delete mode 100644 meta-agl-profile-demo/recipes-kernel/mocca-usb/mocca-usb.bb delete mode 100644 meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager/0001-Fix-duplicated-command-line-arg-t.patch delete mode 100644 meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager/audiomanager.service delete mode 100644 meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager_7.4.bb create mode 100644 meta-agl-profile-graphical-html5/conf/layer.conf create mode 100644 meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.service create mode 100644 meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.sh create mode 100644 meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5_git.bb create mode 100755 meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5-crosssdk.bb create mode 100644 meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5.bb create mode 100644 meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5.inc create mode 100644 meta-agl-profile-graphical-html5/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb create mode 100644 meta-agl-profile-graphical-qt5/conf/layer.conf rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-appfw/packagegroups/packagegroup-agl-appfw-native.bb (100%) rename meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-web.bb => meta-agl-profile-graphical-qt5/recipes-appfw/packagegroups/packagegroup-agl-appfw-qt5.bb (73%) create mode 100755 meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb rename meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.bb => meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.bb (53%) create mode 100644 meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc rename {meta-agl-profile-demo/recipes-qt => meta-agl-profile-graphical-qt5/recipes-platform}/packagegroups/packagegroup-agl-appfw-native-qt5.bb (89%) rename {meta-agl-profile-demo/recipes-qt => meta-agl-profile-graphical-qt5/recipes-platform}/packagegroups/packagegroup-agl-demo-qt-examples.bb (100%) create mode 100644 meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb rename {meta-agl-profile-demo/recipes-qt => meta-agl-profile-graphical-qt5/recipes-platform}/packagegroups/packagegroup-qt5-toolchain-target.bbappend (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qml-execscript-plugin/qml-execscript-plugin_1.0.bb (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtbase-native_git.bbappend (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtbase_%.bbappend (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtmultimedia/0001-metadata-image-support-with-the-data-URL-scheme-for-.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtmultimedia_%.bbappend (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtsystems_%.bbappend (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwayland/0001-Implement-initial-IVI-shell-support-with-shell-integ.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwayland/0001-protocol-update-3rd-party-ivi-application-protocol.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwayland/0002-Fix-multiple-QWindow.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwayland/0002-qwaylandwindow-add-support-for-IVI-Surface-ID-proper.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwayland/0010-Added-manifest-file-according-to-smack-3-domain-mode.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwayland/0016-xdg-shell-Add-xdg-shell-protocol-file-version-1.4.0.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwayland/0017-xdg-shell-Add-minimize-feature-to-QWindow-using-wayl.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwayland/0019-xdg-shell-upgrade-to-support-current-version-weston-.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwayland/0020-Add-IVI-Shell-protocol-file-version-patch-v6.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwayland/0021-Implement-initial-IVI-Shell-support.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwayland/UNUSED_NEEDS_CHECK_YOCTO_0018-packaging-enable-xdg-shell-at-runtime.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwayland/disable_xcomposite_egl_qt_wayland_client_buffer_integration.patch (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwayland_%.bbappend (100%) rename {meta-agl-profile-demo => meta-agl-profile-graphical-qt5}/recipes-qt/qt5/qtwebkit_%.bbappend (100%) rename {meta-agl-profile-core => meta-agl-profile-graphical}/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb (100%) delete mode 100644 meta-agl-profile-graphical/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Resolve-weston-crush-when-repeat-touching-very-quick.patch delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-simple-id-agent-initial-commit.patch delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-controller-load-id-agent-module.patch delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-add-resize-setting-suit-to-surface-si.patch delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/cmake-find-gtest.patch delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/disable-sanitizer-tests.patch delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.1%.bbappend delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.13.0.bb delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bbappend delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston_%.bbappend create mode 100644 meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.bb rename meta-agl-profile-graphical/{recipes-graphics => recipes-platform}/images/agl-image-weston.inc (71%) create mode 100644 meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb create mode 100644 meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-image-weston.bb create mode 100644 meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb delete mode 100644 meta-agl-profile-graphical/recipes-sdl/packagegroups/packagegroup-agl-smartdevicelink.bb rename {meta-agl-profile-demo => meta-agl-profile-hud}/conf/layer.conf (63%) create mode 100644 meta-agl-profile-telematics/conf/layer.conf delete mode 100755 meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime delete mode 100644 meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime-webkit.qml delete mode 100644 meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime.qml delete mode 100644 meta-app-framework/recipes-core/web-runtime/web-runtime_0.1.bb rename meta-app-framework/{recipes-core => recipes-platform}/packagegroups/packagegroup-agl-core-security.bbappend (100%) rename meta-app-framework/{recipes-core/packagegroups/packagegroup-agl-image-minimal.bbappend => recipes-platform/packagegroups/packagegroup-agl-image-boot.bbappend} (100%) create mode 100644 meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bbappend create mode 100644 templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc create mode 100644 templates/feature/agl-profile-graphical-html5/included.dep create mode 100644 templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc create mode 100644 templates/feature/agl-profile-graphical-qt5/included.dep create mode 100644 templates/feature/agl-profile-graphical/50_bblayers.conf.inc create mode 100644 templates/feature/agl-profile-hud/50_bblayers.conf.inc create mode 100644 templates/feature/agl-profile-telematics/50_bblayers.conf.inc diff --git a/docs/profiles.md b/docs/profiles.md new file mode 100644 index 000000000..6c7e76730 --- /dev/null +++ b/docs/profiles.md @@ -0,0 +1,134 @@ +# AGL Profiles + +The AGL Profiles cover the different use-cases that the AGL platform serves. This ranges from minimal systems without display, telematic systems, HUD, IVI, ADAS and more. Common to all of them is the use of the AGL APIs (agl-service-*). + +All systems have the 'core' profile in common. This small set of libraries and binaries is the essential set including the AGL APIs that every AGL system needs. All other profiles reuse the 'core' profile. + +The other profiles and their dependencies are currently: + + * agl-profile-core + * agl-profile-telematics + * agl-profile-hud + * agl-profile-graphical + * agl-profile-graphical-html5 + * agl-profile-graphical-qt5 + * agl-demo-platform + + + +## agl-profile-core +This profile contains the following images: +* agl-image-boot + * agl-image-minimal + * agl-image-minimal-crosssdk + +### agl-image-boot +This image is only meant to boot the target device and provide network, package-management and a shell. +All other functionality needs to be installed at runtime through 'dnf' using the provided package feeds and package-groups (e.g. dnf install profile-graphical-qt5) + +### agl-image-minimal +This is the smallest image that includes all (non-graphical) AGL APIs. + +### agl-image-minimal-crosssdk +This is the SDK for systems without display including the AGL APIs. + +## agl-profile-telematics +N.N. + +## agl-profile-hud +N.N. + +## agl-profile-graphical +This profile contains a basic graphical system with wayland/weston. It is used as a base for the more targeted profiles: +* agl-profile-graphical-html5 +* agl-profile-graphical-qt5 + +Part of this layer are the following images: +* agl-image-weston + +### agl-image-weston +Pure wayland + weston image but with all AGL service APIs. + +## agl-profile-graphical-html5 +This profile contains all components to build a html5 / web-based system and should be used as a base layer for further projects. +All AGL APIs are included. + +## agl-profile-graphical-qt5 +This profile is used as base for all projects that build on qt5 like the agl-demo-platform. +Part of this layer are the ffollowing images: +* agl-image-graphical-qt5 +* agl-image-graphical-qt5-crosssdk (THIS IS THE SDK TARGET WE AIM TO USE FOR AGL-DEMO-PLATFORM IN THE END) + +All AGL APIs are included. + + +All AGL APIs are included. + +### agl-image-graphical-qt5 +Image with wayland/weston and the qt5 packages installed. + +### agl-image-graphical-qt5-crosssdk +SDK based on agl-image-graphical-qt5 suitable for development under qt5. + + + +## agl-demo-platform +This layer builds on-top of agl-profile-graphical-qt5 and builds the full AGL demonstrator image. +It hosts these images: +* agl-demo-platform +* agl-demo-platform-crosssdk +* agl-demo-platform-qa + + + + +TLDR: + +``` +meta-agl/meta-agl-profile-core/recipes-platform +|-- images +| |-- agl-image-boot.bb +| |-- agl-image-boot.inc +| |-- agl-image-minimal-crosssdk.bb +| |-- agl-image-minimal-qa.bb +| |-- agl-image-minimal.bb +| `-- agl-image-minimal.inc +`-- packagegroups + |-- packagegroup-agl-core-boot.bb + |-- packagegroup-agl-core-connectivity.bb + |-- packagegroup-agl-core-multimedia.bb + |-- packagegroup-agl-core-navigation.bb + |-- packagegroup-agl-core-os-commonlibs.bb + |-- packagegroup-agl-core-security.bb + |-- packagegroup-agl-core-services.bb + |-- packagegroup-agl-image-boot.bb + `-- packagegroup-agl-image-minimal.bb + + meta-agl/meta-agl-profile-graphical/recipes-platform +|-- images +| |-- agl-image-weston.bb +| `-- agl-image-weston.inc +`-- packagegroups + |-- packagegroup-agl-graphical-services.bb + `-- packagegroup-agl-image-weston.bb + + meta-agl/meta-agl-profile-graphical-html5/recipes-platform +|-- images +| |-- agl-demo-platform-html5-crosssdk.bb +| |-- agl-demo-platform-html5.bb +| `-- agl-demo-platform-html5.inc +`-- packagegroups + `-- packagegroup-agl-demo-platform-html5.bb + + meta-agl/meta-agl-profile-graphical-qt5/recipes-platform +|-- images +| |-- agl-image-graphical-qt5-crosssdk.bb +| |-- agl-image-graphical-qt5.bb +| `-- agl-image-graphical-qt5.inc +`-- packagegroups + |-- packagegroup-agl-appfw-native-qt5.bb + |-- packagegroup-agl-demo-qt-examples.bb + |-- packagegroup-agl-profile-graphical-qt5.bb + `-- packagegroup-qt5-toolchain-target.bbappend +``` + diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc index 1bc59149f..c0ebb5f65 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc @@ -10,6 +10,3 @@ DISTRO_FEATURES_append = " sota" OSTREE_KERNEL = "Image" IMAGE_BOOT_FILES_sota = "m3ulcb-ota-bootfiles/* Image-r8a7796-m3ulcb.dtb" OSTREE_BOOTLOADER ?= "u-boot" - -# HOTFIX during layer reorg -BBMASK .= "|meta-agl/meta-agl-profile-demo/recipes-qt/" \ No newline at end of file diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc index 1fe839d68..a72f7b0f7 100644 --- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc +++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc @@ -21,7 +21,7 @@ QB_KERNEL_CMDLINE_APPEND_append = " quiet" DISTRO_FEATURES_append = " sota" # Image support -AGL_EXTRA_IMAGE_FSTYPES = "wic.vmdk" +AGL_EXTRA_IMAGE_FSTYPES = "ext4 wic.vmdk" IMAGE_BOOT_FILES_sota = "u-boot-qemux86-64.rom" # Root device diff --git a/meta-agl-bsp/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bbappend b/meta-agl-bsp/meta-agl-profile-graphical/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bbappend similarity index 100% rename from meta-agl-bsp/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bbappend rename to meta-agl-bsp/meta-agl-profile-graphical/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bbappend diff --git a/meta-agl-bsp/recipes-graphics/mesa/mesa_%.bbappend b/meta-agl-bsp/meta-agl-profile-graphical/recipes-graphics/mesa/mesa_%.bbappend similarity index 100% rename from meta-agl-bsp/recipes-graphics/mesa/mesa_%.bbappend rename to meta-agl-bsp/meta-agl-profile-graphical/recipes-graphics/mesa/mesa_%.bbappend diff --git a/meta-agl-bsp/recipes-graphics/wayland/libva_%.bbappend b/meta-agl-bsp/meta-agl-profile-graphical/recipes-graphics/wayland/libva_%.bbappend similarity index 100% rename from meta-agl-bsp/recipes-graphics/wayland/libva_%.bbappend rename to meta-agl-bsp/meta-agl-profile-graphical/recipes-graphics/wayland/libva_%.bbappend diff --git a/meta-agl-bsp/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bbappend new file mode 100644 index 000000000..8fa08bc3b --- /dev/null +++ b/meta-agl-bsp/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +# OVERRIDES save us some c'n'p below ... +OVERRIDES_prepend_qemux86 = "virtualmachine:" +OVERRIDES_prepend_qemux86-64 = "virtualmachine:" + +# Switch to the Virtual section that we have when a valid DRM device is found +SRC_URI_remove_virtualmachine = "file://hdmi-a-1-270.cfg" +SRC_URI_append_virtualmachine = " file://virtual.cfg" diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtual.cfg b/meta-agl-bsp/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/virtual.cfg similarity index 100% rename from meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtual.cfg rename to meta-agl-bsp/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/virtual.cfg diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend b/meta-agl-bsp/meta-agl-profile-graphical/recipes-graphics/wayland/weston_%.bbappend similarity index 100% rename from meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend rename to meta-agl-bsp/meta-agl-profile-graphical/recipes-graphics/wayland/weston_%.bbappend diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend index 079ff496a..38590dcdb 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend @@ -1,7 +1 @@ -FILES_${PN}_append_rcar-gen3 = " \ - ${libexecdir}/weston-screenshooter \ - ${libexecdir}/weston-ivi-shell-user-interface \ - ${libexecdir}/weston-keyboard \ - ${libexecdir}/weston-simple-im \ - ${libexecdir}/weston-desktop-shell \ -" +DEPENDS_append_ulcb = " gstreamer1.0-plugins-base" diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bb similarity index 100% rename from meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bb rename to meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bb diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend index 8fa08bc3b..de388d862 100644 --- a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend +++ b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -1,9 +1,17 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -# OVERRIDES save us some c'n'p below ... -OVERRIDES_prepend_qemux86 = "virtualmachine:" -OVERRIDES_prepend_qemux86-64 = "virtualmachine:" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +# +SRC_URI += "${@bb.utils.contains("DISTRO_FEATURES", "virtual-display", "file://virtualoutput.cfg", "",d)}" + +do_configure_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'virtual-display', 'true', 'false', d)}; then + echo virtual=1 >> ${WORKDIR}/core.cfg + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'gst-record', 'true', 'false', d)}; then + echo recorder=true >> ${WORKDIR}/virtualoutput.cfg + fi +} -# Switch to the Virtual section that we have when a valid DRM device is found -SRC_URI_remove_virtualmachine = "file://hdmi-a-1-270.cfg" -SRC_URI_append_virtualmachine = " file://virtual.cfg" diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/core.cfg b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/core.cfg similarity index 100% rename from meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/core.cfg rename to meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/core.cfg diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-270.cfg b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-270.cfg similarity index 100% rename from meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-270.cfg rename to meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-270.cfg diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-90.cfg b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-90.cfg similarity index 100% rename from meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-90.cfg rename to meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-90.cfg diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg similarity index 100% rename from meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg rename to meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg similarity index 100% rename from meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg rename to meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/shell.cfg b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/shell.cfg similarity index 100% rename from meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/shell.cfg rename to meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/shell.cfg diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg similarity index 100% rename from meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg rename to meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index 8e8fd7ae1..065baf24f 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -146,8 +146,14 @@ INITRAMFS_FSTYPES := "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FST # THE FUTURE is 'wic' # IMAGE_FSTYPES_append = " wic" +# enable the packagemanagement +IMAGE_FEATURES =+ "package-management" +PACKAGE_FEED_URIS = "http://192.168.7.1:8000/tmp/deploy/" +PACKAGE_FEED_BASE_PATHS = "rpm" +PACKAGE_FEED_ARCHS = "" +#${PACKAGE_ARCHS}" + # Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools # (revalidate after 2017-10-15) -DIRFILES_pn-nativesdk-cmake = "1" - +#DIRFILES_pn-nativesdk-cmake = "1" diff --git a/meta-agl-distro/scripts/oe-depends-dot b/meta-agl-distro/scripts/oe-depends-dot new file mode 100755 index 000000000..5cec23bf0 --- /dev/null +++ b/meta-agl-distro/scripts/oe-depends-dot @@ -0,0 +1,121 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2018 Wind River Systems, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program 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 General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +import os +import sys +import argparse +import logging +import re + +class Dot(object): + def __init__(self): + parser = argparse.ArgumentParser( + description="Analyse recipe-depends.dot generated by bitbake -g", + epilog="Use %(prog)s --help to get help") + parser.add_argument("dotfile", + help = "Specify the dotfile", nargs = 1, action='store', default='') + parser.add_argument("-k", "--key", + help = "Specify the key, e.g., recipe name", + action="store", default='') + parser.add_argument("-d", "--depends", + help = "Print the key's dependencies", + action="store_true", default=False) + parser.add_argument("-w", "--why", + help = "Print why the key is built", + action="store_true", default=False) + parser.add_argument("-r", "--remove", + help = "Remove duplicated dependencies to reduce the size of the dot files." + " For example, A->B, B->C, A->C, then A->C can be removed.", + action="store_true", default=False) + + self.args = parser.parse_args() + + if len(sys.argv) != 3 and len(sys.argv) < 5: + print('ERROR: Not enough args, see --help for usage') + + def main(self): + #print(self.args.dotfile[0]) + # The format is {key: depends} + depends = {} + with open(self.args.dotfile[0], 'r') as f: + for line in f.readlines(): + if ' -> ' not in line: + continue + line_no_quotes = line.replace('"', '') + m = re.match("(.*) -> (.*)", line_no_quotes) + if not m: + print('WARNING: Found unexpected line: %s' % line) + continue + key = m.group(1) + if key == "meta-world-pkgdata": + continue + dep = m.group(2) + if key in depends: + if not key in depends[key]: + depends[key].add(dep) + else: + print('WARNING: Fonud duplicated line: %s' % line) + else: + depends[key] = set() + depends[key].add(dep) + + if self.args.remove: + reduced_depends = {} + for k, deps in depends.items(): + child_deps = set() + added = set() + # Both direct and indirect depends are already in the dict, so + # we don't have to do this recursively. + for dep in deps: + if dep in depends: + child_deps |= depends[dep] + + reduced_depends[k] = deps - child_deps + outfile= '%s-reduced%s' % (self.args.dotfile[0][:-4], self.args.dotfile[0][-4:]) + with open(outfile, 'w') as f: + print('Saving reduced dot file to %s' % outfile) + f.write('digraph depends {\n') + for k, v in reduced_depends.items(): + for dep in v: + f.write('"%s" -> "%s"\n' % (k, dep)) + f.write('}\n') + sys.exit(0) + + if self.args.key not in depends: + print("ERROR: Can't find key %s in %s" % (self.args.key, self.args.dotfile[0])) + sys.exit(1) + + if self.args.depends: + if self.args.key in depends: + print('Depends: %s' % ' '.join(depends[self.args.key])) + + reverse_deps = [] + if self.args.why: + for k, v in depends.items(): + if self.args.key in v and not k in reverse_deps: + reverse_deps.append(k) + print('Because: %s' % ' '.join(reverse_deps)) + +if __name__ == "__main__": + try: + dot = Dot() + ret = dot.main() + except Exception as esc: + ret = 1 + import traceback + traceback.print_exc() + sys.exit(ret) diff --git a/meta-agl-profile-core/conf/include/agl-devel.inc b/meta-agl-profile-core/conf/include/agl-devel.inc index 705b1739a..09d855c05 100644 --- a/meta-agl-profile-core/conf/include/agl-devel.inc +++ b/meta-agl-profile-core/conf/include/agl-devel.inc @@ -1,8 +1,8 @@ IMAGE_FEATURES =+ "debug-tweaks eclipse-debug tools-debug tools-profile" -#IMAGE_INSTALL_append = " \ -# packagegroup-agl-core-devel \ -#" +IMAGE_INSTALL_append = " \ + packagegroup-agl-core-devel \ +" IMAGE_INSTALL_append = "${@bb.utils.contains('IMAGE_FSTYPES', 'wic.vmdk', ' open-vm-tools vboxguestdrivers', '', d)}" diff --git a/meta-app-framework/recipes-apps/agl-service-can-low-level/agl-service-can-low-level_git.bb b/meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb similarity index 100% rename from meta-app-framework/recipes-apps/agl-service-can-low-level/agl-service-can-low-level_git.bb rename to meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb diff --git a/meta-app-framework/recipes-config/agl-users/agl-users_0.1.bb b/meta-agl-profile-core/recipes-config/agl-users/agl-users_0.1.bb similarity index 100% rename from meta-app-framework/recipes-config/agl-users/agl-users_0.1.bb rename to meta-agl-profile-core/recipes-config/agl-users/agl-users_0.1.bb diff --git a/meta-app-framework/recipes-config/dev-mapping/dev-mapping/dev-mapping.conf.default b/meta-agl-profile-core/recipes-config/dev-mapping/dev-mapping/dev-mapping.conf.default similarity index 100% rename from meta-app-framework/recipes-config/dev-mapping/dev-mapping/dev-mapping.conf.default rename to meta-agl-profile-core/recipes-config/dev-mapping/dev-mapping/dev-mapping.conf.default diff --git a/meta-app-framework/recipes-config/dev-mapping/dev-mapping_0.1.bb b/meta-agl-profile-core/recipes-config/dev-mapping/dev-mapping_0.1.bb similarity index 100% rename from meta-app-framework/recipes-config/dev-mapping/dev-mapping_0.1.bb rename to meta-agl-profile-core/recipes-config/dev-mapping/dev-mapping_0.1.bb diff --git a/meta-agl-profile-demo/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb b/meta-agl-profile-core/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb rename to meta-agl-profile-core/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb diff --git a/meta-agl-profile-demo/recipes-connectivity/bluez-alsa/files/bluez-alsa.service b/meta-agl-profile-core/recipes-connectivity/bluez-alsa/files/bluez-alsa.service similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/bluez-alsa/files/bluez-alsa.service rename to meta-agl-profile-core/recipes-connectivity/bluez-alsa/files/bluez-alsa.service diff --git a/meta-agl-profile-demo/recipes-connectivity/bluez5/bluez5/0001_fix_compile_issue_when_using_in_c++.patch b/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/0001_fix_compile_issue_when_using_in_c++.patch similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/bluez5/bluez5/0001_fix_compile_issue_when_using_in_c++.patch rename to meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/0001_fix_compile_issue_when_using_in_c++.patch diff --git a/meta-agl-profile-demo/recipes-connectivity/bluez5/bluez5/bluetooth.conf b/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/bluetooth.conf similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/bluez5/bluez5/bluetooth.conf rename to meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/bluetooth.conf diff --git a/meta-agl-profile-demo/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/bluez5/bluez5_%.bbappend rename to meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend diff --git a/meta-agl-profile-demo/recipes-connectivity/busybox/busybox_%.bbappend b/meta-agl-profile-core/recipes-connectivity/busybox/busybox_%.bbappend similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/busybox/busybox_%.bbappend rename to meta-agl-profile-core/recipes-connectivity/busybox/busybox_%.bbappend diff --git a/meta-agl-profile-demo/recipes-connectivity/busybox/files/enable-wget-https.cfg b/meta-agl-profile-core/recipes-connectivity/busybox/files/enable-wget-https.cfg similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/busybox/files/enable-wget-https.cfg rename to meta-agl-profile-core/recipes-connectivity/busybox/files/enable-wget-https.cfg diff --git a/meta-agl-profile-demo/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb b/meta-agl-profile-core/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb rename to meta-agl-profile-core/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb diff --git a/meta-agl-profile-demo/recipes-connectivity/connman/.appends.core b/meta-agl-profile-core/recipes-connectivity/connman/.appends.core similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/connman/.appends.core rename to meta-agl-profile-core/recipes-connectivity/connman/.appends.core diff --git a/meta-agl-profile-demo/recipes-connectivity/connman/connman_%.bbappend b/meta-agl-profile-core/recipes-connectivity/connman/connman_%.bbappend similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/connman/connman_%.bbappend rename to meta-agl-profile-core/recipes-connectivity/connman/connman_%.bbappend diff --git a/meta-agl-profile-demo/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch b/meta-agl-profile-core/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch rename to meta-agl-profile-core/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch diff --git a/meta-agl-profile-demo/recipes-connectivity/libnfc/libnfc_git.bb b/meta-agl-profile-core/recipes-connectivity/libnfc/libnfc_git.bb similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/libnfc/libnfc_git.bb rename to meta-agl-profile-core/recipes-connectivity/libnfc/libnfc_git.bb diff --git a/meta-agl-profile-demo/recipes-connectivity/rtl-sdr/rtl-sdr/0001-remove-I-usr-include-in-pkg-config.patch b/meta-agl-profile-core/recipes-connectivity/rtl-sdr/rtl-sdr/0001-remove-I-usr-include-in-pkg-config.patch similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/rtl-sdr/rtl-sdr/0001-remove-I-usr-include-in-pkg-config.patch rename to meta-agl-profile-core/recipes-connectivity/rtl-sdr/rtl-sdr/0001-remove-I-usr-include-in-pkg-config.patch diff --git a/meta-agl-profile-demo/recipes-connectivity/rtl-sdr/rtl-sdr_0.5.3.bb b/meta-agl-profile-core/recipes-connectivity/rtl-sdr/rtl-sdr_0.5.3.bb similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/rtl-sdr/rtl-sdr_0.5.3.bb rename to meta-agl-profile-core/recipes-connectivity/rtl-sdr/rtl-sdr_0.5.3.bb diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-automotive.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-automotive.bb deleted file mode 100644 index d9f2279e1..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-automotive.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Automotive Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-automotive \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-graphics.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-graphics.bb deleted file mode 100644 index 1cc6f457b..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-graphics.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Graphics Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-graphics \ - " - -ALLOW_EMPTY_${PN} = "1" diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-kernel.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-kernel.bb deleted file mode 100644 index 3d5556fd5..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-kernel.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Kernel Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-kernel \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bb deleted file mode 100644 index 01ca4cb85..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Multimedia Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-multimedia \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-navi-lbs.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-navi-lbs.bb deleted file mode 100644 index 2b04d5387..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-navi-lbs.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Navigation and Location Based Services Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-navi-lbs \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-security.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-security.bb deleted file mode 100644 index eb5a68f0a..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-security.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Security Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-security \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-speech-services.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-speech-services.bb deleted file mode 100644 index a494e5889..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-speech-services.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Speech Services Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-speech-services \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-demo/recipes-connectivity/rygel/.appends.meta-multimedia b/meta-agl-profile-core/recipes-devtools/gdb/.appends.core similarity index 100% rename from meta-agl-profile-demo/recipes-connectivity/rygel/.appends.meta-multimedia rename to meta-agl-profile-core/recipes-devtools/gdb/.appends.core diff --git a/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-devel.bb b/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb similarity index 96% rename from meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-devel.bb rename to meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb index ade8560ab..c1d6636e0 100644 --- a/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-devel.bb +++ b/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb @@ -21,4 +21,5 @@ RDEPENDS_${PN} = "\ rsync \ tree \ pstree \ + procps \ " diff --git a/meta-agl-profile-demo/recipes-qt/.gitkeep b/meta-agl-profile-core/recipes-extended/gperf/.appends.core similarity index 100% rename from meta-agl-profile-demo/recipes-qt/.gitkeep rename to meta-agl-profile-core/recipes-extended/gperf/.appends.core diff --git a/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi-qa.bb b/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi-qa.bb deleted file mode 100644 index 017439454..000000000 --- a/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi-qa.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "A basic system of AGL distribution of IVI profile for Quality Assurance(QA)" - -DESCRIPTION = "A basic set of AGL Distribution. This image also has additional \ -packages (e.g. commandline tools) for Quality Assurance(QA)." - -require agl-image-ivi.bb - -LICENSE = "MIT" - -IMAGE_INSTALL_append = " \ - packagegroup-agl-test \ - packagegroup-ivi-common-test \ - " - diff --git a/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi.bb b/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi.bb deleted file mode 100644 index dd4f89b15..000000000 --- a/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "A basic system of AGL distribution of IVI profile" - -DESCRIPTION = "Basic image for baseline of AGL Distribution for IVI profile." - -require agl-image-ivi.inc - -LICENSE = "MIT" - -IMAGE_INSTALL_append = "\ - packagegroup-agl-image-ivi \ - " - -DISTRO_FEATURES_append = " agl-core-image-profile" - -IMAGE_INSTALL += "\ - agl-desktop-config \ - " diff --git a/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi.inc b/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi.inc deleted file mode 100644 index 0b564840b..000000000 --- a/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi.inc +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-core/images/agl-image-minimal.inc - -IMAGE_FEATURES += "splash package-management ssh-server-dropbear" diff --git a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-image-ivi.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-image-ivi.bb deleted file mode 100644 index 075af913a..000000000 --- a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-image-ivi.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "The middlewares for AGL IVI profile" -DESCRIPTION = "The set of packages required for AGL Distribution" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-image-ivi \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - packagegroup-agl-image-minimal \ -" - -RDEPENDS_${PN} += "\ - packagegroup-agl-ivi-automotive \ - packagegroup-agl-ivi-connectivity \ - packagegroup-agl-ivi-graphics \ - packagegroup-agl-ivi-multimedia \ - packagegroup-agl-ivi-navi-lbs \ - packagegroup-agl-ivi-os-commonlibs \ - packagegroup-agl-ivi-speech-services \ - packagegroup-agl-ivi-security \ - packagegroup-agl-ivi-kernel \ - " - -RDEPENDS_${PN} += "\ - agl-login-manager \ - " diff --git a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-automotive.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-automotive.bb deleted file mode 100644 index f7221517f..000000000 --- a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-automotive.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "The middlewares for AGL IVI profile" -DESCRIPTION = "The set of packages required by Automotive Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-ivi-automotive \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-connectivity.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-connectivity.bb deleted file mode 100644 index 664180d55..000000000 --- a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-connectivity.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "The middlewares for AGL IVI profile" -DESCRIPTION = "The set of packages required by Connectivity Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-ivi-connectivity \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - ofono \ - rtl-sdr \ - rygel \ - rygel-plugin-media-export \ - rygel-plugin-lms \ - " diff --git a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-graphics.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-graphics.bb deleted file mode 100644 index d7650564b..000000000 --- a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-graphics.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "The middlewares for AGL IVI profile" -DESCRIPTION = "The set of packages required by Graphics Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-ivi-graphics \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-kernel.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-kernel.bb deleted file mode 100644 index be51817b7..000000000 --- a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-kernel.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "The middlewares for AGL IVI profile" -DESCRIPTION = "The set of packages required by Kernel Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-ivi-kernel \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-multimedia.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-multimedia.bb deleted file mode 100644 index 11536405e..000000000 --- a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-multimedia.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "The middlewares for AGL IVI profile" -DESCRIPTION = "The set of packages required by Multimedia Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-ivi-multimedia \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - gstreamer1.0-plugins-base-meta \ - gstreamer1.0-plugins-good-meta \ - lightmediascanner-meta \ - " diff --git a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-navi-lbs.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-navi-lbs.bb deleted file mode 100644 index b7f47eecc..000000000 --- a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-navi-lbs.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "The packages of middlewares for AGL IVI profile" -DESCRIPTION = "The set of packages required by Navigation and Location Based Services Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-ivi-navi-lbs \ - " - -RDEPENDS_${PN} += "\ - gpsd \ - geoclue \ - " diff --git a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-security.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-security.bb deleted file mode 100644 index f651c50cd..000000000 --- a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-security.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "The packages of middlewares for AGL IVI profile" -DESCRIPTION = "The set of packages required by Security Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-ivi-security \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-speech-services.bb b/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-speech-services.bb deleted file mode 100644 index eccebee9f..000000000 --- a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-speech-services.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "The packages of middlewares for AGL IVI profile" -DESCRIPTION = "The set of packages required by Speech Services Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-ivi-speech-services \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-demo/recipes-kernel/most/files/0002-src-most-add-auto-conf-feature.patch b/meta-agl-profile-core/recipes-kernel/most/files/0002-src-most-add-auto-conf-feature.patch similarity index 100% rename from meta-agl-profile-demo/recipes-kernel/most/files/0002-src-most-add-auto-conf-feature.patch rename to meta-agl-profile-core/recipes-kernel/most/files/0002-src-most-add-auto-conf-feature.patch diff --git a/meta-agl-profile-demo/recipes-kernel/most/files/0003-core-remove-kernel-log-for-MBO-status.patch b/meta-agl-profile-core/recipes-kernel/most/files/0003-core-remove-kernel-log-for-MBO-status.patch similarity index 100% rename from meta-agl-profile-demo/recipes-kernel/most/files/0003-core-remove-kernel-log-for-MBO-status.patch rename to meta-agl-profile-core/recipes-kernel/most/files/0003-core-remove-kernel-log-for-MBO-status.patch diff --git a/meta-agl-profile-demo/recipes-kernel/most/files/0004-most-video-set-device_caps.patch b/meta-agl-profile-core/recipes-kernel/most/files/0004-most-video-set-device_caps.patch similarity index 100% rename from meta-agl-profile-demo/recipes-kernel/most/files/0004-most-video-set-device_caps.patch rename to meta-agl-profile-core/recipes-kernel/most/files/0004-most-video-set-device_caps.patch diff --git a/meta-agl-profile-demo/recipes-kernel/most/files/0005-most-video-set-V4L2_CAP_DEVICE_CAPS-flag.patch b/meta-agl-profile-core/recipes-kernel/most/files/0005-most-video-set-V4L2_CAP_DEVICE_CAPS-flag.patch similarity index 100% rename from meta-agl-profile-demo/recipes-kernel/most/files/0005-most-video-set-V4L2_CAP_DEVICE_CAPS-flag.patch rename to meta-agl-profile-core/recipes-kernel/most/files/0005-most-video-set-V4L2_CAP_DEVICE_CAPS-flag.patch diff --git a/meta-agl-profile-demo/recipes-kernel/most/files/0006-dim2-fix-startup-sequence.patch b/meta-agl-profile-core/recipes-kernel/most/files/0006-dim2-fix-startup-sequence.patch similarity index 100% rename from meta-agl-profile-demo/recipes-kernel/most/files/0006-dim2-fix-startup-sequence.patch rename to meta-agl-profile-core/recipes-kernel/most/files/0006-dim2-fix-startup-sequence.patch diff --git a/meta-agl-profile-demo/recipes-kernel/most/files/0007-dim2-use-device-tree.patch b/meta-agl-profile-core/recipes-kernel/most/files/0007-dim2-use-device-tree.patch similarity index 100% rename from meta-agl-profile-demo/recipes-kernel/most/files/0007-dim2-use-device-tree.patch rename to meta-agl-profile-core/recipes-kernel/most/files/0007-dim2-use-device-tree.patch diff --git a/meta-agl-profile-demo/recipes-kernel/most/files/0008-dim2-read-clock-speed-from-the-device-tree.patch b/meta-agl-profile-core/recipes-kernel/most/files/0008-dim2-read-clock-speed-from-the-device-tree.patch similarity index 100% rename from meta-agl-profile-demo/recipes-kernel/most/files/0008-dim2-read-clock-speed-from-the-device-tree.patch rename to meta-agl-profile-core/recipes-kernel/most/files/0008-dim2-read-clock-speed-from-the-device-tree.patch diff --git a/meta-agl-profile-demo/recipes-kernel/most/files/0009-dim2-use-device-for-coherent-memory-allocation.patch b/meta-agl-profile-core/recipes-kernel/most/files/0009-dim2-use-device-for-coherent-memory-allocation.patch similarity index 100% rename from meta-agl-profile-demo/recipes-kernel/most/files/0009-dim2-use-device-for-coherent-memory-allocation.patch rename to meta-agl-profile-core/recipes-kernel/most/files/0009-dim2-use-device-for-coherent-memory-allocation.patch diff --git a/meta-agl-profile-demo/recipes-kernel/most/most.bb b/meta-agl-profile-core/recipes-kernel/most/most.bb similarity index 100% rename from meta-agl-profile-demo/recipes-kernel/most/most.bb rename to meta-agl-profile-core/recipes-kernel/most/most.bb diff --git a/meta-agl-profile-demo/recipes-kernel/most/most.bbappend b/meta-agl-profile-core/recipes-kernel/most/most.bbappend similarity index 100% rename from meta-agl-profile-demo/recipes-kernel/most/most.bbappend rename to meta-agl-profile-core/recipes-kernel/most/most.bbappend diff --git a/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/10-unload-modules.pa b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/10-unload-modules.pa new file mode 100644 index 000000000..1f8b723e2 --- /dev/null +++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/10-unload-modules.pa @@ -0,0 +1,4 @@ +unload-module module-role-cork +unload-module module-device-restore +unload-module module-stream-restore +unload-module module-card-restore diff --git a/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend index a54ec60f1..7eebe306d 100644 --- a/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend +++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend @@ -1,7 +1,19 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" + +SRC_URI += "file://10-unload-modules.pa" + inherit systemd + +# Add .include directive to default.pa so optional configuration can be added +do_install_append () { + echo ".include ${sysconfdir}/pulse/default.d" >> ${D}${sysconfdir}/pulse/default.pa + install -d ${D}${sysconfdir}/pulse/default.d + install -m 0644 ${WORKDIR}/10-unload-modules.pa ${D}${sysconfdir}/pulse/default.d/ +} + + do_install_append() { # Install pulseaudio systemd service if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then @@ -26,3 +38,4 @@ FILES_${PN}-server += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_user_unitdir}/pulseaudio.service', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_user_unitdir}/default.target.wants/pulseaudio.service', '', d)} \ " + diff --git a/meta-agl-profile-core/recipes-core/images/agl-image-boot.bb b/meta-agl-profile-core/recipes-platform/images/agl-image-boot.bb similarity index 100% rename from meta-agl-profile-core/recipes-core/images/agl-image-boot.bb rename to meta-agl-profile-core/recipes-platform/images/agl-image-boot.bb diff --git a/meta-agl-profile-core/recipes-core/images/agl-image-boot.inc b/meta-agl-profile-core/recipes-platform/images/agl-image-boot.inc similarity index 100% rename from meta-agl-profile-core/recipes-core/images/agl-image-boot.inc rename to meta-agl-profile-core/recipes-platform/images/agl-image-boot.inc diff --git a/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi-crosssdk.bb b/meta-agl-profile-core/recipes-platform/images/agl-image-minimal-crosssdk.bb old mode 100644 new mode 100755 similarity index 58% rename from meta-agl-profile-core/recipes-ivi/images/agl-image-ivi-crosssdk.bb rename to meta-agl-profile-core/recipes-platform/images/agl-image-minimal-crosssdk.bb index 0303d051d..164e1e9f5 --- a/meta-agl-profile-core/recipes-ivi/images/agl-image-ivi-crosssdk.bb +++ b/meta-agl-profile-core/recipes-platform/images/agl-image-minimal-crosssdk.bb @@ -1,15 +1,15 @@ -SUMMARY = "Cross SDK of AGL Distribution for IVI profile" +SUMMARY = "Cross SDK of Full AGL Distribution for core profile" -DESCRIPTION = "Basic image for baseline of AGL Distribution for IVI profile. \ +DESCRIPTION = "SDK image for full AGL Distribution for IVI profile. \ It includes the full meta-toolchain, plus developement headers and libraries \ to form a standalone cross SDK." -require agl-image-ivi.bb +require agl-image-minimal.bb LICENSE = "MIT" -IMAGE_FEATURES += "dev-pkgs" -IMAGE_INSTALL += "kernel-dev" +IMAGE_FEATURES_append = " dev-pkgs" +IMAGE_INSTALL_append = " kernel-dev kernel-devsrc" inherit populate_sdk @@ -17,3 +17,4 @@ inherit populate_sdk # Both exec "createrepo" on the same directory, and so one of them # can failed (randomly). addtask do_populate_sdk after do_rootfs + diff --git a/meta-agl-profile-core/recipes-core/images/agl-image-minimal-qa.bb b/meta-agl-profile-core/recipes-platform/images/agl-image-minimal-qa.bb similarity index 100% rename from meta-agl-profile-core/recipes-core/images/agl-image-minimal-qa.bb rename to meta-agl-profile-core/recipes-platform/images/agl-image-minimal-qa.bb diff --git a/meta-agl-profile-core/recipes-core/images/agl-image-minimal.bb b/meta-agl-profile-core/recipes-platform/images/agl-image-minimal.bb similarity index 100% rename from meta-agl-profile-core/recipes-core/images/agl-image-minimal.bb rename to meta-agl-profile-core/recipes-platform/images/agl-image-minimal.bb diff --git a/meta-agl-profile-core/recipes-core/images/agl-image-minimal.inc b/meta-agl-profile-core/recipes-platform/images/agl-image-minimal.inc similarity index 100% rename from meta-agl-profile-core/recipes-core/images/agl-image-minimal.inc rename to meta-agl-profile-core/recipes-platform/images/agl-image-minimal.inc diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-core-boot-agl.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb similarity index 100% rename from meta-agl-profile-core/recipes-core/packagegroups/packagegroup-core-boot-agl.bb rename to meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb similarity index 96% rename from meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bb rename to meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb index e909d5e5f..38d44995c 100644 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bb +++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb @@ -12,4 +12,5 @@ ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += "\ dhcp-server \ ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','connman','connman connman-client connman-tests connman-tools connman-ncurses','',d)} \ + rtl-sdr \ " diff --git a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb new file mode 100644 index 000000000..a56aa5070 --- /dev/null +++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb @@ -0,0 +1,27 @@ +SUMMARY = "The software for application framework of AGL IVI profile" +DESCRIPTION = "A set of packages belong to AGL application framework which required by \ +Multimedia Subsystem" + +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-core-multimedia \ + " + +RDEPENDS_${PN} += "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '' , 'agl-audio-plugin', d)} \ + alsa-utils \ + pulseaudio-server \ + pulseaudio-misc \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '\ + pulseaudio-module-bluetooth-discover \ + pulseaudio-module-bluetooth-policy \ + pulseaudio-module-bluez5-discover \ + pulseaudio-module-bluez5-device \ + pulseaudio-module-switch-on-connect \ + pulseaudio-module-loopback \ + ','', d)} \ + gstreamer1.0-meta-base \ + " diff --git a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-navi-lbs.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-navigation.bb similarity index 72% rename from meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-navi-lbs.bb rename to meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-navigation.bb index 3e5c9b396..daebe4bde 100644 --- a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-navi-lbs.bb +++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-navigation.bb @@ -7,11 +7,10 @@ LICENSE = "MIT" inherit packagegroup PACKAGES = "\ - packagegroup-agl-appfw-navi-lbs \ + packagegroup-agl-core-navigation \ " RDEPENDS_${PN} += "\ - agl-service-gps \ - agl-service-geoclue \ - agl-service-geofence \ + gpsd \ + geoclue \ " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-os-commonlibs.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb similarity index 60% rename from meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-os-commonlibs.bb rename to meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb index c44166e12..aef732838 100644 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-os-commonlibs.bb +++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb @@ -1,4 +1,5 @@ -DESCRIPTION = "The minimal set of packages for Operating System and Common libraries Subsystem" +SUMMARY = "The packages of middlewares for AGL IVI profile" +DESCRIPTION = "The set of packages required by Operating System and Common libraries Subsystem" LICENSE = "MIT" inherit packagegroup diff --git a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-os-commonlibs.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb similarity index 86% rename from meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-os-commonlibs.bb rename to meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb index 0a9de8d5f..0ae5c77a3 100644 --- a/meta-agl-profile-core/recipes-ivi/packagegroups/packagegroup-agl-ivi-os-commonlibs.bb +++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" inherit packagegroup PACKAGES = "\ - packagegroup-agl-ivi-os-commonlibs \ + packagegroup-agl-core-security \ " ALLOW_EMPTY_${PN} = "1" diff --git a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb new file mode 100644 index 000000000..f5a53461a --- /dev/null +++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "The minimal set of packages for Connectivity Subsystem" +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-core-services \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += "\ +agl-service-bluetooth \ +agl-service-can-low-level \ +agl-service-data-persistence \ +agl-service-geoclue \ +agl-service-geofence \ +agl-service-gps \ +agl-service-identity-agent \ +agl-service-mediascanner \ +agl-service-navigation \ +agl-service-nfc \ +agl-service-radio \ +agl-service-signal-composer \ +agl-service-steering-wheel \ +agl-service-unicens \ +agl-service-weather \ +agl-service-wifi \ +high-level-viwi-service \ + " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-boot.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb similarity index 87% rename from meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-boot.bb rename to meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb index 29f859c49..ba7ccdd00 100644 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-boot.bb +++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb @@ -10,7 +10,7 @@ PACKAGES = "\ ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += "\ - packagegroup-core-boot-agl \ + packagegroup-agl-core-boot \ " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb similarity index 63% rename from meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb rename to meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb index 630c11d43..027cf6b23 100644 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb +++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb @@ -5,23 +5,23 @@ inherit packagegroup PACKAGES = "\ packagegroup-agl-image-minimal \ + profile-agl-minimal \ " ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += "\ - packagegroup-core-boot-agl \ + packagegroup-agl-core-boot \ " RDEPENDS_${PN} += "\ - packagegroup-agl-core-automotive \ packagegroup-agl-core-connectivity \ - packagegroup-agl-core-graphics \ + packagegroup-agl-core-navigation \ packagegroup-agl-core-multimedia \ - packagegroup-agl-core-navi-lbs \ packagegroup-agl-core-os-commonlibs \ - packagegroup-agl-core-speech-services \ + packagegroup-agl-core-services \ packagegroup-agl-core-security \ - packagegroup-agl-core-kernel \ " + +RDEPENDS_profile-agl-minimal = "${PN}" diff --git a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-agl.bb b/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-agl.bb deleted file mode 100644 index cc923fd4a..000000000 --- a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-agl.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "The software for application framework of AGL IVI profile" -DESCRIPTION = "A set of packages belong to AGL application framework which required by \ -AGL App Fw Subsystem" - -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-appfw-agl \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-automotive.bb b/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-automotive.bb deleted file mode 100644 index 333195b74..000000000 --- a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-automotive.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "The software for application framework of AGL IVI profile" -DESCRIPTION = "A set of packages belong to AGL application framework which required by \ -Automotive Subsystem" - -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-appfw-automotive \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-connectivity.bb b/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-connectivity.bb deleted file mode 100644 index fa45c97d6..000000000 --- a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-connectivity.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "The software for application framework of AGL IVI profile" -DESCRIPTION = "A set of packages belong to AGL application framework which required by \ -Connectivity Subsystem" - -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-appfw-connectivity \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " - -AGL_APPS = " \ - " -# restricted due to dependency on Kernel >= 4.8 which is not available in all repositories -AGL_APPS_append_m3ulcb = " agl-service-can-low-level " -AGL_APPS_append_intel-corei7-64 = " agl-service-can-low-level " -AGL_APPS_append_qemux86-64 = " agl-service-can-low-level " - -RDEPENDS_${PN}_append = " \ - ${AGL_APPS} \ - " - diff --git a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-graphics.bb b/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-graphics.bb deleted file mode 100644 index 1e707ce46..000000000 --- a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-graphics.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "The software for application framework of AGL IVI profile" -DESCRIPTION = "A set of packages belong to AGL application framework which required by \ -Graphics Subsystem" - -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-appfw-graphics \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - opencv \ - " diff --git a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-multimedia.bb b/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-multimedia.bb deleted file mode 100644 index ed395f4f0..000000000 --- a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-multimedia.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "The software for application framework of AGL IVI profile" -DESCRIPTION = "A set of packages belong to AGL application framework which required by \ -Multimedia Subsystem" - -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-appfw-multimedia \ - " - -RDEPENDS_${PN} += "\ - agl-service-mediaplayer \ - " diff --git a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-security.bb b/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-security.bb deleted file mode 100644 index 3806899da..000000000 --- a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-security.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "The software for application framework of AGL IVI profile" -DESCRIPTION = "A set of packages belong to AGL application framework which required by \ -Security Subsystem" - -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-appfw-security \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-speech-services.bb b/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-speech-services.bb deleted file mode 100644 index 5f716c21e..000000000 --- a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-speech-services.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "The software for application framework of AGL IVI profile" -DESCRIPTION = "A set of packages belong to AGL application framework which required by \ -Speech Services Subsystem" - -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-appfw-speech-services \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw.bb b/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw.bb deleted file mode 100644 index cb5636bfd..000000000 --- a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "The software for application framework of AGL IVI profile" -DESCRIPTION = "A set of packages belong to AGL application framework" - -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-appfw \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - packagegroup-agl-appfw-automotive \ - packagegroup-agl-appfw-connectivity \ - packagegroup-agl-appfw-graphics \ - packagegroup-agl-appfw-multimedia \ - packagegroup-agl-appfw-navi-lbs \ - packagegroup-agl-appfw-agl \ - packagegroup-agl-appfw-native \ - packagegroup-agl-appfw-web \ - packagegroup-agl-appfw-security \ - packagegroup-agl-appfw-speech-services \ - " diff --git a/meta-agl-profile-demo/recipes-connectivity/rygel/files/0001-Fix-missing-link-to-unistring-for-lms-plugin.patch b/meta-agl-profile-demo/recipes-connectivity/rygel/files/0001-Fix-missing-link-to-unistring-for-lms-plugin.patch deleted file mode 100644 index 57b97a6ca..000000000 --- a/meta-agl-profile-demo/recipes-connectivity/rygel/files/0001-Fix-missing-link-to-unistring-for-lms-plugin.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 10602ca53b1c1231e96d8d446904617528c11dae Mon Sep 17 00:00:00 2001 -From: Ronan Le Martret -Date: Mon, 13 Mar 2017 15:31:41 +0100 -Subject: [PATCH] Fix missing link to unistring for lms plugin - -Signed-off-by: Ronan Le Martret ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index c5cbc00..2f7dc78 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -248,6 +248,10 @@ AS_IF([test "x$enable_lms_plugin" = "xyes"], - gio-2.0 >= $GIO_REQUIRED - sqlite3 >= $LIBSQLITE3_REQUIRED]) - RYGEL_PLUGIN_LMS_DEPS_VALAFLAGS="$RYGEL_COMMON_MODULES_VALAFLAGS --pkg gio-2.0 --pkg gee-0.8 --pkg sqlite3" -+ AS_IF([test "x$have_unistring" = "xyes"], -+ [ -+ RYGEL_PLUGIN_LMS_DEPS_LIBS="$RYGEL_PLUGIN_LMS_DEPS_LIBS -lunistring" -+ ]) - AC_SUBST([RYGEL_PLUGIN_LMS_DEPS_VALAFLAGS]) - ]) - --- -2.6.6 - diff --git a/meta-agl-profile-demo/recipes-connectivity/rygel/files/rygel.service b/meta-agl-profile-demo/recipes-connectivity/rygel/files/rygel.service deleted file mode 100644 index fb94d7160..000000000 --- a/meta-agl-profile-demo/recipes-connectivity/rygel/files/rygel.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Rygel -After=lightmediascanner.service -Requires=lightmediascanner.service - -[Service] -Type=dbus -BusName=org.gnome.Rygel1 -ExecStart=/usr/bin/rygel -c /etc/rygel.conf - -[Install] -WantedBy=default.target -Alias=dbus-org.gnome.Rygel1.service diff --git a/meta-agl-profile-demo/recipes-connectivity/rygel/rygel_%.bbappend b/meta-agl-profile-demo/recipes-connectivity/rygel/rygel_%.bbappend deleted file mode 100644 index 4ae59259f..000000000 --- a/meta-agl-profile-demo/recipes-connectivity/rygel/rygel_%.bbappend +++ /dev/null @@ -1,25 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -# Disable everything but the media-export plugin, add the lms plugin -PACKAGECONFIG = "media-export lms" -PACKAGECONFIG[lms] = "--enable-lms-plugin,--disable-lms-plugin,sqlite3" - -# LightMediaScanner plugin patches -SRC_URI += "\ - file://0001-Fix-missing-link-to-unistring-for-lms-plugin.patch \ - file://rygel.service \ -" - -do_install_prepend() { - # Install rygel systemd service - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -m 644 -p -D ${WORKDIR}/rygel.service ${D}${systemd_user_unitdir}/rygel.service - - # Execute these manually on behalf of systemctl script (from systemd-systemctl-native.bb) - # because it does not support systemd's user mode. - # However, systemctl --global should be checked - #mkdir -p ${D}/etc/systemd/user/default.target.wants/ - #ln -sf ${systemd_user_unitdir}/rygel.service ${D}/etc/systemd/user/dbus-org.gnome.Rygel1.service - #ln -sf ${systemd_user_unitdir}/rygel.service ${D}/etc/systemd/user/default.target.wants/rygel.service - fi -} diff --git a/meta-agl-profile-demo/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb b/meta-agl-profile-demo/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb deleted file mode 100644 index abe6786f2..000000000 --- a/meta-agl-profile-demo/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Multimedia Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-ivi-common-core-multimedia \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch deleted file mode 100644 index 5bf6bf88e..000000000 --- a/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8080b7395c1638baee60fb3c46667f21e00b87fb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Erik=20Bot=C3=B6?= -Date: Fri, 4 Apr 2014 10:59:18 +0200 -Subject: [PATCH 1/4] Fix build with systemd >= 209 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [Configuration Specific] -Signed-off-by: Erik Botö ---- - src/system/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt -index ce87914..1d0d224 100644 ---- a/src/system/CMakeLists.txt -+++ b/src/system/CMakeLists.txt -@@ -23,7 +23,7 @@ set(dlt_system_SRCS dlt-system.c dlt-system-options.c dlt-system-process-handlin - dlt-system-syslog.c dlt-system-watchdog.c dlt-system-journal.c) - add_executable(dlt-system ${dlt_system_SRCS} ${systemd_SRCS}) - if(WITH_SYSTEMD_JOURNAL) -- target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES} systemd-journal systemd-id128) -+ target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES} systemd) - else(WITH_SYSTEMD_JOURNAL) - target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES}) - endif(WITH_SYSTEMD_JOURNAL) --- -1.9.3 - diff --git a/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch deleted file mode 100644 index 168847990..000000000 --- a/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch +++ /dev/null @@ -1,81 +0,0 @@ -From bcca4c99394ba422d03a5e76f2a0023ef248824a Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan -Date: Tue, 18 Nov 2014 15:47:22 +0100 -Subject: [PATCH 2/4] Don't execute processes as a specific user. - -Upstream-Status: Inappropriate [Configuration Specific] -Signed-off-by: Andrei Gherzan ---- - systemd/dlt-adaptor-udp.service.cmake | 1 - - systemd/dlt-example-user.service.cmake | 1 - - systemd/dlt-receive.service.cmake | 1 - - systemd/dlt-system.service.cmake | 1 - - systemd/dlt.service.cmake | 1 - - 5 files changed, 5 deletions(-) - -diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake -index 8dac1f2..ecf9f9e 100644 ---- a/systemd/dlt-adaptor-udp.service.cmake -+++ b/systemd/dlt-adaptor-udp.service.cmake -@@ -21,9 +21,8 @@ Wants=dlt.service - - [Service] - Type=simple --User=@DLT_USER@ - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-adaptor-udp -a @DLT_ADAPTOR_UDP_APPID@ -c @DLT_ADAPTOR_UDP_CTID@ -p @DLT_ADAPTOR_UDP_PORT@ - LimitCORE=infinity - - [Install] --WantedBy=multi-user.target -\ No newline at end of file -+WantedBy=multi-user.target -diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake -index b665742..35009b0 100644 ---- a/systemd/dlt-example-user.service.cmake -+++ b/systemd/dlt-example-user.service.cmake -@@ -21,6 +21,5 @@ Wants=dlt.service - - [Service] - Type=simple --User=@DLT_USER@ - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application" --LimitCORE=infinity -\ No newline at end of file -+LimitCORE=infinity -diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake -index c07d447..8f88f00 100644 ---- a/systemd/dlt-receive.service.cmake -+++ b/systemd/dlt-receive.service.cmake -@@ -22,6 +22,5 @@ Wants=dlt.service - - [Service] - Type=simple --User=@DLT_USER@ - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-receive -o /tmp/dlt_receive_log.dlt localhost --LimitCORE=infinity -\ No newline at end of file -+LimitCORE=infinity -diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake -index 0e91f42..1a5b913 100755 ---- a/systemd/dlt-system.service.cmake -+++ b/systemd/dlt-system.service.cmake -@@ -22,7 +22,6 @@ Wants=dlt.service - - [Service] - Type=simple --User=@DLT_USER@ - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-system - WatchdogSec=@DLT_WatchdogSec@ - NotifyAccess=main -diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake -index 0b3ee2c..e4753a2 100755 ---- a/systemd/dlt.service.cmake -+++ b/systemd/dlt.service.cmake -@@ -21,7 +21,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5) - - [Service] - Type=simple --User=@DLT_USER@ - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-daemon - WatchdogSec=@DLT_WatchdogSec@ - NotifyAccess=main diff --git a/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch deleted file mode 100644 index 691a50027..000000000 --- a/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 6804c68ed61f4436818c58cb0abe1c21b4d48aea Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan -Date: Tue, 18 Nov 2014 15:48:50 +0100 -Subject: [PATCH 3/4] systemd/*: unit type should be in lowercase, so use - Type=simple - -Upstream-Status: Submitted [http://lists.genivi.org/pipermail/genivi-diagnostic-log-and-trace/2014-October/000546.html] -Signed-off-by: Andrei Gherzan ---- - systemd/dlt-adaptor-udp.service.cmake | 2 +- - systemd/dlt-dbus.service.cmake | 2 +- - systemd/dlt-example-user.service.cmake | 2 +- - systemd/dlt-receive.service.cmake | 2 +- - systemd/dlt-system.service.cmake | 2 +- - systemd/dlt.service.cmake | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake -index f446757..81a7158 100644 ---- a/systemd/dlt-adaptor-udp.service.cmake -+++ b/systemd/dlt-adaptor-udp.service.cmake -@@ -19,7 +19,7 @@ Description=GENIVI DLT adaptor stdin. Adaptor for forwarding received UDP messag - Wants=dlt.service - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-adaptor-udp -a @DLT_ADAPTOR_UDP_APPID@ -c @DLT_ADAPTOR_UDP_CTID@ -p @DLT_ADAPTOR_UDP_PORT@ - LimitCORE=infinity - -diff --git a/systemd/dlt-dbus.service.cmake b/systemd/dlt-dbus.service.cmake -index d1e3b12..75dcdc3 100755 ---- a/systemd/dlt-dbus.service.cmake -+++ b/systemd/dlt-dbus.service.cmake -@@ -20,7 +20,7 @@ Documentation=man:dlt-dbus(1) man:dlt-dbus.conf(5) - Wants=dlt.service - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-dbus - WatchdogSec=@DLT_WatchdogSec@ - NotifyAccess=main -diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake -index b67a83c..fe9c567 100644 ---- a/systemd/dlt-example-user.service.cmake -+++ b/systemd/dlt-example-user.service.cmake -@@ -19,6 +19,6 @@ Description=GENIVI DLT example user. Generate DLT messages and store them to fil - Wants=dlt.service - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application" - LimitCORE=infinity -\ No newline at end of file -diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake -index 4bbdfc2..3b47dd3 100644 ---- a/systemd/dlt-receive.service.cmake -+++ b/systemd/dlt-receive.service.cmake -@@ -20,6 +20,6 @@ Documentation=man:dlt-receive(1) - Wants=dlt.service - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-receive -o /tmp/dlt_receive_log.dlt localhost - LimitCORE=infinity -\ No newline at end of file -diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake -index 7ec995c..d4a4c96 100755 ---- a/systemd/dlt-system.service.cmake -+++ b/systemd/dlt-system.service.cmake -@@ -20,7 +20,7 @@ Documentation=man:dlt-system(1) man:dlt-system.conf(5) - Wants=dlt.service - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-system - WatchdogSec=@DLT_WatchdogSec@ - NotifyAccess=main -diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake -index 7bb05bc..5386ffd 100755 ---- a/systemd/dlt.service.cmake -+++ b/systemd/dlt.service.cmake -@@ -19,7 +19,7 @@ Description=GENIVI DLT logging daemon - Documentation=man:dlt-daemon(1) man:dlt.conf(5) - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-daemon - WatchdogSec=@DLT_WatchdogSec@ - NotifyAccess=main --- -1.9.3 - diff --git a/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch deleted file mode 100644 index 685dfcddc..000000000 --- a/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9a5e655cf57301008cd61d53c8a410a7f397e650 Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan -Date: Tue, 18 Nov 2014 15:51:30 +0100 -Subject: [PATCH 4/4] Modify systemd config directory - -Upstream-Status: Inappropriate [Configuration Specific] -Signed-off-by: Andrei Gherzan ---- - systemd/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e6b44a2..0e885bf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -175,7 +175,7 @@ if(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD_JOURNAL) - - set( systemd_SRCS ${CMAKE_SOURCE_DIR}/systemd/3rdparty/sd-daemon.c) - -- set(SYSTEMD_UNITDIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" CACHE PATH -+ set(SYSTEMD_UNITDIR "/lib/systemd/system" CACHE PATH - "Set directory to install systemd unit files") - - add_subdirectory( systemd ) diff --git a/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb deleted file mode 100644 index b521bca91..000000000 --- a/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Diagnostic Log and Trace" -DESCRIPTION = "This component provides a standardised log and trace interface, \ -based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. \ -This component can be used by GENIVI components and other applications as \ -logging facility providing: \ -- the DLT shared library \ -- the DLT daemon, including startup scripts \ -- the DLT daemon adaptors- the DLT client console utilities \ -- the DLT test applications" -HOMEPAGE = "https://www.genivi.org/" -SECTION = "console/utils" -LICENSE = "MPLv2" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99ba60c3fad7eaf8c56bca6dd75cba09 \ - file://MPL.txt;md5=ccdb2761cef70c8b2612624c323f89dc" - -DEPENDS = "dbus zlib pigz-native" -do_unpack[depends] += "pigz-native:do_populate_sysroot" - -# FIX ME -# This should be TAG = "v${PV}" but yocto doesn't support lightweight tags for now -# https://bugzilla.yoctoproject.org/show_bug.cgi?id=6881 -TAG = "b8b3ea3a31f7deb681941a19878c82e7b7350ae7" -BRANCH = "v2.11.x" -SRC_URI = "git://git.projects.genivi.org/${PN}.git;branch=${BRANCH};tag=${TAG} \ - file://0001-Fix-build-with-systemd-209.patch \ - file://0002-Don-t-execute-processes-as-a-specific-user.patch \ - file://0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch \ - file://0004-Modify-systemd-config-directory.patch" -S = "${WORKDIR}/git" - -inherit autotools gettext cmake systemd - -# -fPIC is needed to prevent relocation errors when we compile gtest with -# Yocto security flags. See this issue for more details: -# -# https://github.com/google/googletest/issues/854 -# -# If that issue is fixed, we can probably remove the manual -fPIC flags here. -OECMAKE_C_FLAGS += "-fPIC" -OECMAKE_CXX_FLAGS += "-fPIC" - -PACKAGES += "${PN}-systemd" -SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "dlt-system.service dlt.service" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" -SYSTEMD_SERVICE_${PN}-systemd = "dlt-example-user.service \ - dlt-dbus.service \ - dlt-adaptor-udp.service \ - dlt-receive.service" -SYSTEMD_AUTO_ENABLE_${PN}-systemd = "disable" - -EXTRA_OECMAKE = "-DWITH_SYSTEMD=ON" - -FILES_${PN}-doc += "/usr/share/dlt-filetransfer" diff --git a/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb b/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb deleted file mode 100644 index dbc87c9ac..000000000 --- a/meta-agl-profile-demo/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Diagnostic Log and Trace" -DESCRIPTION = "This component provides a standardised log and trace interface, \ -based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. \ -This component can be used by GENIVI components and other applications as \ -logging facility providing: \ -- the DLT shared library \ -- the DLT daemon, including startup scripts \ -- the DLT daemon adaptors- the DLT client console utilities \ -- the DLT test applications" -HOMEPAGE = "https://www.genivi.org/" -SECTION = "console/utils" -LICENSE = "MPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" - -DEPENDS = "dbus zlib pigz-native" -do_unpack[depends] += "pigz-native:do_populate_sysroot" - -SRCREV = "e9a486a08fff6d3cc7133a350cec3ee10f463207" -SRC_URI = "git://git.projects.genivi.org/${BPN}.git;protocol=http \ - file://0002-Don-t-execute-processes-as-a-specific-user.patch \ - file://0004-Modify-systemd-config-directory.patch \ - " -S = "${WORKDIR}/git" - -inherit autotools gettext cmake systemd - -# -fPIC is needed to prevent relocation errors when we compile gtest with -# Yocto security flags. See this issue for more details: -# -# https://github.com/google/googletest/issues/854 -# -# If that issue is fixed, we can probably remove the manual -fPIC flags here. -OECMAKE_C_FLAGS += "-fPIC" -OECMAKE_CXX_FLAGS += "-fPIC" - -PACKAGES += "${PN}-systemd" -SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "dlt-system.service dlt.service" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" -SYSTEMD_SERVICE_${PN}-systemd = "dlt-example-user.service \ - dlt-dbus.service \ - dlt-adaptor-udp.service \ - dlt-receive.service" -SYSTEMD_AUTO_ENABLE_${PN}-systemd = "disable" - -EXTRA_OECMAKE = "-DWITH_SYSTEMD=ON" - -FILES_${PN}-doc += "/usr/share/dlt-filetransfer" - -do_install_append() { - rm -f ${D}${bindir}/dlt-test-* -} diff --git a/meta-agl-profile-demo/recipes-kernel/mocca-usb/mocca-usb.bb b/meta-agl-profile-demo/recipes-kernel/mocca-usb/mocca-usb.bb deleted file mode 100644 index cf4e5856b..000000000 --- a/meta-agl-profile-demo/recipes-kernel/mocca-usb/mocca-usb.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Build USB driver for MOCCA box" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -inherit module - -PV = "0.1" - -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/can-lin/;protocol=https;branch=${AGL_BRANCH}" -S = "${WORKDIR}/git/Usb-Driver" -SRCREV = "02ba272c0eb51b06160307b6cb71f91684772c8c" - -# The inherit of module.bbclass will automatically name module packages with -# "kernel-module-" prefix as required by the oe-core build environment. - -do_install_append () { - # modprobe automatically at boot - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${sysconfdir}/modules-load.d - echo "mocca_usb" > ${D}${sysconfdir}/modules-load.d/mocca_usb.conf - fi -} diff --git a/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager/0001-Fix-duplicated-command-line-arg-t.patch b/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager/0001-Fix-duplicated-command-line-arg-t.patch deleted file mode 100644 index fcdf9c540..000000000 --- a/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager/0001-Fix-duplicated-command-line-arg-t.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c4b6030f575e38dfc9cca7dfd029d207f3af6a13 Mon Sep 17 00:00:00 2001 -From: "Andre Moreira Magalhaes (andrunko)" -Date: Thu, 5 May 2016 00:01:19 -0300 -Subject: [PATCH] Fix duplicated command line arg -t. - ---- - AudioManagerDaemon/src/main.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp -index 795795d..67c0977 100755 ---- a/AudioManagerDaemon/src/main.cpp -+++ b/AudioManagerDaemon/src/main.cpp -@@ -87,7 +87,7 @@ TCLAP::ValueArg commandPluginDir("l","CommandPluginDir","path for l - TCLAP::ValueArg databasePath ("p","databasePath","path for sqlite database (default is in memory)",false,":memory:","string"); - TCLAP::ValueArg telnetPort ("t","telnetport","The port that is used for telnet",false,DEFAULT_TELNETPORT,"int"); - TCLAP::ValueArg maxConnections ("m","maxConnections","Maximal number of connections for telnet",false,MAX_TELNETCONNECTIONS,"int"); --TCLAP::SwitchArg dbusWrapperTypeBool ("t","dbusType","DbusType to be used by CAmDbusWrapper: if option is selected, DBUS_SYSTEM is used otherwise DBUS_SESSION",false); -+TCLAP::SwitchArg dbusWrapperTypeBool ("T","dbusType","DbusType to be used by CAmDbusWrapper: if option is selected, DBUS_SYSTEM is used otherwise DBUS_SESSION",false); - TCLAP::SwitchArg enableNoDLTDebug ("V","logDlt","print DLT logs to stdout",false); - TCLAP::SwitchArg currentSettings("i","currentSettings","print current settings and exit",false); - TCLAP::SwitchArg daemonizeAM("d","daemonize","daemonize Audiomanager. Better use systemd...",false); --- -2.5.0 - diff --git a/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager/audiomanager.service b/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager/audiomanager.service deleted file mode 100644 index 2210a377b..000000000 --- a/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager/audiomanager.service +++ /dev/null @@ -1,17 +0,0 @@ -# AudioManager systemd service file - -[Unit] -Description=GENIVI AudioManager -Requires=dbus.service -After=dbus.service -Before=pulseaudio.service - -[Service] -Type=notify -ExecStart=/usr/bin/AudioManager -T -Restart=always -TimeoutSec=2 -WatchdogSec=2 - -[Install] -WantedBy=multi-user.target diff --git a/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager_7.4.bb b/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager_7.4.bb deleted file mode 100644 index 15eb36252..000000000 --- a/meta-agl-profile-demo/recipes-multimedia/audiomanager/audiomanager_7.4.bb +++ /dev/null @@ -1,56 +0,0 @@ -DESCRIPTION = "GENIVI Audio Manager" -HOMEPAGE = "http://projects.genivi.org/audio-manager/home" -LICENSE = "MPLv2" -SECTION = "multimedia" -DEPENDS = "dbus dlt-daemon systemd" -LIC_FILES_CHKSUM = "file://LICENCE;md5=f164349b56ed530a6642e9b9f244eec5" - -SRC_URI = " \ - git://github.com/GENIVI/AudioManager.git;protocol=https;branch=master \ - file://audiomanager.service \ -" -RDEPENDS_${PN} = "audiomanager-plugins module-router" -SRCREV = "daf851ee7a41d1b0572c0c95e15f61e427ce97f1" - -S = "${WORKDIR}/git" -inherit cmake systemd -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "audiomanager.service" -SYSTEMD_AUTO_ENABLE = "enable" - -EXTRA_OECMAKE = " \ - -DWITH_TESTS=OFF \ - -DWITH_DOCUMENTATION=OFF \ - -DWITH_DLT=ON \ - -DWITH_TELNET=OFF \ - -DWITH_SYSTEMD_WATCHDOG=ON \ - -DGLIB_DBUS_TYPES_TOLERANT=ON \ - -DWITH_CAPI_WRAPPER=OFF \ - -DWITH_DBUS_WRAPPER=ON \ - -DWITH_SHARED_UTILITIES=ON \ - -DWITH_SHARED_CORE=ON \ -" - -FILES_${PN} = " \ - ${bindir}/AudioManager \ - ${libdir}/libAudioManagerCore.so.7 \ - ${libdir}/libAudioManagerCore.so.7.4 \ - ${libdir}/libAudioManagerCore.so.7.4.12 \ - ${libdir}/libAudioManagerUtilities.so.7 \ - ${libdir}/libAudioManagerUtilities.so.7.4 \ - ${libdir}/libAudioManagerUtilities.so.7.4.12 \ - ${systemd_unitdir}/audiomanager.service \ -" - -FILES_${PN}-dev = " \ - ${includedir}/audiomanager/* \ - ${libdir}/cmake/* \ - ${libdir}/pkgconfig/* \ - ${libdir}/libAudioManagerCore.so \ - ${libdir}/libAudioManagerUtilities.so \ -" - -do_install_append() { - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/audiomanager.service ${D}${systemd_unitdir}/system/ -} diff --git a/meta-agl-profile-graphical-html5/conf/layer.conf b/meta-agl-profile-graphical-html5/conf/layer.conf new file mode 100644 index 000000000..4d84dba52 --- /dev/null +++ b/meta-agl-profile-graphical-html5/conf/layer.conf @@ -0,0 +1,10 @@ +# 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" + +BBFILE_COLLECTIONS += "aglprofilegraphicalhtml5" +BBFILE_PATTERN_aglprofilegraphicalhtml5 = "^${LAYERDIR}/" +BBFILE_PRIORITY_aglprofilegraphicalhtml5 = "70" diff --git a/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.service b/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.service new file mode 100644 index 000000000..2c8648475 --- /dev/null +++ b/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.service @@ -0,0 +1,16 @@ +[Unit] +Description=HTML5 runtime for OpenIVI Mobility applications +Requires=afm-user-daemon.service InputEventManager.service +After=afm-user-daemon.service InputEventManager.service +ConditionKernelCommandLine=!agl.nogfx + +[Service] +Type=dbus +BusName=org.agl.openivi +ExecStart=/usr/bin/openivi-html5.sh +Restart=on-failure +RestartSec=5 +TimeoutStopSec=1 + +[Install] +WantedBy=default.target diff --git a/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.sh b/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.sh new file mode 100644 index 000000000..a318214ad --- /dev/null +++ b/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.sh @@ -0,0 +1,50 @@ +#!/bin/sh + +if test -z "$XDG_CONFIG_DIRS"; then + export XDG_CONFIG_DIRS=/etc/xdg/ +fi + +if test -z "$XDG_RUNTIME_DIR"; then + export XDG_RUNTIME_DIR=/run/user/$UID + mkdir --parents $XDG_RUNTIME_DIR + chmod 0700 $XDG_RUNTIME_DIR +fi + +# Default homescreen +HOMESCREEN=/usr/share/openivi/example/cluster/index.html + +# Read configuration +HOMESCREEN_CONFIG=$XDG_CONFIG_DIRS/openivi-html5/openivi-html5.ini +if [ -e "$HOMESCREEN_CONFIG" ] ; then + HTML=`sed -n '/^homescreen=\(.*\)$/s//\1/p' < $HOMESCREEN_CONFIG` + if [ -n "$HTML" ] ; then + HOMESCREEN=$HTML + fi +fi + +#the following value shall be modified for your display side +SCREEN_W=1080 +SCREEN_H=1920 + +# Demo is configured to FullHD +QT_W=1080 +QT_H=1920 + +QT_IVI_SURFACE_ID=4194304 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell /usr/bin/openivi-html5 -f -u $HOMESCREEN & + +# qmlscene create 2 surfaces +# 0x80000000 : for off screen buffer ? +# 0x80000001 : visible +# +SURFACE_ID_QML=0x80000001 + +# +# layer-add-surfaces wait till 2 surfaces are created. +# +layer-add-surfaces 1000 2 + +/usr/bin/LayerManagerControl set surface $SURFACE_ID_QML destination region 0 0 $SCREEN_W $SCREEN_H +/usr/bin/LayerManagerControl set surface $SURFACE_ID_QML source region 0 0 $QT_W $QT_H +/usr/bin/LayerManagerControl set layer 1000 render order $SURFACE_ID_QML +/usr/bin/LayerManagerControl set surfaces $SURFACE_ID_QML input focus keyboard +/usr/bin/LayerManagerControl set screen 0 render order 1000 diff --git a/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5_git.bb b/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5_git.bb new file mode 100644 index 000000000..168b98c78 --- /dev/null +++ b/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5_git.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "OpenIVI Mobility HTML5 environment" +HOMEPAGE = "https://openivimobility.github.io/" +SECTION = "base" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4641e94ec96f98fabc56ff9cc48be14b" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI = " \ + git://github.com/openivimobility/openivi-html5.git;branch=master;tag=0b370eea8c7c852365bd717013a523b678abbdba \ + file://openivi-html5.sh \ + file://openivi-html5.service \ +" + +inherit pkgconfig cmake_qt5 externalsrc systemd +PV = "0.1" + +S = "${WORKDIR}/git" + +RDEPENDS_${PN} = "qtbase qtwebkit inputeventmanager windowmanager" +DEPENDS = "qtbase-native qtbase qtwebkit" + +EXTRA_OECMAKE = " -DCMAKE_DISABLE_FIND_PACKAGE_X11=TRUE " + +FILES_${PN} = "/usr/bin/openivi-html5 /usr/share/openivi/*" + +do_install() { + install -d ${D}${bindir} + install -m 0755 openivi-html5 ${D}${bindir} + + install -d ${D}${datadir}/openivi/ + cp -r ${S}/example ${D}${datadir}/openivi/ + + install -p -D ${WORKDIR}/openivi-html5.sh ${D}${bindir}/openivi-html5.sh + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_user_unitdir} + install -p -D ${WORKDIR}/openivi-html5.service ${D}${systemd_user_unitdir}/openivi-html5.service + install -d ${D}${sysconfdir}/systemd/user/default.target.wants + ln -sf ${systemd_user_unitdir}/openivi-html5.service ${D}${sysconfdir}/systemd/user/default.target.wants + fi +} + +FILES_${PN} += " ${prefix}/bin/openivi-html5.sh ${systemd_user_unitdir} ${sysconfdir}" diff --git a/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5-crosssdk.bb b/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5-crosssdk.bb new file mode 100755 index 000000000..a81472bb7 --- /dev/null +++ b/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5-crosssdk.bb @@ -0,0 +1,56 @@ +SUMMARY = "Cross SDK of Full AGL Distribution for IVI profile" + +DESCRIPTION = "SDK image for full AGL Distribution for IVI profile. \ +It includes the full meta-toolchain, plus developement headers and libraries \ +to form a standalone cross SDK." + +require agl-demo-platform-html5.bb + +LICENSE = "MIT" + +IMAGE_FEATURES_append = " dev-pkgs" +IMAGE_INSTALL_append = " kernel-dev kernel-devsrc" + +inherit populate_sdk populate_sdk_qt5 + +# Task do_populate_sdk and do_rootfs can't be exec simultaneously. +# Both exec "createrepo" on the same directory, and so one of them +# can failed (randomly). +addtask do_populate_sdk after do_rootfs + +# native tools to support Chromium build inside SDK (SPEC-942) +TOOLCHAIN_HOST_TASK += " \ + nativesdk-gn \ + nativesdk-ninja \ + nativesdk-gperf \ + nativesdk-zlib \ + nativesdk-xz \ + nativesdk-nspr-dev \ + nativesdk-nss-dev \ + nativesdk-lua \ + " + +# required dependencies for Chromium build inside SDK (SPEC-942) +TOOLCHAIN_TARGET_TASK += " \ + pciutils-dev \ + pulseaudio-dev \ + cairo-dev \ + nss-dev \ + cups-dev \ + gconf-dev \ + libexif-dev \ + pango-dev \ + libdrm-dev \ + libssp-dev \ + lua-dev \ + lua-staticdev \ + ${@bb.utils.contains('LICENSE_FLAGS_WHITELIST', 'commercial', 'ffmpeg-dev', '', d)} \ + " + +# Add wayland-scanner to SDK (SPEC-945) +# Use TOOLCHAIN_HOST_TASK instead of adding to the packagegroup +# wayland-scanner is in nativesdk-wayland-dev ! +# option: add also nativesdk-qtwayland-tools +TOOLCHAIN_HOST_TASK_append = " nativesdk-wayland nativesdk-wayland-dev" + +TOOLCHAIN_HOST_TASK_append = " nativesdk-perl-modules " diff --git a/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5.bb b/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5.bb new file mode 100644 index 000000000..c9247a854 --- /dev/null +++ b/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "AGL Demo Platform image currently contains a simple HMI and \ +demos." + +LICENSE = "MIT" + +require agl-demo-platform-html5.inc + +IMAGE_INSTALL_append = "\ + packagegroup-agl-demo-platform-html5 \ + " diff --git a/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5.inc b/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5.inc new file mode 100644 index 000000000..3005abeb0 --- /dev/null +++ b/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5.inc @@ -0,0 +1,2 @@ +# Base image +require recipes-ivi/images/agl-image-ivi.inc diff --git a/meta-agl-profile-graphical-html5/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb b/meta-agl-profile-graphical-html5/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb new file mode 100644 index 000000000..ee5c1f701 --- /dev/null +++ b/meta-agl-profile-graphical-html5/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb @@ -0,0 +1,26 @@ +SUMMARY = "The software for DEMO platform of AGL IVI profile" +DESCRIPTION = "A set of packages belong to AGL Demo Platform" + +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-demo-platform-html5 \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += "\ + packagegroup-agl-image-ivi \ + " + +# add packages for demo platform (include demo apps) here +#RDEPENDS_${PN} += " \ +# packagegroup-agl-demo \ +# " + +# add packages for OpenIVI-HTML5 demo +RDEPENDS_${PN} += " \ + openivi-html5 \ + " diff --git a/meta-agl-profile-graphical-qt5/conf/layer.conf b/meta-agl-profile-graphical-qt5/conf/layer.conf new file mode 100644 index 000000000..eb47e5d14 --- /dev/null +++ b/meta-agl-profile-graphical-qt5/conf/layer.conf @@ -0,0 +1,10 @@ +# 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" + +BBFILE_COLLECTIONS += "aglprofilegraphicalqt5" +BBFILE_PATTERN_aglprofilegraphicalqt5 = "^${LAYERDIR}/" +BBFILE_PRIORITY_aglprofilegraphicalqt5 = "70" diff --git a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-native.bb b/meta-agl-profile-graphical-qt5/recipes-appfw/packagegroups/packagegroup-agl-appfw-native.bb similarity index 100% rename from meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-native.bb rename to meta-agl-profile-graphical-qt5/recipes-appfw/packagegroups/packagegroup-agl-appfw-native.bb diff --git a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-web.bb b/meta-agl-profile-graphical-qt5/recipes-appfw/packagegroups/packagegroup-agl-appfw-qt5.bb similarity index 73% rename from meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-web.bb rename to meta-agl-profile-graphical-qt5/recipes-appfw/packagegroups/packagegroup-agl-appfw-qt5.bb index 6da656573..2f0f01fec 100644 --- a/meta-agl-profile-demo/recipes-appfw/packagegroups/packagegroup-agl-appfw-web.bb +++ b/meta-agl-profile-graphical-qt5/recipes-appfw/packagegroups/packagegroup-agl-appfw-qt5.bb @@ -1,16 +1,16 @@ SUMMARY = "The software for application framework of AGL IVI profile" -DESCRIPTION = "A set of packages belong to AGL application framework which required by \ -Web App Fw Subsystem" +DESCRIPTION = "A set of packages belong to AGL application framework" LICENSE = "MIT" inherit packagegroup PACKAGES = "\ - packagegroup-agl-appfw-web \ + packagegroup-agl-appfw-qt5 \ " ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += "\ - " + packagegroup-agl-appfw-native \ +" \ No newline at end of file diff --git a/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb b/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb new file mode 100755 index 000000000..2ab462b34 --- /dev/null +++ b/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb @@ -0,0 +1,56 @@ +SUMMARY = "Cross SDK of Full AGL Distribution for IVI profile" + +DESCRIPTION = "SDK image for full AGL Distribution for IVI profile. \ +It includes the full meta-toolchain, plus developement headers and libraries \ +to form a standalone cross SDK." + +require agl-image-graphical-qt5.bb + +LICENSE = "MIT" + +IMAGE_FEATURES_append = " dev-pkgs" +IMAGE_INSTALL_append = " kernel-dev kernel-devsrc" + +inherit populate_sdk populate_sdk_qt5 + +# Task do_populate_sdk and do_rootfs can't be exec simultaneously. +# Both exec "createrepo" on the same directory, and so one of them +# can failed (randomly). +addtask do_populate_sdk after do_rootfs + +# native tools to support Chromium build inside SDK (SPEC-942) +TOOLCHAIN_HOST_TASK += " \ + nativesdk-gn \ + nativesdk-ninja \ + nativesdk-gperf \ + nativesdk-zlib \ + nativesdk-xz \ + nativesdk-nspr-dev \ + nativesdk-nss-dev \ + nativesdk-lua \ + " + +# required dependencies for Chromium build inside SDK (SPEC-942) +TOOLCHAIN_TARGET_TASK += " \ + pciutils-dev \ + pulseaudio-dev \ + cairo-dev \ + nss-dev \ + cups-dev \ + gconf-dev \ + libexif-dev \ + pango-dev \ + libdrm-dev \ + libssp-dev \ + lua-dev \ + lua-staticdev \ + ${@bb.utils.contains('LICENSE_FLAGS_WHITELIST', 'commercial', 'ffmpeg-dev', '', d)} \ + " + +# Add wayland-scanner to SDK (SPEC-945) +# Use TOOLCHAIN_HOST_TASK instead of adding to the packagegroup +# wayland-scanner is in nativesdk-wayland-dev ! +# option: add also nativesdk-qtwayland-tools +TOOLCHAIN_HOST_TASK_append = " nativesdk-wayland nativesdk-wayland-dev" + +TOOLCHAIN_HOST_TASK_append = " nativesdk-perl-modules " diff --git a/meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.bb b/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.bb similarity index 53% rename from meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.bb rename to meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.bb index 427132ed6..35989819e 100644 --- a/meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.bb +++ b/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.bb @@ -1,6 +1,6 @@ SUMMARY = "A very basic Wayland image with a terminal" -require agl-image-weston.inc +require agl-image-graphical-qt5.inc LICENSE = "MIT" @@ -8,5 +8,3 @@ IMAGE_INSTALL_append = "\ packagegroup-agl-image-weston \ " -DISTRO_FEATURES_append = " agl-core-image-profile" -IMAGE_INSTALL_append = " agl-desktop-config" diff --git a/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc b/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc new file mode 100644 index 000000000..ed1634fcc --- /dev/null +++ b/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc @@ -0,0 +1,7 @@ +require recipes-platform/images/agl-image-minimal.inc + +IMAGE_FEATURES += "splash package-management ssh-server-dropbear" + +inherit distro_features_check + +REQUIRED_DISTRO_FEATURES = "wayland" diff --git a/meta-agl-profile-demo/recipes-qt/packagegroups/packagegroup-agl-appfw-native-qt5.bb b/meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-agl-appfw-native-qt5.bb similarity index 89% rename from meta-agl-profile-demo/recipes-qt/packagegroups/packagegroup-agl-appfw-native-qt5.bb rename to meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-agl-appfw-native-qt5.bb index a22401ffb..a05d69f53 100644 --- a/meta-agl-profile-demo/recipes-qt/packagegroups/packagegroup-agl-appfw-native-qt5.bb +++ b/meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-agl-appfw-native-qt5.bb @@ -27,6 +27,3 @@ RDEPENDS_${PN} += "\ qtgraphicaleffects-qmlplugins \ qtvirtualkeyboard \ " -RDEPENDS_${PN}_checkforkrogoth += "\ - qtwayland-examples \ - " diff --git a/meta-agl-profile-demo/recipes-qt/packagegroups/packagegroup-agl-demo-qt-examples.bb b/meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-agl-demo-qt-examples.bb similarity index 100% rename from meta-agl-profile-demo/recipes-qt/packagegroups/packagegroup-agl-demo-qt-examples.bb rename to meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-agl-demo-qt-examples.bb diff --git a/meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb b/meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb new file mode 100644 index 000000000..74b35f70a --- /dev/null +++ b/meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb @@ -0,0 +1,23 @@ +SUMMARY = "The middlewares for AGL IVI profile" +DESCRIPTION = "The set of packages required for AGL Distribution" +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-profile-graphical-qt5 \ + profile-graphical-qt5 \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += "\ + packagegroup-agl-profile-graphical \ + packagegroup-agl-appfw-native-qt5 \ +" + +RDEPENDS_${PN} += "\ + agl-login-manager \ + " + +RDEPENDS_profile-graphical-qt5 = "${PN}" diff --git a/meta-agl-profile-demo/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend b/meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend similarity index 100% rename from meta-agl-profile-demo/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend rename to meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend diff --git a/meta-agl-profile-demo/recipes-qt/qml-execscript-plugin/qml-execscript-plugin_1.0.bb b/meta-agl-profile-graphical-qt5/recipes-qt/qml-execscript-plugin/qml-execscript-plugin_1.0.bb similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qml-execscript-plugin/qml-execscript-plugin_1.0.bb rename to meta-agl-profile-graphical-qt5/recipes-qt/qml-execscript-plugin/qml-execscript-plugin_1.0.bb diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtbase-native_git.bbappend b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtbase-native_git.bbappend similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtbase-native_git.bbappend rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtbase-native_git.bbappend diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtbase_%.bbappend b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtbase_%.bbappend similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtbase_%.bbappend rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtbase_%.bbappend diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtmultimedia/0001-metadata-image-support-with-the-data-URL-scheme-for-.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtmultimedia/0001-metadata-image-support-with-the-data-URL-scheme-for-.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtmultimedia/0001-metadata-image-support-with-the-data-URL-scheme-for-.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtmultimedia/0001-metadata-image-support-with-the-data-URL-scheme-for-.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtmultimedia_%.bbappend b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtmultimedia_%.bbappend similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtmultimedia_%.bbappend rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtmultimedia_%.bbappend diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtsystems_%.bbappend b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtsystems_%.bbappend similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtsystems_%.bbappend rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtsystems_%.bbappend diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0001-Implement-initial-IVI-shell-support-with-shell-integ.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0001-Implement-initial-IVI-shell-support-with-shell-integ.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0001-Implement-initial-IVI-shell-support-with-shell-integ.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0001-Implement-initial-IVI-shell-support-with-shell-integ.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0001-protocol-update-3rd-party-ivi-application-protocol.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0001-protocol-update-3rd-party-ivi-application-protocol.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0001-protocol-update-3rd-party-ivi-application-protocol.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0001-protocol-update-3rd-party-ivi-application-protocol.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0002-Fix-multiple-QWindow.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0002-Fix-multiple-QWindow.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0002-Fix-multiple-QWindow.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0002-Fix-multiple-QWindow.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0002-qwaylandwindow-add-support-for-IVI-Surface-ID-proper.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0002-qwaylandwindow-add-support-for-IVI-Surface-ID-proper.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0002-qwaylandwindow-add-support-for-IVI-Surface-ID-proper.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0002-qwaylandwindow-add-support-for-IVI-Surface-ID-proper.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0010-Added-manifest-file-according-to-smack-3-domain-mode.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0010-Added-manifest-file-according-to-smack-3-domain-mode.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0010-Added-manifest-file-according-to-smack-3-domain-mode.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0010-Added-manifest-file-according-to-smack-3-domain-mode.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0016-xdg-shell-Add-xdg-shell-protocol-file-version-1.4.0.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0016-xdg-shell-Add-xdg-shell-protocol-file-version-1.4.0.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0016-xdg-shell-Add-xdg-shell-protocol-file-version-1.4.0.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0016-xdg-shell-Add-xdg-shell-protocol-file-version-1.4.0.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0017-xdg-shell-Add-minimize-feature-to-QWindow-using-wayl.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0017-xdg-shell-Add-minimize-feature-to-QWindow-using-wayl.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0017-xdg-shell-Add-minimize-feature-to-QWindow-using-wayl.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0017-xdg-shell-Add-minimize-feature-to-QWindow-using-wayl.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0019-xdg-shell-upgrade-to-support-current-version-weston-.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0019-xdg-shell-upgrade-to-support-current-version-weston-.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0019-xdg-shell-upgrade-to-support-current-version-weston-.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0019-xdg-shell-upgrade-to-support-current-version-weston-.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0020-Add-IVI-Shell-protocol-file-version-patch-v6.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0020-Add-IVI-Shell-protocol-file-version-patch-v6.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0020-Add-IVI-Shell-protocol-file-version-patch-v6.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0020-Add-IVI-Shell-protocol-file-version-patch-v6.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0021-Implement-initial-IVI-Shell-support.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0021-Implement-initial-IVI-Shell-support.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0021-Implement-initial-IVI-Shell-support.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0021-Implement-initial-IVI-Shell-support.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwayland/UNUSED_NEEDS_CHECK_YOCTO_0018-packaging-enable-xdg-shell-at-runtime.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/UNUSED_NEEDS_CHECK_YOCTO_0018-packaging-enable-xdg-shell-at-runtime.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwayland/UNUSED_NEEDS_CHECK_YOCTO_0018-packaging-enable-xdg-shell-at-runtime.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/UNUSED_NEEDS_CHECK_YOCTO_0018-packaging-enable-xdg-shell-at-runtime.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwayland/disable_xcomposite_egl_qt_wayland_client_buffer_integration.patch b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/disable_xcomposite_egl_qt_wayland_client_buffer_integration.patch similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwayland/disable_xcomposite_egl_qt_wayland_client_buffer_integration.patch rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland/disable_xcomposite_egl_qt_wayland_client_buffer_integration.patch diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwayland_%.bbappend b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwayland_%.bbappend rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend diff --git a/meta-agl-profile-demo/recipes-qt/qt5/qtwebkit_%.bbappend b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwebkit_%.bbappend similarity index 100% rename from meta-agl-profile-demo/recipes-qt/qt5/qtwebkit_%.bbappend rename to meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwebkit_%.bbappend diff --git a/meta-agl-profile-core/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb b/meta-agl-profile-graphical/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb similarity index 100% rename from meta-agl-profile-core/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb rename to meta-agl-profile-graphical/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb diff --git a/meta-agl-profile-graphical/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb b/meta-agl-profile-graphical/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb deleted file mode 100644 index dcf21bcfb..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "The minimal set of packages required for basic Wayland image" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-image-weston \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "weston weston-init weston-ini-conf weston-examples" -RDEPENDS_${PN} += "agl-login-manager" - -RDEPENDS_${PN} += "\ - packagegroup-agl-image-minimal \ - " diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Resolve-weston-crush-when-repeat-touching-very-quick.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Resolve-weston-crush-when-repeat-touching-very-quick.patch deleted file mode 100644 index 636ecf1b9..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Resolve-weston-crush-when-repeat-touching-very-quick.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 97af4843a4705cd7d5b6b69abb9002fd974a5b94 Mon Sep 17 00:00:00 2001 -From: Tadao Tanikawa -Date: Fri, 12 Jan 2018 01:53:01 +0900 -Subject: [PATCH] Resolve weston cursh when repeat touching very quickly - -Weston sometimes crush while the user repeat touching very -quickly icons/shortcuts on HomeScreen. - -Signed-off-by: Tadao Tanikawa ---- - ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c -index b0fe37d..f1a31d0 100644 ---- a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c -+++ b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c -@@ -557,6 +557,10 @@ touch_grab_up(struct weston_touch_grab *grab, uint32_t time, int touch_id) - const struct ivi_layout_interface *interface = - seat->input_ctx->ivi_layout_interface; - -+ /* if touch device has no focused view, there is nothing to do*/ -+ if (grab->touch->focus == NULL) -+ return; -+ - /* For each surface_ctx, check for focus and send */ - wl_list_for_each(surf_ctx, &seat->input_ctx->surface_list, link) { - struct weston_surface *surf, *send_surf; --- -2.7.4 - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-simple-id-agent-initial-commit.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-simple-id-agent-initial-commit.patch deleted file mode 100644 index 9e95167ed..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-simple-id-agent-initial-commit.patch +++ /dev/null @@ -1,264 +0,0 @@ -From 8f67f40f7c6b6f62e094f0bdc5044793ae76b1c7 Mon Sep 17 00:00:00 2001 -From: Emre Ucan -Date: Fri, 24 Nov 2017 16:24:51 +0100 -Subject: [PATCH 1/2] simple-id-agent: initial commit - -it is a very simple id-agent plugin. -It is possible to configure default surface id -offset. Assigned ids would start -from the given id offset. - -Please check the example weston.ini for loading -and configuring the simple-id-agent - -Signed-off-by: Emre Ucan ---- - CMakeLists.txt | 1 + - id-agent-modules/simple-id-agent/CMakeLists.txt | 72 ++++++++++++ - .../simple-id-agent/src/simple-id-agent.c | 124 +++++++++++++++++++++ - id-agent-modules/simple-id-agent/weston.ini.in | 11 ++ - 4 files changed, 208 insertions(+) - create mode 100644 id-agent-modules/simple-id-agent/CMakeLists.txt - create mode 100644 id-agent-modules/simple-id-agent/src/simple-id-agent.c - create mode 100644 id-agent-modules/simple-id-agent/weston.ini.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bad85df..d07abf5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,6 +35,7 @@ add_subdirectory(ivi-layermanagement-api/ilmClient) - add_subdirectory(ivi-layermanagement-api/ilmControl) - add_subdirectory(ivi-layermanagement-api/test) - add_subdirectory(ivi-layermanagement-examples) -+add_subdirectory(id-agent-modules/simple-id-agent) - - if(WITH_ILM_INPUT) - add_subdirectory(ivi-input-api/ilmInput) -diff --git a/id-agent-modules/simple-id-agent/CMakeLists.txt b/id-agent-modules/simple-id-agent/CMakeLists.txt -new file mode 100644 -index 0000000..8290722 ---- /dev/null -+++ b/id-agent-modules/simple-id-agent/CMakeLists.txt -@@ -0,0 +1,72 @@ -+############################################################################ -+# -+# Copyright (C) 2013 DENSO CORPORATION -+# Copyright 2014 BMW Car IT GmbH -+# -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+# -+############################################################################ -+ -+cmake_minimum_required (VERSION 2.6) -+ -+project(simple-id-agent) -+ -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(WAYLAND_SERVER wayland-server>=1.13.0 REQUIRED) -+pkg_check_modules(WESTON weston>=2.0.0 REQUIRED) -+pkg_check_modules(PIXMAN pixman-1 REQUIRED) -+ -+find_package(Threads REQUIRED) -+ -+GET_TARGET_PROPERTY(IVI_EXTENSION_INCLUDE_DIRS ivi-extension-protocol INCLUDE_DIRECTORIES) -+ -+include_directories( -+ src -+ ${IVI_EXTENSION_INCLUDE_DIRS} -+ ${WAYLAND_SERVER_INCLUDE_DIRS} -+ ${WESTON_INCLUDE_DIRS} -+ ${PIXMAN_INCLUDE_DIRS} -+) -+ -+link_directories( -+ ${WAYLAND_SERVER_LIBRARY_DIRS} -+ ${PIXMAN_LIBRARY_DIRS} -+) -+ -+add_library(${PROJECT_NAME} MODULE -+ src/simple-id-agent.c -+) -+ -+set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") -+ -+add_dependencies(${PROJECT_NAME} -+ ivi-extension-protocol -+ ${WAYLAND_SERVER_LIBRARIES} -+ ${PIXMAN_LIBRARIES} -+) -+ -+set(LIBS -+ ${LIBS} -+ ivi-extension-protocol -+ ${WAYLAND_SERVER_LIBRARIES} -+) -+ -+set(CMAKE_C_LDFLAGS "-module -avoid-version") -+ -+target_link_libraries(${PROJECT_NAME} ${LIBS}) -+ -+install ( -+ TARGETS ${PROJECT_NAME} -+ LIBRARY DESTINATION lib${LIB_SUFFIX}/weston -+) -diff --git a/id-agent-modules/simple-id-agent/src/simple-id-agent.c b/id-agent-modules/simple-id-agent/src/simple-id-agent.c -new file mode 100644 -index 0000000..3c9e989 ---- /dev/null -+++ b/id-agent-modules/simple-id-agent/src/simple-id-agent.c -@@ -0,0 +1,124 @@ -+/* -+ * Copyright (C) 2017 Advanced Driver Information Technology Joint Venture GmbH -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and -+ * its documentation for any purpose is hereby granted without fee, provided -+ * that the above copyright notice appear in all copies and that both that -+ * copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of the copyright holders not be used in -+ * advertising or publicity pertaining to distribution of the software -+ * without specific, written prior permission. The copyright holders make -+ * no representations about the suitability of this software for any -+ * purpose. It is provided "as is" without express or implied warranty. -+ * -+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS -+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY -+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER -+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF -+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+ -+struct ivi_id_agent -+{ -+ uint32_t default_id_offset; -+ uint32_t last_assigned_id; -+ struct weston_compositor *compositor; -+ const struct ivi_layout_interface *interface; -+ struct wl_listener desktop_surface_configured; -+}; -+ -+static void -+desktop_surface_event_configure(struct wl_listener *listener, -+ void *data) -+{ -+ struct ivi_id_agent *ida = wl_container_of(listener, ida, -+ desktop_surface_configured); -+ struct ivi_layout_surface *layout_surface = -+ (struct ivi_layout_surface *) data; -+ uint32_t tmp_id; -+ -+ tmp_id = ++ida->last_assigned_id; -+ -+ /* Find an unused id */ -+ while(ida->interface->get_surface_from_id(tmp_id)) { -+ weston_log("simple-id-agent: surface id: %d is already used\n", tmp_id); -+ tmp_id++; -+ } -+ -+ ida->last_assigned_id = tmp_id; -+ -+ if (ida->interface->surface_set_id(layout_surface, ida->last_assigned_id) != 0) -+ weston_log("simple-id-agent: failed to set surface id :%d\n", ida->last_assigned_id); -+} -+ -+static void -+deinit(struct ivi_id_agent *ida) -+{ -+ wl_list_remove(&ida->desktop_surface_configured.link); -+ free(ida); -+} -+ -+static int32_t -+read_config(struct ivi_id_agent *ida) -+{ -+ struct weston_config *config = NULL; -+ struct weston_config_section *section = NULL; -+ const char *name = NULL; -+ -+ config = wet_get_config(ida->compositor); -+ if (!config) -+ return -1; -+ -+ section = weston_config_get_section(config, "id-agent", NULL, NULL); -+ -+ if (section) { -+ -+ weston_config_section_get_uint(section, "default-id-offset", -+ &ida->default_id_offset, 0); -+ -+ } else { -+ ida->default_id_offset = 0; -+ } -+ -+ return 0; -+} -+ -+WL_EXPORT int32_t -+id_agent_module_init(struct weston_compositor *ec, -+ const struct ivi_layout_interface *interface, -+ size_t interface_version) -+{ -+ struct ivi_id_agent *ida; -+ -+ ida = calloc(1, sizeof *ida); -+ if (ida == NULL) { -+ weston_log("failed to allocate ivi_id_agent\n"); -+ return -1; -+ } -+ -+ ida->compositor = ec; -+ ida->interface = interface; -+ ida->desktop_surface_configured.notify = desktop_surface_event_configure; -+ ida->interface->add_listener_configure_desktop_surface(&ida->desktop_surface_configured); -+ -+ if(read_config(ida) != 0) { -+ deinit(ida); -+ return -1; -+ } -+ -+ ida->last_assigned_id = ida->default_id_offset; -+ -+ weston_log("id_agent_module_init: success\n"); -+ -+ return 0; -+} -diff --git a/id-agent-modules/simple-id-agent/weston.ini.in b/id-agent-modules/simple-id-agent/weston.ini.in -new file mode 100644 -index 0000000..b5e5fa1 ---- /dev/null -+++ b/id-agent-modules/simple-id-agent/weston.ini.in -@@ -0,0 +1,11 @@ -+[core] -+shell=ivi-shell.so -+require-input=false -+ -+[ivi-shell] -+ivi-module=ivi-controller.so -+ivi-input-module=ivi-input-controller.so -+id-agent-module=simple-id-agent.so -+ -+[id-agent] -+default-id-offset=10 --- -2.13.6 - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-controller-load-id-agent-module.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-controller-load-id-agent-module.patch deleted file mode 100644 index f44786a36..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-controller-load-id-agent-module.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 26f2f7ce78ba2002809048b227ad9c35921a9cd8 Mon Sep 17 00:00:00 2001 -From: Emre Ucan -Date: Fri, 24 Nov 2017 16:27:01 +0100 -Subject: [PATCH 2/2] ivi-controller: load id-agent module - -Signed-off-by: Emre Ucan ---- - weston-ivi-shell/src/ivi-controller.c | 39 +++++++++++++++++++++++++++++++++++ - 1 file changed, 39 insertions(+) - -diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c -index 312a978..47b6de2 100644 ---- a/weston-ivi-shell/src/ivi-controller.c -+++ b/weston-ivi-shell/src/ivi-controller.c -@@ -1518,6 +1518,40 @@ load_input_module(struct weston_compositor *ec, - return 0; - } - -+static int load_id_agent_module(struct weston_compositor *ec, -+ const struct ivi_layout_interface *interface, -+ size_t interface_version) -+{ -+ struct weston_config *config = wet_get_config(ec); -+ struct weston_config_section *section; -+ char *id_agent_module = NULL; -+ -+ int (*id_agent_module_init)(struct weston_compositor *ec, -+ const struct ivi_layout_interface *interface, -+ size_t interface_version); -+ -+ section = weston_config_get_section(config, "ivi-shell", NULL, NULL); -+ -+ if (weston_config_section_get_string(section, "id-agent-module", -+ &id_agent_module, NULL) < 0) { -+ weston_log("ivi-controller: No id-agent-module set\n"); -+ return 0; -+ } -+ -+ id_agent_module_init = wet_load_module_entrypoint(id_agent_module, "id_agent_module_init"); -+ if (!id_agent_module_init) -+ return -1; -+ -+ if (id_agent_module_init(ec, interface, -+ sizeof(struct ivi_layout_interface)) != 0) { -+ weston_log("ivi-controller: Initialization of id agent module fails\n"); -+ return -1; -+ } -+ -+ free(id_agent_module); -+ return 0; -+} -+ - WL_EXPORT int - controller_module_init(struct weston_compositor *compositor, - int *argc, char *argv[], -@@ -1555,5 +1589,10 @@ controller_module_init(struct weston_compositor *compositor, - return -1; - } - -+ if (load_id_agent_module(compositor, interface, interface_version) < 0) { -+ free(shell); -+ return -1; -+ } -+ - return 0; - } --- -2.13.6 - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-add-resize-setting-suit-to-surface-si.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-add-resize-setting-suit-to-surface-si.patch deleted file mode 100644 index d2d027256..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-add-resize-setting-suit-to-surface-si.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 525b5bf65303d661f44c01b11bafd5ba90976850 Mon Sep 17 00:00:00 2001 -From: Wataru Mizuno -Date: Wed, 6 Dec 2017 19:35:51 +0900 -Subject: [PATCH] ivi-controller: add resize setting suit to surface size - -The ivi-controller resizes surface size like desktop usecase. - -When window manager swicths the half size window to full size, -resize was not working correctly. -This patch fixs this issue by changing surface source region at -the same timing of destination region is changed. - -This patch is not necessary later version of wayland-ivi-extension -2.0 since this resize function has already been implemented by -appropriate manner. - -Signed-off-by: Wataru Mizuno ---- - weston-ivi-shell/src/ivi-controller.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c -index 312a978..9450cf2 100644 ---- a/weston-ivi-shell/src/ivi-controller.c -+++ b/weston-ivi-shell/src/ivi-controller.c -@@ -1334,7 +1334,7 @@ surface_event_configure(struct wl_listener *listener, void *data) - struct ivisurface *ivisurf = NULL; - struct ivi_layout_surface *layout_surface = - (struct ivi_layout_surface *) data; -- const struct ivi_layout_surface_properties *prop; -+ struct weston_surface *w_surface; - - ivisurf = get_surface(&shell->list_surface, layout_surface); - if (ivisurf == NULL) { -@@ -1342,11 +1342,22 @@ surface_event_configure(struct wl_listener *listener, void *data) - return; - } - -- prop = lyt->get_properties_of_surface(layout_surface); -+ w_surface = lyt->surface_get_weston_surface(layout_surface); -+ lyt->surface_set_destination_rectangle(layout_surface, -+ ivisurf->prop->dest_x, -+ ivisurf->prop->dest_y, -+ w_surface->width, -+ w_surface->height); -+ lyt->surface_set_source_rectangle(layout_surface, -+ 0, -+ 0, -+ w_surface->width, -+ w_surface->height); -+ lyt->commit_changes(); - - wl_resource_for_each(resource, &ivisurf->resource_list) { - send_surface_event(resource, ivisurf, -- prop, IVI_NOTIFICATION_CONFIGURE); -+ ivisurf->prop, IVI_NOTIFICATION_CONFIGURE); - } - } - --- -2.7.4 - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/cmake-find-gtest.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/cmake-find-gtest.patch deleted file mode 100644 index 5371174d5..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/cmake-find-gtest.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur old/ivi-input-api/test/CMakeLists.txt new/ivi-input-api/test/CMakeLists.txt ---- old/ivi-input-api/test/CMakeLists.txt 2015-10-19 23:31:13.000000000 +1000 -+++ new/ivi-input-api/test/CMakeLists.txt 2015-10-19 23:30:32.000000000 +1000 -@@ -18,6 +18,7 @@ - ############################################################################ - - CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -+SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules) - - FIND_PACKAGE(gtest) - -diff -Naur old/ivi-layermanagement-api/test/CMakeLists.txt new/ivi-layermanagement-api/test/CMakeLists.txt ---- old/ivi-layermanagement-api/test/CMakeLists.txt 2015-10-19 23:31:20.000000000 +1000 -+++ new/ivi-layermanagement-api/test/CMakeLists.txt 2015-10-19 23:30:48.000000000 +1000 -@@ -18,6 +18,7 @@ - ############################################################################ - - CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -+SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules) - - FIND_PACKAGE(gtest) - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/disable-sanitizer-tests.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/disable-sanitizer-tests.patch deleted file mode 100644 index df5d616fd..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/disable-sanitizer-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/ivi-layermanagement-api/test/CMakeLists.txt -=================================================================== ---- git.orig/ivi-layermanagement-api/test/CMakeLists.txt -+++ git/ivi-layermanagement-api/test/CMakeLists.txt -@@ -58,7 +58,7 @@ IF(BUILD_ILM_API_TESTS) - ) - - SET(GCC_SANITIZER_COMPILE_FLAGS "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover -fstack-protector-all") -- SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_SANITIZER_COMPILE_FLAGS}" ) -+ SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) - SET( CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -static-libasan -static-libubsan" ) - - ADD_EXECUTABLE(${PROJECT_NAME} ${SRC_FILES}) diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch deleted file mode 100644 index 251bc58f0..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch +++ /dev/null @@ -1,55 +0,0 @@ -From fbe0d0fd35ff79561dc2da853f1b0903bfde428d Mon Sep 17 00:00:00 2001 -From: Changhyeok Bae -Date: Thu, 1 Jun 2017 07:45:20 +0000 -Subject: [PATCH] test patch - ---- - ivi-input-api/test/CMakeLists.txt | 9 +++++---- - ivi-layermanagement-api/test/CMakeLists.txt | 7 ++++--- - 2 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/ivi-input-api/test/CMakeLists.txt b/ivi-input-api/test/CMakeLists.txt -index db05d0f..db3b745 100644 ---- a/ivi-input-api/test/CMakeLists.txt -+++ b/ivi-input-api/test/CMakeLists.txt -@@ -65,12 +65,13 @@ IF(BUILD_ILM_API_TESTS) - - ADD_DEPENDENCIES(${PROJECT_NAME} ${LIBS}) - -- INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) -+ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test/ivi-layermanagement-api) - - # use CTest - ENABLE_TESTING() -- ADD_TEST(ilmCommon ${PROJECT_NAME}) -- ADD_TEST(ilmControl ${PROJECT_NAME}) -- ADD_TEST(ilmInput ${PROJECT_NAME}) -+ ADD_TEST(ilmCommon {CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) -+ ADD_TEST(ilmControl {CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) -+ ADD_TEST(ilmInput {CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) - - ENDIF() -diff --git a/ivi-layermanagement-api/test/CMakeLists.txt b/ivi-layermanagement-api/test/CMakeLists.txt -index fe9a0a4..090d734 100644 ---- a/ivi-layermanagement-api/test/CMakeLists.txt -+++ b/ivi-layermanagement-api/test/CMakeLists.txt -@@ -63,11 +63,12 @@ IF(BUILD_ILM_API_TESTS) - - ADD_DEPENDENCIES(${PROJECT_NAME} ${LIBS}) - -- INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) -+ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test/ivi-layermanagement-api) - - # use CTest - ENABLE_TESTING() -- ADD_TEST(ilmCommon ${PROJECT_NAME}) -- ADD_TEST(ilmControl ${PROJECT_NAME}) -+ ADD_TEST(ilmCommon ${CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) -+ ADD_TEST(ilmControl ${CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) - - ENDIF() --- -2.7.4 - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch deleted file mode 100644 index 86b448be1..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3610fa9..8b4614d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,7 +34,7 @@ add_subdirectory(ivi-layermanagement-api/ilmCommon) - add_subdirectory(ivi-layermanagement-api/ilmClient) - add_subdirectory(ivi-layermanagement-api/ilmControl) - add_subdirectory(ivi-layermanagement-api/test) --add_subdirectory(ivi-layermanagement-examples) -+#add_subdirectory(ivi-layermanagement-examples) - - if(WITH_ILM_INPUT) - add_subdirectory(ivi-input-api/ilmInput) diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.1%.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.1%.bbappend deleted file mode 100644 index 9c29dee47..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.1%.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" - -ENABLE_TEST = "-DBUILD_ILM_API_TESTS:BOOL=TRUE \ - -DINSTALL_ILM_API_TESTS:BOOL=TRUE \ - " - -DISABLE_TEST = "-DBUILD_ILM_API_TESTS:BOOL=FALSE \ - -DINSTALL_ILM_API_TESTS:BOOL=FALSE \ - " - -PACKAGECONFIG ??= "test" -PACKAGECONFIG[test] = "${ENABLE_TEST},${DISABLE_TEST},gtest" - -SRC_URI_append = "\ - file://cmake-find-gtest.patch \ - file://test-path.patch \ - " - -PACKAGES =+ "${PN}-test" - -FILES_${PN}-test = "${libdir}/${PN}/test/*/CTestTestfile.cmake \ - ${libdir}/${PN}/test/ivi-layermanagement-api-test \ - ${libdir}/${PN}/test/ivi-input-api-test \ - " -FILES_${PN}-dbg += "${libdir}/${PN}/test/.debug" - -RDEPENDS_${PN}-test += "cmake" diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.13.0.bb b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.13.0.bb deleted file mode 100644 index 68e92adb5..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.13.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Wayland IVI Extension" -DESCRIPTION = "GENIVI Layer Management API based on Wayland IVI Extension" -HOMEPAGE = "http://projects.genivi.org/wayland-ivi-extension" -BUGTRACKER = "http://bugs.genivi.org/enter_bug.cgi?product=Wayland%20IVI%20Extension" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1f1a56bb2dadf5f2be8eb342acf4ed79" - -SRCREV = "ede33c1c898eeaf673dd2c275e92763a5aabd066" -SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \ - file://0001-simple-id-agent-initial-commit.patch;patch=1 \ - file://0002-ivi-controller-load-id-agent-module.patch;patch=1 \ - file://0003-ivi-controller-add-resize-setting-suit-to-surface-si.patch \ - file://0001-Resolve-weston-crush-when-repeat-touching-very-quick.patch \ -" -S = "${WORKDIR}/git" - -DEPENDS = "weston virtual/libgles2 pixman wayland-native" - -inherit cmake - -EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1" - -FILES_${PN} += "${libdir}/weston/*" -FILES_${PN}-dbg += "${libdir}/weston/.debug/*" - -EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" - -FILESEXTRAPATHS_prepend := ":${THISDIR}/wayland-ivi-extension:" - -SRC_URI_append_wandboard = " file://wandboard_fix_build.patch" - -# workaround paralellism issue: -PARALLEL_MAKE = "" diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb deleted file mode 100644 index ea74e384c..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Wayland IVI Extension" -DESCRIPTION = "GENIVI Layer Management API based on Wayland IVI Extension" -HOMEPAGE = "http://projects.genivi.org/wayland-ivi-extension" -BUGTRACKER = "http://bugs.genivi.org/enter_bug.cgi?product=Wayland%20IVI%20Extension" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1f1a56bb2dadf5f2be8eb342acf4ed79" - -SRCREV = "ff067a640451de46836200624ece7ac777977c30" -SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=2.0;protocol=http \ - " -SRC_URI_append_wandboard = " file://wandboard_fix_build.patch" - -S = "${WORKDIR}/git" - -DEPENDS = "weston virtual/libgles2 pixman wayland-native" - -FILESEXTRAPATHS_prepend := ":${THISDIR}/wayland-ivi-extension:" - -# workaround paralellism issue: -PARALLEL_MAKE = "" - -inherit cmake - -EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1" - -FILES_${PN} += "${libdir}/weston/*" -FILES_${PN} += "${datadir}/wayland-protocols/stable/ivi-application/*" - -FILES_${PN}-dbg += "${libdir}/weston/.debug/*" - -EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bbappend deleted file mode 100644 index d778459f2..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bbappend +++ /dev/null @@ -1,15 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -# -SRC_URI += "${@bb.utils.contains("DISTRO_FEATURES", "virtual-display", "file://virtualoutput.cfg", "",d)}" - -do_configure_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'virtual-display', 'true', 'false', d)}; then - echo virtual=1 >> ${WORKDIR}/core.cfg - fi - - if ${@bb.utils.contains('DISTRO_FEATURES', 'gst-record', 'true', 'false', d)}; then - echo recorder=true >> ${WORKDIR}/virtualoutput.cfg - fi -} - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston_%.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_%.bbappend deleted file mode 100644 index 38590dcdb..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -DEPENDS_append_ulcb = " gstreamer1.0-plugins-base" diff --git a/meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.bb b/meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.bb new file mode 100644 index 000000000..6c9bee7f1 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.bb @@ -0,0 +1,9 @@ +SUMMARY = "A very basic Wayland image with a terminal" + +require agl-image-weston.inc + +LICENSE = "MIT" + +IMAGE_INSTALL_append = "\ + profile-agl-graphical \ + " diff --git a/meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.inc b/meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.inc similarity index 71% rename from meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.inc rename to meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.inc index 947d22b50..ed1634fcc 100644 --- a/meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.inc +++ b/meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.inc @@ -1,4 +1,4 @@ -require recipes-core/images/agl-image-minimal.inc +require recipes-platform/images/agl-image-minimal.inc IMAGE_FEATURES += "splash package-management ssh-server-dropbear" diff --git a/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb new file mode 100644 index 000000000..b80089a94 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "The minimal set of packages for Connectivity Subsystem" +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-graphical-services \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += "\ +agl-service-mediaplayer \ + " diff --git a/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-image-weston.bb b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-image-weston.bb new file mode 100644 index 000000000..d622298c6 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-image-weston.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "The minimal set of packages required for basic Wayland image" +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-image-weston \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += " \ + weston \ + weston-init \ + weston-ini-conf \ + weston-examples \ + agl-login-manager \ + agl-desktop-config \ + packagegroup-agl-graphical-services \ + profile-agl-minimal \ + " + diff --git a/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb new file mode 100644 index 000000000..46187fed3 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb @@ -0,0 +1,20 @@ +SUMMARY = "The middlewares for AGL IVI profile" +DESCRIPTION = "The set of packages required for AGL Distribution" +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-profile-graphical \ + profile-graphical \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += "\ + packagegroup-agl-image-minimal \ + packagegroup-agl-image-weston \ + packagegroup-agl-graphical-services \ +" + +RDEPENDS_profile-graphical = "${PN}" diff --git a/meta-agl-profile-graphical/recipes-sdl/packagegroups/packagegroup-agl-smartdevicelink.bb b/meta-agl-profile-graphical/recipes-sdl/packagegroups/packagegroup-agl-smartdevicelink.bb deleted file mode 100644 index 7d135356a..000000000 --- a/meta-agl-profile-graphical/recipes-sdl/packagegroups/packagegroup-agl-smartdevicelink.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Set of packages for SmartDeviceLink" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-smartdevicelink \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - sdl-core \ - " - -# Porter does not have the required gstreamer version -RDEPENDS_${PN}_porter := "" diff --git a/meta-agl-profile-demo/conf/layer.conf b/meta-agl-profile-hud/conf/layer.conf similarity index 63% rename from meta-agl-profile-demo/conf/layer.conf rename to meta-agl-profile-hud/conf/layer.conf index bf7347e58..57fb70f0c 100644 --- a/meta-agl-profile-demo/conf/layer.conf +++ b/meta-agl-profile-hud/conf/layer.conf @@ -5,6 +5,6 @@ BBPATH =. "${LAYERDIR}:" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS += "aglprofiledemo" -BBFILE_PATTERN_aglprofiledemo = "^${LAYERDIR}/" -BBFILE_PRIORITY_aglprofiledemo = "70" +BBFILE_COLLECTIONS += "aglprofilehud" +BBFILE_PATTERN_aglprofilehud = "^${LAYERDIR}/" +BBFILE_PRIORITY_aglprofilehud = "70" diff --git a/meta-agl-profile-telematics/conf/layer.conf b/meta-agl-profile-telematics/conf/layer.conf new file mode 100644 index 000000000..e563143b9 --- /dev/null +++ b/meta-agl-profile-telematics/conf/layer.conf @@ -0,0 +1,10 @@ +# 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" + +BBFILE_COLLECTIONS += "aglprofiletelematics" +BBFILE_PATTERN_aglprofiletelematics = "^${LAYERDIR}/" +BBFILE_PRIORITY_aglprofiletelematics = "70" diff --git a/meta-app-framework/recipes-core/packagegroups/packagegroup-agl-app-framework.bb b/meta-app-framework/recipes-core/packagegroups/packagegroup-agl-app-framework.bb index 56f89c598..0201c0e4f 100644 --- a/meta-app-framework/recipes-core/packagegroups/packagegroup-agl-app-framework.bb +++ b/meta-app-framework/recipes-core/packagegroups/packagegroup-agl-app-framework.bb @@ -15,5 +15,4 @@ RDEPENDS_${PN} += "\ libafbwsc \ af-main \ systemd-agl-sync \ - ${@bb.utils.contains('DISTRO_FEATURES', 'webruntime', 'virtual/webruntime', '', d)} \ " diff --git a/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime b/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime deleted file mode 100755 index 80685eb81..000000000 --- a/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/qt5/qmlscene "$1" /usr/bin/web-runtime.qml diff --git a/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime-webkit.qml b/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime-webkit.qml deleted file mode 100644 index d18b672cd..000000000 --- a/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime-webkit.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.1 -import QtQuick.Controls 1.1 -import QtWebKit 3.0 - -ApplicationWindow { - width: 1024 - height: 768 - visible: true - WebView { - url: Qt.application.arguments[1] - anchors.fill: parent - } -} diff --git a/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime.qml b/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime.qml deleted file mode 100644 index 852567a49..000000000 --- a/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.1 -import QtQuick.Controls 1.1 -import QtWebEngine 1.1 - -ApplicationWindow { - width: 1024 - height: 768 - visible: true - flags: Qt.WindowFullScreen | Qt.FramelessWindowHint - WebEngineView { - url: Qt.application.arguments[1] - anchors.fill: parent - } -} diff --git a/meta-app-framework/recipes-core/web-runtime/web-runtime_0.1.bb b/meta-app-framework/recipes-core/web-runtime/web-runtime_0.1.bb deleted file mode 100644 index 75077b696..000000000 --- a/meta-app-framework/recipes-core/web-runtime/web-runtime_0.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -inherit allarch - -SUMMARY = "Provides the 'web-runtime' command" -DESCRIPTION = "The command 'web-runtime' is an abstraction that allows to " - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI = "\ - file://web-runtime;md5sum=2245be1e6029b30966f0842e3fee75ea \ - file://web-runtime.qml;md5sum=922aeae6d596d7c83af01abca266f0df \ - file://web-runtime-webkit.qml;md5sum=4daf9df39078634c27a7923d37e82e3d \ -" - -RDEPENDS_${PN} = "\ - qtdeclarative-tools \ - qtwayland-qmlplugins \ - qtquickcontrols-qmlplugins \ -" - -PROVIDES += "virtual/webruntime" -# add also RPROVIDES to satisfy the packagegroup -RPROVIDES_${PN} += "virtual/webruntime" - -do_configure() { - : -} - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/web-runtime ${D}${bindir}/web-runtime - install -m 0644 ${WORKDIR}/web-runtime.qml ${D}${bindir}/web-runtime.qml - install -m 0644 ${WORKDIR}/web-runtime-webkit.qml ${D}${bindir}/web-runtime-webkit.qml -} - -do_install_append_rcar-gen2() { - # workaround for porter board: force the use of libEGL provided by mesa at runtime - # otherwise, the proprietary libEGL is used and a problem then occurs due to a missing EGL function - sed -i 's|^\(exec /usr/bin/qt5/qmlscene\)|LD_PRELOAD=/usr/lib/libEGL.so \1|g' ${D}${bindir}/web-runtime -} - - diff --git a/meta-app-framework/recipes-core/packagegroups/packagegroup-agl-core-security.bbappend b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-core-security.bbappend similarity index 100% rename from meta-app-framework/recipes-core/packagegroups/packagegroup-agl-core-security.bbappend rename to meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-core-security.bbappend diff --git a/meta-app-framework/recipes-core/packagegroups/packagegroup-agl-image-minimal.bbappend b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-image-boot.bbappend similarity index 100% rename from meta-app-framework/recipes-core/packagegroups/packagegroup-agl-image-minimal.bbappend rename to meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-image-boot.bbappend diff --git a/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bbappend b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bbappend new file mode 100644 index 000000000..ad09e5ddf --- /dev/null +++ b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bbappend @@ -0,0 +1,3 @@ +RDEPENDS_${PN} += "\ + packagegroup-agl-app-framework \ + " diff --git a/meta-security/conf/layer.conf b/meta-security/conf/layer.conf index db6be54c0..2da233a76 100644 --- a/meta-security/conf/layer.conf +++ b/meta-security/conf/layer.conf @@ -2,9 +2,9 @@ BBPATH =. "${LAYERDIR}:" # We have a packages directory, add to BBFILES -BBFILES := "${BBFILES} \ - ${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" +BBFILES += " ${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend \ + " # Must prioritize our rpm recipe over the default ones. BBFILE_COLLECTIONS += "security-smack" diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample index 0c3114f8c..97537f490 100644 --- a/templates/base/bblayers.conf.sample +++ b/templates/base/bblayers.conf.sample @@ -47,20 +47,12 @@ AGL_CORE_DEPENDENCY_LAYERS = " \ ${METADIR}/meta-openembedded/meta-filesystems \ " -# temporary ... to avoid build breakage. To move to upper layers. -AGL_TEMP_GFX_LAYERS = " \ - ${METADIR}/meta-agl/meta-agl-profile-graphical \ - ${METADIR}/meta-agl/meta-agl-profile-demo \ - " - - #################### # Combine the layers BBLAYERS ?= " \ ${AGL_CORE_DEPENDENCY_LAYERS} \ ${AGL_CORE_LAYERS} \ ${AGL_APPFW_LAYERS} \ - ${AGL_TEMP_GFX_LAYERS} \ ${YOCTO_LAYERS} \ " diff --git a/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc b/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc new file mode 100644 index 000000000..97b44a21e --- /dev/null +++ b/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc @@ -0,0 +1,3 @@ +BBLAYERS =+ " \ + ${METADIR}/meta-agl/meta-agl-profile-graphical-html5 \ +" diff --git a/templates/feature/agl-profile-graphical-html5/included.dep b/templates/feature/agl-profile-graphical-html5/included.dep new file mode 100644 index 000000000..5b54430da --- /dev/null +++ b/templates/feature/agl-profile-graphical-html5/included.dep @@ -0,0 +1 @@ +agl-profile-graphical \ No newline at end of file diff --git a/templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc b/templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc new file mode 100644 index 000000000..b0ac5bf14 --- /dev/null +++ b/templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc @@ -0,0 +1,9 @@ +BBLAYERS =+ " \ + ${METADIR}/meta-agl/meta-agl-profile-graphical-qt5 \ +" + +# These are the dependencies +#--------------------------- +BBLAYERS =+ " \ + ${METADIR}/meta-qt5 \ +" diff --git a/templates/feature/agl-profile-graphical-qt5/included.dep b/templates/feature/agl-profile-graphical-qt5/included.dep new file mode 100644 index 000000000..5b54430da --- /dev/null +++ b/templates/feature/agl-profile-graphical-qt5/included.dep @@ -0,0 +1 @@ +agl-profile-graphical \ No newline at end of file diff --git a/templates/feature/agl-profile-graphical/50_bblayers.conf.inc b/templates/feature/agl-profile-graphical/50_bblayers.conf.inc new file mode 100644 index 000000000..44b0885dc --- /dev/null +++ b/templates/feature/agl-profile-graphical/50_bblayers.conf.inc @@ -0,0 +1,3 @@ +BBLAYERS =+ " \ + ${METADIR}/meta-agl/meta-agl-profile-graphical \ +" diff --git a/templates/feature/agl-profile-hud/50_bblayers.conf.inc b/templates/feature/agl-profile-hud/50_bblayers.conf.inc new file mode 100644 index 000000000..047383710 --- /dev/null +++ b/templates/feature/agl-profile-hud/50_bblayers.conf.inc @@ -0,0 +1,3 @@ +BBLAYERS =+ " \ + ${METADIR}/meta-agl/meta-agl-profile-hud \ +" diff --git a/templates/feature/agl-profile-telematics/50_bblayers.conf.inc b/templates/feature/agl-profile-telematics/50_bblayers.conf.inc new file mode 100644 index 000000000..874b438f0 --- /dev/null +++ b/templates/feature/agl-profile-telematics/50_bblayers.conf.inc @@ -0,0 +1,3 @@ +BBLAYERS =+ " \ + ${METADIR}/meta-agl/meta-agl-profile-telematics \ +" -- 2.16.6