From e238a444dc7ea5c72d20ea38cf693f70d4539623 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Thu, 13 Aug 2020 17:14:07 +0300 Subject: qtwayland-config: Add qtwayland-config recipe Migrate from qtwayland bb append recipe to using a config one. Bug-AGL: SPEC-3522 Signed-off-by: Marius Vlad Suggested-by: Scott Murray Change-Id: I24179505f10e02cd09542d2caf28104dc89257c8 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25119 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- .../recipes-qt/qt5/qtwayland-config/qtwayland | 2 ++ .../recipes-qt/qt5/qtwayland-config_1.0.0.bb | 21 +++++++++++++++++++++ .../recipes-qt/qt5/qtwayland_%.bbappend | 9 --------- 3 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland-config/qtwayland create mode 100644 meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland-config_1.0.0.bb diff --git a/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland-config/qtwayland b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland-config/qtwayland new file mode 100644 index 000000000..504af42b8 --- /dev/null +++ b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland-config/qtwayland @@ -0,0 +1,2 @@ +QT_WAYLAND_SHELL_INTEGRATION=@QT_WAYLAND_DEFAULT_SHELL@ +QT_WAYLAND_RESIZE_AFTER_SWAP=1 diff --git a/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland-config_1.0.0.bb b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland-config_1.0.0.bb new file mode 100644 index 000000000..ae7c956d4 --- /dev/null +++ b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland-config_1.0.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "QtWayland config file." +DESCRIPTION = "Config file for qtwayland." +SECTION = "apps" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = "file://qtwayland" + +inherit allarch + +QTWAYLAND_DEFAULT_SHELL ?= "xdg-shell" + +do_compile[noexec] = "1" + +do_install () { + install -D -m 644 ${WORKDIR}/qtwayland ${D}${sysconfdir}/afm/unit.env.d/qtwayland + sed -i -e 's/@QT_WAYLAND_DEFAULT_SHELL@/${QTWAYLAND_DEFAULT_SHELL}/' ${D}${sysconfdir}/afm/unit.env.d/qtwayland +} + +RPROVIDES_${PN} += "virtual/qtwayland-config" diff --git a/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend index 85ebc29d6..2f6072acd 100644 --- a/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend +++ b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend @@ -24,12 +24,3 @@ SRC_URI_append = "\ file://0010-Added-manifest-file-according-to-smack-3-domain-mode.patch \ " -AGL_DEFAULT_WM_SHELL ?= "xdg-shell" -AFM_CONF_DIR = "${D}${sysconfdir}/afm/unit.env.d" -QT_SHELL_FILE = "${AFM_CONF_DIR}/qt-shell" - -do_install_append_class-target() { - mkdir -p ${AFM_CONF_DIR} - echo "QT_WAYLAND_SHELL_INTEGRATION=${AGL_DEFAULT_WM_SHELL}" > ${QT_SHELL_FILE} - echo "QT_WAYLAND_RESIZE_AFTER_SWAP=1" >> ${QT_SHELL_FILE} -} -- cgit 1.2.3-korg