From patchwork Tue Feb 25 18:09:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 57864 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 F0AFFC021BB for ; Tue, 25 Feb 2025 18:09:28 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.15835.1740506962926908995 for ; Tue, 25 Feb 2025 10:09:23 -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 942721BCB for ; Tue, 25 Feb 2025 10:09:38 -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 EBE2D3F6A8 for ; Tue, 25 Feb 2025 10:09:21 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 1/7] lftp: remove obsolete acpaths Date: Tue, 25 Feb 2025 18:09:07 +0000 Message-ID: <20250225180917.3232793-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 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 ; Tue, 25 Feb 2025 18:09:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115588 As of "autotools: don't try and find in-tree macros" in core, acpaths is no longer used. Also remove an obsolete FILES:PN-dbg as the debug package is packaged automatically. Signed-off-by: Ross Burton --- meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb b/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb index bf3e18dce7..927916f985 100644 --- a/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb +++ b/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb @@ -12,8 +12,6 @@ SRC_URI[sha256sum] = "8a07cbf4df09b107fe3fc41d133ee2f6cea6ef4c33ccf06c8448ad058c inherit autotools gettext pkgconfig -acpaths = "-I ./m4" - EXTRA_OECONF += "--with-modules --disable-rpath" PACKAGECONFIG ??= "openssl zlib gnutls readline expat" @@ -27,5 +25,4 @@ do_install:append() { rm -rf ${D}${libdir}/charset.alias } FILES:${PN} += "${datadir}/icons/hicolor" -FILES:${PN}-dbg += "${libdir}/lftp/${PV}/.debug" RDEPENDS:${PN} = "perl bash readline" From patchwork Tue Feb 25 18:09:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 57867 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 EF1F4C021B8 for ; Tue, 25 Feb 2025 18:09:28 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.15894.1740506963302394859 for ; Tue, 25 Feb 2025 10:09:23 -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 41E6828C7 for ; Tue, 25 Feb 2025 10:09:39 -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 9AD053F6A8 for ; Tue, 25 Feb 2025 10:09:22 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 2/7] php: remove obsolete acpaths Date: Tue, 25 Feb 2025 18:09:08 +0000 Message-ID: <20250225180917.3232793-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250225180917.3232793-1-ross.burton@arm.com> References: <20250225180917.3232793-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 ; Tue, 25 Feb 2025 18:09:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115589 As of "autotools: don't try and find in-tree macros" in core, acpaths is no longer used. Signed-off-by: Ross Burton --- meta-oe/recipes-devtools/php/php_8.2.26.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-devtools/php/php_8.2.26.bb b/meta-oe/recipes-devtools/php/php_8.2.26.bb index 053242413f..b8e96833f6 100644 --- a/meta-oe/recipes-devtools/php/php_8.2.26.bb +++ b/meta-oe/recipes-devtools/php/php_8.2.26.bb @@ -136,8 +136,6 @@ LDFLAGS:append:riscv64 = " -latomic" EXTRA_OEMAKE = "INSTALL_ROOT=${D}" -acpaths = "" - do_configure:prepend () { rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4 find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_SBINDIR_NATIVE}/httpd!' From patchwork Tue Feb 25 18:09: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: 57866 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 EE521C021B2 for ; Tue, 25 Feb 2025 18:09:28 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.15837.1740506963970947897 for ; Tue, 25 Feb 2025 10:09:24 -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 E4AF71BCB for ; Tue, 25 Feb 2025 10:09:39 -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 49BBE3F6A8 for ; Tue, 25 Feb 2025 10:09:23 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 3/7] poke: remove obsolete acpaths Date: Tue, 25 Feb 2025 18:09:09 +0000 Message-ID: <20250225180917.3232793-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250225180917.3232793-1-ross.burton@arm.com> References: <20250225180917.3232793-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 ; Tue, 25 Feb 2025 18:09:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115590 As of "autotools: don't try and find in-tree macros" in core, acpaths is no longer used. Also switch to out-of-tree builds as this appear to work now. Signed-off-by: Ross Burton --- meta-oe/recipes-devtools/poke/poke_4.2.bb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meta-oe/recipes-devtools/poke/poke_4.2.bb b/meta-oe/recipes-devtools/poke/poke_4.2.bb index eb840435c0..a31b6605a2 100644 --- a/meta-oe/recipes-devtools/poke/poke_4.2.bb +++ b/meta-oe/recipes-devtools/poke/poke_4.2.bb @@ -13,12 +13,7 @@ DEPENDS = "flex-native bison-native bdwgc readline" SRC_URI[sha256sum] = "8aaf36e61e367a53140ea40e2559e9ec512e779c42bee34e7ac24b34ba119bde" -# poke does not support using out-of-tree builds -inherit autotools-brokensep gettext pkgconfig - -# The automatic m4 path detection gets confused, so force the right value from -# the poke bootstrap script. -acpaths = "-I ./m4" +inherit autotools gettext pkgconfig EXTRA_OECONF = "--disable-gui \ --disable-libnbd \ From patchwork Tue Feb 25 18:09:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 57865 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 0B601C021BE for ; Tue, 25 Feb 2025 18:09:29 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.15895.1740506964769336025 for ; Tue, 25 Feb 2025 10:09:24 -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 8B2A51BCB for ; Tue, 25 Feb 2025 10:09:40 -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 ECE133F6A8 for ; Tue, 25 Feb 2025 10:09:23 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 4/7] libgphoto2: remove redundant autoconfing Date: Tue, 25 Feb 2025 18:09:10 +0000 Message-ID: <20250225180917.3232793-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250225180917.3232793-1-ross.burton@arm.com> References: <20250225180917.3232793-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 ; Tue, 25 Feb 2025 18:09:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115591 The configure scripts do the right thing now, so there's no need to patch configure.ac or manually invoke the sub-configure. Also remove obsolete FILES, -dbg is packaged automatically and we don't install .la files. Signed-off-by: Ross Burton --- ...01-configure.ac-remove-AM_PO_SUBDIRS.patch | 41 ------------------- .../gphoto2/libgphoto2_2.5.31.bb | 15 ------- 2 files changed, 56 deletions(-) delete mode 100644 meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch deleted file mode 100644 index fd647b7386..0000000000 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 31a5d2f7db18737aef08c34e8707b4f69f7e5156 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 21 Oct 2012 17:59:20 +0200 -Subject: [PATCH] configure.ac: remove AM_PO_SUBDIRS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -together with oe autotools.bbclass this is done twice and causes: - -| autoreconf: running: aclocal --system-acdir=/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/aclocal-copy/ --automake-acdir=/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/share/aclocal-1.12 -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ --force -I auto-m4 -I m4m -| configure.ac:230: error: `po-directories' is already registered with AC_CONFIG_COMMANDS. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller ---- - configure.ac | 1 - - libgphoto2_port/configure.ac | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -282,7 +282,6 @@ dnl ------------------------------------ - GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2], - [${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}], - [po]) --AM_PO_SUBDIRS() - AM_GNU_GETTEXT_VERSION([0.19.1]) - AM_GNU_GETTEXT([external]) - AM_ICONV() ---- a/libgphoto2_port/configure.ac -+++ b/libgphoto2_port/configure.ac -@@ -122,7 +122,6 @@ dnl ------------------------------------ - GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2_PORT], - [${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}], - [po]) --AM_PO_SUBDIRS() - AM_GNU_GETTEXT_VERSION([0.19.1]) - AM_GNU_GETTEXT([external]) - AM_ICONV() diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb index 57c9d199eb..0b58e8e75f 100644 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb @@ -11,7 +11,6 @@ DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \ file://40-libgphoto2.rules \ - file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ file://0001-configure-Filter-out-buildpaths-from-CC.patch \ file://fix-build-with-gcc-14.patch \ " @@ -25,18 +24,6 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[gd] = ",--without-gdlib,gd" PACKAGECONFIG[serial] = "--enable-serial,--disable-serial,lockdev" -do_configure:prepend() { - rm -rf ${S}/libgphoto2_port/auto-m4/* - rm -rf ${S}/auto-m4/* -} - -do_configure:append() { - cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/ - cd ${S}/libgphoto2_port/ - autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths - cd ${S} -} - do_install:append() { install -d ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${UNPACKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ @@ -49,6 +36,4 @@ RRECOMMENDS:${PN} = "libgphoto2-camlibs" FILES:libgphotoport = "${libdir}/libgphoto2_port.so.*" FILES:${PN} += "${nonarch_base_libdir}/udev/*" -FILES:${PN}-dbg += "${libdir}/*/*/.debug" -FILES:${PN}-dev += "${libdir}/*/*/*.la" FILES:${PN}-doc += "${datadir}/libgphoto2_port/0.12.?/vcamera/README.txt" From patchwork Tue Feb 25 18:09:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 57868 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 1AB79C19778 for ; Tue, 25 Feb 2025 18:09:29 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.15838.1740506965237794132 for ; Tue, 25 Feb 2025 10:09:25 -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 322601BCB for ; Tue, 25 Feb 2025 10:09:41 -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 9325E3F6A8 for ; Tue, 25 Feb 2025 10:09:24 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 5/7] tigervnc: fix systemd unit packaging Date: Tue, 25 Feb 2025 18:09:11 +0000 Message-ID: <20250225180917.3232793-5-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250225180917.3232793-1-ross.burton@arm.com> References: <20250225180917.3232793-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 ; Tue, 25 Feb 2025 18:09:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115592 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" From patchwork Tue Feb 25 18:09:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 57870 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 1AB27C18E7C for ; Tue, 25 Feb 2025 18:09:29 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.15897.1740506966139563298 for ; Tue, 25 Feb 2025 10:09:26 -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 CC70E1BCB for ; Tue, 25 Feb 2025 10:09:41 -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 39FFB3F6A8 for ; Tue, 25 Feb 2025 10:09:25 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 6/7] tigervnc: simplify xserver unpack and build Date: Tue, 25 Feb 2025 18:09:12 +0000 Message-ID: <20250225180917.3232793-6-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250225180917.3232793-1-ross.burton@arm.com> References: <20250225180917.3232793-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 ; Tue, 25 Feb 2025 18:09:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115593 When unpacking, just use cp to hardlink the xserver source tree into the tigervnc source tree. When configuring, instead of replicating complicated logic, we can simply set the variable AUTOTOOLS_SCRIPT_PATH and just call autotools_do_configure. Some of the options passed to the xserver configure are obsolete so remove them. Signed-off-by: Ross Burton --- .../tigervnc/tigervnc_1.14.1.bb | 59 +++---------------- 1 file changed, 8 insertions(+), 51 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 6e4d4a7b0c..ab9edd9ee0 100644 --- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb +++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb @@ -33,32 +33,17 @@ SRC_URI[xorg.sha256sum] = "841c82901282902725762df03adbbcd68153d4cdfb0d61df0cfd7 # It is the directory containing the Xorg source for the # machine on which you are building TigerVNC. XSERVER_SOURCE_DIR="${S}/unix/xserver" +AUTOTOOLS_SCRIPT_PATH = "${XSERVER_SOURCE_DIR}" do_patch[postfuncs] += "do_patch_xserver" do_patch_xserver () { - subdirs="Xext xkb GL hw/xquartz/bundle hw/xfree86/common man doc" - for i in ${subdirs}; do - install -d ${XSERVER_SOURCE_DIR}/$i - done - - sources="hw/xquartz/bundle/cpprules.in man/Xserver.man doc/smartsched \ - xserver.ent.in xkb/README.compiled \ - hw/xfree86/xorgconf.cpp hw/xfree86/Xorg.sh.in" - for i in ${sources}; do - install -m 0644 ${XORG_S}/$i ${XSERVER_SOURCE_DIR}/$i; - done - - cd ${XORG_S} - find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' | \ - xargs tar cf - | (cd ${XSERVER_SOURCE_DIR} && tar xf -) - - cd ${XSERVER_SOURCE_DIR} - xserverpatch="${S}/unix/xserver21.patch" - echo "Apply $xserverpatch" - patch -p1 -b --suffix .vnc < $xserverpatch + # Put the xserver source in the right place in the tigervnc source tree + cp -rfl ${XORG_S}/* ${XSERVER_SOURCE_DIR} + # Apply the patch to integrate the vnc server + patch -p1 -b --suffix .vnc --directory ${XSERVER_SOURCE_DIR} <${S}/unix/xserver21.patch } -EXTRA_OECONF = "--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ +EXTRA_OECONF = "--disable-xorg --disable-xnest --disable-xvfb \ --disable-xwin --disable-xephyr --disable-kdrive --with-pic \ --disable-static --disable-xinerama \ --with-xkb-output=${localstatedir}/lib/xkb \ @@ -76,48 +61,20 @@ EXTRA_OECONF = "--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ --without-xmlto \ --enable-systemd-logind=no \ --disable-xinerama \ - --disable-xwayland \ " EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DCMAKE_INSTALL_UNITDIR=${systemd_system_unitdir}', '-DINSTALL_SYSTEMD_UNITS=OFF', d)}" do_configure:append () { - olddir=`pwd` - cd ${XSERVER_SOURCE_DIR} - - rm -rf aclocal-copy/ - rm -f aclocal.m4 - - export ACLOCALDIR="${XSERVER_SOURCE_DIR}/aclocal-copy" - mkdir -p ${ACLOCALDIR}/ - if [ -d ${STAGING_DATADIR_NATIVE}/aclocal ]; then - cp-noerror ${STAGING_DATADIR_NATIVE}/aclocal/ ${ACLOCALDIR}/ - fi - if [ -d ${STAGING_DATADIR}/aclocal -a "${STAGING_DATADIR_NATIVE}/aclocal" != "${STAGING_DATADIR}/aclocal" ]; then - cp-noerror ${STAGING_DATADIR}/aclocal/ ${ACLOCALDIR}/ - fi - ACLOCAL="aclocal --aclocal-path=${ACLOCALDIR}/" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed." - chmod +x ./configure - ${CACHED_CONFIGUREVARS} ./configure ${CONFIGUREOPTS} ${EXTRA_OECONF} - cd $olddir + autotools_do_configure } do_compile:append () { - olddir=`pwd` - cd ${XSERVER_SOURCE_DIR} - oe_runmake - - cd $olddir } do_install:append() { - olddir=`pwd` - cd ${XSERVER_SOURCE_DIR}/hw/vnc - - oe_runmake 'DESTDIR=${D}' install - - cd $olddir + oe_runmake -C ${B}/hw/vnc 'DESTDIR=${D}' install } FILES:${PN} += " \ From patchwork Tue Feb 25 18:09:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 57869 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 2B926C19777 for ; Tue, 25 Feb 2025 18:09:29 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.15898.1740506966644760568 for ; Tue, 25 Feb 2025 10:09:26 -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 72A0728C7 for ; Tue, 25 Feb 2025 10:09:42 -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 D48463F6A8 for ; Tue, 25 Feb 2025 10:09:25 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 7/7] tigervnc: small cleanups Date: Tue, 25 Feb 2025 18:09:13 +0000 Message-ID: <20250225180917.3232793-7-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250225180917.3232793-1-ross.burton@arm.com> References: <20250225180917.3232793-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 ; Tue, 25 Feb 2025 18:09:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115594 Add some implicit dependencies which are explicitly checked for, a small comment, and remove an obsolete FILES:PN-dbg. Signed-off-by: Ross Burton --- meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb | 6 +++--- 1 file changed, 3 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 ab9edd9ee0..ca737e48ba 100644 --- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb +++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "TigerVNC remote display system" HOMEPAGE = "http://www.tigervnc.com/" LICENSE = "GPL-2.0-or-later" SECTION = "x11/utils" -DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk libpam" +DEPENDS = "gettext-native xserver-xorg gnutls nettle jpeg pixman libxtst fltk libpam libx11 libxdamage libxfixes libxrandr" RDEPENDS:${PN} = "coreutils hicolor-icon-theme perl bash xkbcomp" LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" @@ -13,6 +13,8 @@ inherit autotools cmake features_check pkgconfig systemd REQUIRED_DISTRO_FEATURES = "x11 pam" +# For ease we do in-tree builds right now. It should be possible to do +# out-of-tree builds. B = "${S}" SRCREV = "1b4af5c586eb7a30a38c82fd088c1fa47a83e72f" @@ -83,6 +85,4 @@ FILES:${PN} += " \ ${datadir}/metainfo \ " -FILES:${PN}-dbg += "${libdir}/xorg/modules/extensions/.debug" - SYSTEMD_SERVICE:${PN} = "vncserver@.service"