summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-08-28 16:57:55 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-08-31 00:45:20 +0000
commit70a4b02d3349bb207bc5f7c4f854e0dae9377da8 (patch)
tree991dd29421ecf3bc71813a79523212861d3dffa6
parent5385e4e305c8ce5705238e799380e263c45ecc4b (diff)
Remove replaced windowmanager recipes and runxdg
agl-service-windowmanager, libwindowmanager and qlibwindowmanager are deprecated. Runxdg is using these and no longer required. Also remove qtaglextras. Bug-AGL: SPEC-3555 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I412035ea0e9694aad84aa2e8294b4d52f70f57e4 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25161 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
-rw-r--r--meta-agl-profile-graphical-html5/recipes-apis/agl-service-windowmanager/agl-service-windowmanager_git.bbappend9
-rw-r--r--meta-agl-profile-graphical-html5/recipes-apis/agl-service-windowmanager/files/areas.horizontal.json94
-rw-r--r--meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend5
-rw-r--r--meta-agl-profile-graphical-qt5/recipes-qt/qlibwindowmanager/qlibwindowmanager_git.bb14
-rw-r--r--meta-agl-profile-graphical-qt5/recipes-qt/qtaglextras/qtaglextras_git.bb28
-rw-r--r--meta-agl-profile-graphical/recipes-apis/agl-service-windowmanager/agl-service-windowmanager_git.bb33
-rw-r--r--meta-agl-profile-graphical/recipes-apis/agl-service-windowmanager/files/weston-ready.conf4
-rw-r--r--meta-agl-profile-graphical/recipes-graphics/libwindowmanager/libwindowmanager_git.bb16
-rw-r--r--meta-agl-profile-graphical/recipes-graphics/runxdg/runxdg_git.bb16
9 files changed, 0 insertions, 219 deletions
diff --git a/meta-agl-profile-graphical-html5/recipes-apis/agl-service-windowmanager/agl-service-windowmanager_git.bbappend b/meta-agl-profile-graphical-html5/recipes-apis/agl-service-windowmanager/agl-service-windowmanager_git.bbappend
deleted file mode 100644
index 06f89f6..0000000
--- a/meta-agl-profile-graphical-html5/recipes-apis/agl-service-windowmanager/agl-service-windowmanager_git.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += " \
- file://areas.horizontal.json \
-"
-
-do_compile_prepend() {
- cp ${WORKDIR}/areas.horizontal.json ${S}/conf/areas.json
-}
diff --git a/meta-agl-profile-graphical-html5/recipes-apis/agl-service-windowmanager/files/areas.horizontal.json b/meta-agl-profile-graphical-html5/recipes-apis/agl-service-windowmanager/files/areas.horizontal.json
deleted file mode 100644
index 4b6f0c3..0000000
--- a/meta-agl-profile-graphical-html5/recipes-apis/agl-service-windowmanager/files/areas.horizontal.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "areas": [
- {
- "name": "fullscreen",
- "rect": {
- "x": 0,
- "y": 0,
- "w": 1920,
- "h": 1080
- }
- },
- {
- "name": "normal.full",
- "rect": {
- "x": 218,
- "y": 0,
- "w": 1702,
- "h": 1080
- }
- },
- {
- "name": "split.main",
- "rect": {
- "x": 218,
- "y": 0,
- "w": 744,
- "h": 1080
- }
- },
- {
- "name": "split.sub",
- "rect": {
- "x": 962,
- "y": 0,
- "w": 744,
- "h": 1080
- }
- },
- {
- "name": "software_keyboard",
- "rect": {
- "x": 962,
- "y": 0,
- "w": 744,
- "h": 1080
- }
- },
- {
- "name": "restriction.normal",
- "rect": {
- "x": 218,
- "y": 0,
- "w": 1488,
- "h": 1080
- }
- },
- {
- "name": "restriction.split.main",
- "rect": {
- "x": 218,
- "y": 0,
- "w": 744,
- "h": 1080
- }
- },
- {
- "name": "restriction.split.sub",
- "rect": {
- "x": 962,
- "y": 0,
- "w": 744,
- "h": 1080
- }
- },
- {
- "name": "on_screen",
- "rect": {
- "x": 218,
- "y": 0,
- "w": 1488,
- "h": 1080
- }
- },
- {
- "name": "remote.fullscreen",
- "rect": {
- "x": 0,
- "y": 0,
- "w": 720,
- "h": 640
- }
- }
- ]
-}
diff --git a/meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend b/meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend
index 300227e..08afa6c 100644
--- a/meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend
+++ b/meta-agl-profile-graphical-qt5/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend
@@ -16,8 +16,3 @@ RDEPENDS_${PN}_remove = " \
qtwebkit-mkspecs \
qtwebkit-qmlplugins \
"
-
-# add QtAGLExtras
-RDEPENDS_${PN} += " \
- ${@bb.utils.contains("DISTRO_FEATURES", "agl-hmi-framework", " qtaglextras-dev qtaglextras-mkspecs", "",d)} \
-"
diff --git a/meta-agl-profile-graphical-qt5/recipes-qt/qlibwindowmanager/qlibwindowmanager_git.bb b/meta-agl-profile-graphical-qt5/recipes-qt/qlibwindowmanager/qlibwindowmanager_git.bb
deleted file mode 100644
index 883ab82..0000000
--- a/meta-agl-profile-graphical-qt5/recipes-qt/qlibwindowmanager/qlibwindowmanager_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "A wrapper library of libwindowmanager for Qt Application in AGL"
-SECTION = "graphics"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
-
-DEPENDS = "qtbase libwindowmanager"
-RDEPENDS_${PN} = "libwindowmanager"
-
-inherit qmake5
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/libqtwindowmanager.git;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "3ff07151af5040842dd1e56d8312ee39cc50f533"
-S = "${WORKDIR}/git"
-PV = "1.0+git${SRCPV}"
diff --git a/meta-agl-profile-graphical-qt5/recipes-qt/qtaglextras/qtaglextras_git.bb b/meta-agl-profile-graphical-qt5/recipes-qt/qtaglextras/qtaglextras_git.bb
deleted file mode 100644
index 84925a9..0000000
--- a/meta-agl-profile-graphical-qt5/recipes-qt/qtaglextras/qtaglextras_git.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-DEPENDS += "qtbase qtdeclarative qtquickcontrols2 qlibwindowmanager libhomescreen"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/qtaglextras;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "a4d7197d3ccc411b98666a75126534849141acde"
-
-PV = "5.8.0+git${SRCPV}"
-S = "${WORKDIR}/git/"
-
-inherit qmake5
-
-PACKAGES += "${PN}-mkspecs"
-
-FILES_${PN}-mkspecs = "\
- ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \
-"
-
-FILES_${PN}-dev += " \
- ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \
- ${OE_QMAKE_PATH_LIBS}/pkgconfig \
- ${OE_QMAKE_PATH_LIBS}/cmake/* \
- ${OE_QMAKE_PATH_LIBS}/*.prl \
- ${OE_QMAKE_PATH_LIBS}/*.la \
- ${OE_QMAKE_PATH_DATA}/* \
- ${OE_QMAKE_PATH_HEADERS}/* \
-"
diff --git a/meta-agl-profile-graphical/recipes-apis/agl-service-windowmanager/agl-service-windowmanager_git.bb b/meta-agl-profile-graphical/recipes-apis/agl-service-windowmanager/agl-service-windowmanager_git.bb
deleted file mode 100644
index 4be5ab1..0000000
--- a/meta-agl-profile-graphical/recipes-apis/agl-service-windowmanager/agl-service-windowmanager_git.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "Window Manager service binding for applications"
-DESCRIPTION = "Window Manager is the service binding for controlling \
- rendering rights. Applications request to render itself, \
- then Window Manager checks the policy and notifies the \
- layout to the respective applications \
- "
-HOMEPAGE = "https://wiki.automotivelinux.org/windowmanager"
-SECTION = "graphics"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
-
-DEPENDS = "af-binder json-c wayland wayland-ivi-extension"
-
-inherit cmake aglwgt
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-windowmanager;protocol=https;branch=${AGL_BRANCH} \
- file://weston-ready.conf \
-"
-SRCREV = "${AGL_APP_REVISION}"
-PV = "1.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-do_install_append() {
- # Install systemd over-ride that adds a dependency on weston-ready
- # to ensure that the windowmanager and its dependencies start after
- # weston is actually initialized.
- install -d ${D}${sysconfdir}/systemd/system/afm-api-windowmanager@.service.d
- install -m 0644 ${WORKDIR}/weston-ready.conf ${D}${sysconfdir}/systemd/system/afm-api-windowmanager@.service.d
-}
-
-FILES_${PN} += "${systemd_system_unitdir}"
-
-RDEPENDS_${PN} += "weston-ready"
diff --git a/meta-agl-profile-graphical/recipes-apis/agl-service-windowmanager/files/weston-ready.conf b/meta-agl-profile-graphical/recipes-apis/agl-service-windowmanager/files/weston-ready.conf
deleted file mode 100644
index e90eed5..0000000
--- a/meta-agl-profile-graphical/recipes-apis/agl-service-windowmanager/files/weston-ready.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Requires=weston-ready.service
-After=weston-ready.service
-
diff --git a/meta-agl-profile-graphical/recipes-graphics/libwindowmanager/libwindowmanager_git.bb b/meta-agl-profile-graphical/recipes-graphics/libwindowmanager/libwindowmanager_git.bb
deleted file mode 100644
index 56e9a0d..0000000
--- a/meta-agl-profile-graphical/recipes-graphics/libwindowmanager/libwindowmanager_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SUMMARY = "Window Manager client library for applications"
-DESCRIPTION = "Window Manager client library for application built with recipe"
-SECTION = "graphics"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
-
-DEPENDS = "af-binder json-c"
-RDEPENDS_${PN} = "agl-service-windowmanager"
-
-inherit cmake
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/libwindowmanager.git;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "949e8b8c90dfb37988b542df171c39941aee7bcb"
-S = "${WORKDIR}/git"
-PV = "1.0+git${SRCPV}"
-
diff --git a/meta-agl-profile-graphical/recipes-graphics/runxdg/runxdg_git.bb b/meta-agl-profile-graphical/recipes-graphics/runxdg/runxdg_git.bb
deleted file mode 100644
index d5bd568..0000000
--- a/meta-agl-profile-graphical/recipes-graphics/runxdg/runxdg_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SUMMARY = "Launcher of XDG application on AGL HMI Framework (2017)"
-DESCRIPTION = "The command 'runxdg' is a launcher to execute XDG application \
- on AGL HMI Framework which using wayland-ivi-extension"
-HOMEPAGE = "https://git.automotivelinux.org/staging/xdg-launcher"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-DEPENDS = "json-c wayland wayland-ivi-extension libhomescreen libwindowmanager"
-
-inherit cmake
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/xdg-launcher;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S = "${WORKDIR}/git"