From e5643c6ba5af912fcab7bab90c8178e59ccb3f4f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 25 Feb 2025 17:29:50 +0000 Subject: [PATCH] tigervnc: fix systemd unit packaging 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"