From patchwork Wed Feb 26 15:50:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 57982 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A0F6C282C9 for ; Wed, 26 Feb 2025 15:50:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.9150.1740585033923076014 for ; Wed, 26 Feb 2025 07:50:34 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 85893FEC for ; Wed, 26 Feb 2025 07:50:49 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 45E693F673 for ; Wed, 26 Feb 2025 07:50:33 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH v2 12/23] tigervnc: fix systemd unit packaging Date: Wed, 26 Feb 2025 15:50:09 +0000 Message-ID: <20250226155022.1989209-12-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250226155022.1989209-1-ross.burton@arm.com> References: <20250226155022.1989209-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 26 Feb 2025 15:50:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115664 Pass the correct path so the unit is installed where it should be, and use the systemd class to ensure the unit is enabled correctly. Signed-off-by: Ross Burton --- meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb index 4d2bb1f063..6e4d4a7b0c 100644 --- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb +++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" S = "${WORKDIR}/git" -inherit autotools cmake features_check pkgconfig +inherit autotools cmake features_check pkgconfig systemd REQUIRED_DISTRO_FEATURES = "x11 pam" @@ -79,7 +79,7 @@ EXTRA_OECONF = "--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ --disable-xwayland \ " -EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DCMAKE_INSTALL_UNITDIR=${systemd_unitdir}', '-DINSTALL_SYSTEMD_UNITS=OFF', d)}" +EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DCMAKE_INSTALL_UNITDIR=${systemd_system_unitdir}', '-DINSTALL_SYSTEMD_UNITS=OFF', d)}" do_configure:append () { olddir=`pwd` @@ -124,7 +124,8 @@ FILES:${PN} += " \ ${libdir}/xorg/modules/extensions \ ${datadir}/icons \ ${datadir}/metainfo \ - ${systemd_unitdir} \ " FILES:${PN}-dbg += "${libdir}/xorg/modules/extensions/.debug" + +SYSTEMD_SERVICE:${PN} = "vncserver@.service"