From 4cd27637de939f27d4aa581d842f746f6e69b90d Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 19 Aug 2020 13:32:52 -0400 Subject: meta-agl-profile-graphical: remove agl-desktop-config Remove recipe and usage, as it has not been needed for a long time and the user-weston-term systemd units cause spurious error messages. Bug-AGL: SPEC-3539 Signed-off-by: Scott Murray Change-Id: I2b7bde5846f9900d8a249a7e355a3d0f1a5ea032 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25138 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 --- .../agl-desktop-config/agl-desktop-config_0.1.bb | 21 --------------------- .../agl-desktop-config/files/user-weston-term.path | 8 -------- .../files/user-weston-term.service | 12 ------------ .../packagegroup-agl-graphical-weston.bb | 1 - 4 files changed, 42 deletions(-) delete mode 100644 meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/agl-desktop-config_0.1.bb delete mode 100644 meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/files/user-weston-term.path delete mode 100644 meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/files/user-weston-term.service (limited to 'meta-agl-profile-graphical') diff --git a/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/agl-desktop-config_0.1.bb b/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/agl-desktop-config_0.1.bb deleted file mode 100644 index e0358d615..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/agl-desktop-config_0.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "AGL desktop config" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI += " \ - file://user-weston-term.service \ - file://user-weston-term.path \ -" - -do_install_append() { - install -d ${D}${systemd_user_unitdir} - install -m 0644 ${WORKDIR}/user-weston-term.service ${D}${systemd_user_unitdir} - install -m 0644 ${WORKDIR}/user-weston-term.path ${D}${systemd_user_unitdir} - - install -d ${D}${systemd_user_unitdir}/default.target.wants - ln -sf ${systemd_user_unitdir}/user-weston-term.path ${D}${libdir}/systemd/user/default.target.wants -} - -FILES_${PN} += "${systemd_user_unitdir}/*" -FILES_${PN} += "${systemd_user_unitdir}/default.target.wants/default.target.wants" diff --git a/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/files/user-weston-term.path b/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/files/user-weston-term.path deleted file mode 100644 index 9481840e5..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/files/user-weston-term.path +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Terminal for weston user unit path - -[Path] -PathExists=%t/wayland-0 - -[Install] -WantedBy=default.target diff --git a/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/files/user-weston-term.service b/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/files/user-weston-term.service deleted file mode 100644 index ad8b9583b..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/agl-desktop-config/files/user-weston-term.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Terminal for weston user -After=user-config.service -Requires=user-config.service - -[Service] -Type=simple -ExecStart=/usr/bin/weston-terminal -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb index 2a4b22930..79577c170 100644 --- a/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb +++ b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb @@ -15,7 +15,6 @@ RDEPENDS_${PN} += " \ weston-ini-conf \ weston-examples \ agl-login-manager \ - agl-desktop-config \ agl-compositor \ " -- cgit 1.2.3-korg