From 70a4b02d3349bb207bc5f7c4f854e0dae9377da8 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Fri, 28 Aug 2020 16:57:55 +0200 Subject: Remove replaced windowmanager recipes and runxdg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Change-Id: I412035ea0e9694aad84aa2e8294b4d52f70f57e4 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25161 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- .../packagegroup-qt5-toolchain-target.bbappend | 5 ---- .../qlibwindowmanager/qlibwindowmanager_git.bb | 14 ----------- .../recipes-qt/qtaglextras/qtaglextras_git.bb | 28 ---------------------- 3 files changed, 47 deletions(-) delete mode 100644 meta-agl-profile-graphical-qt5/recipes-qt/qlibwindowmanager/qlibwindowmanager_git.bb delete mode 100644 meta-agl-profile-graphical-qt5/recipes-qt/qtaglextras/qtaglextras_git.bb (limited to 'meta-agl-profile-graphical-qt5') 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 300227e16..08afa6c7f 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 883ab82d3..000000000 --- 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 84925a939..000000000 --- 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}/* \ -" -- cgit 1.2.3-korg