From patchwork Sat Aug 26 00:04:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 29522 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 6DDC1C83F08 for ; Sat, 26 Aug 2023 00:05:22 +0000 (UTC) Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by mx.groups.io with SMTP id smtpd.web11.38.1693008313400108706 for ; Fri, 25 Aug 2023 17:05:13 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.83, mailfrom: f_l_k@t-online.de) Received: from fwd79.aul.t-online.de (fwd79.aul.t-online.de [10.223.144.105]) by mailout07.t-online.de (Postfix) with SMTP id 3D52967CD for ; Sat, 26 Aug 2023 02:04:50 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([84.154.172.109]) by fwd79.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1qZgnF-2CICvJ0; Sat, 26 Aug 2023 02:04:45 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [RFC[meta-oe][PATCH 1/3] flatpak: allow to build native Date: Sat, 26 Aug 2023 02:04:31 +0200 Message-ID: <20230826000433.544757-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1693008285-ED7F82E6-D10F8CE8/0/0 CLEAN NORMAL X-TOI-MSGID: fd89b4cd-7210-4d36-8278-1905bd365223 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 ; Sat, 26 Aug 2023 00:05:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/104616 flatpaks dbus-1/interfaces and dbus-1/services files are required to build xdg-desktop-portal. To avoid having to patch the .pc files or having to have flatpak installed on the host machine, make flatpak-native available to other recipes Signed-off-by: Markus Volk --- .../0001-flatpak-pc-add-pc_sysrootdir.patch | 28 ------------------- .../flatpak/flatpak_1.15.4.bb | 17 +++++------ 2 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch deleted file mode 100644 index c1f2cca5c..000000000 --- a/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3a1ab02d821cd4b0af44c0dad87e290ebaabef83 Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Wed, 14 Dec 2022 06:50:40 +0100 -Subject: [PATCH] flatpak.pc: add pc_sysrootdir - -Signed-off-by: Markus Volk ---- -Upstream-Status: Pending - - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 4a0b865e..5f69b1d9 100644 ---- a/meson.build -+++ b/meson.build -@@ -509,7 +509,7 @@ pkgconfig_variables += 'exec_prefix=${prefix}' - pkgconfig_variables += 'datadir=' + ('${prefix}' / get_option('datadir')) - - pkgconfig_variables += 'datarootdir=' + ('${prefix}' / get_option('datadir')) --pkgconfig_variables += 'interfaces_dir=${datadir}/dbus-1/interfaces/' -+pkgconfig_variables += 'interfaces_dir=${pc_sysrootdir}${datadir}/dbus-1/interfaces/' - pkgconfig_variables += 'httpbackend=' + get_option('http_backend') - - pkgconfig.generate( --- -2.34.1 - diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb index f5a726a83..aac972fd3 100644 --- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb +++ b/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb @@ -3,10 +3,7 @@ HOMEPAGE = "http://flatpak.org" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = " \ - gitsm://github.com/flatpak/flatpak;protocol=https;nobranch=1 \ - file://0001-flatpak-pc-add-pc_sysrootdir.patch \ -" +SRC_URI = "gitsm://github.com/flatpak/flatpak;protocol=https;nobranch=1" SRCREV = "e936e3100d406c50ba49f3ad6a0ecae455345ec0" @@ -14,7 +11,7 @@ S = "${WORKDIR}/git" inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native useradd mime features_check -REQUIRED_DISTRO_FEATURES = "polkit" +REQUIRED_DISTRO_FEATURES:class-target = "polkit" DEPENDS = " \ appstream \ @@ -36,8 +33,9 @@ DEPENDS = " \ xmlto-native \ zstd \ " +DEPENDS:remove:class-native = "polkit" -RDEPENDS:${PN} = " \ +RDEPENDS:${PN}:class-target = " \ bubblewrap \ ca-certificates \ dconf \ @@ -56,7 +54,7 @@ PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native" PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth" PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp" -PACKAGECONFIG ?= " \ +PACKAGECONFIG:class-target ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xauth', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \ " @@ -66,8 +64,11 @@ FILES:${PN} += "${libdir} ${datadir}" USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" -do_install:append() { +do_install:append:class-target() { chmod 0700 ${D}/${datadir}/polkit-1/rules.d chown polkitd ${D}/${datadir}/polkit-1/rules.d chgrp root ${D}/${datadir}/polkit-1/rules.d } + +EXTRA_OEMESON:class-native += "-Dsystem_helper=disabled" +BBCLASSEXTEND = "native" From patchwork Sat Aug 26 00:04:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 29520 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 6B0FEC83F0C for ; Sat, 26 Aug 2023 00:05:22 +0000 (UTC) Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by mx.groups.io with SMTP id smtpd.web10.41.1693008313802554558 for ; Fri, 25 Aug 2023 17:05:14 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.83, mailfrom: f_l_k@t-online.de) Received: from fwd79.aul.t-online.de (fwd79.aul.t-online.de [10.223.144.105]) by mailout07.t-online.de (Postfix) with SMTP id 3F53A67CF for ; Sat, 26 Aug 2023 02:04:50 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([84.154.172.109]) by fwd79.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1qZgnI-2CICvK0; Sat, 26 Aug 2023 02:04:48 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [RFC[meta-oe][PATCH 2/3] fuse3: allow to build native Date: Sat, 26 Aug 2023 02:04:32 +0200 Message-ID: <20230826000433.544757-2-f_l_k@t-online.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230826000433.544757-1-f_l_k@t-online.de> References: <20230826000433.544757-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1693008288-ED7F82E6-F57928BD/0/0 CLEAN NORMAL X-TOI-MSGID: 6b23d130-a310-4110-aa30-16bbcb13b611 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 ; Sat, 26 Aug 2023 00:05:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/104617 for now only fuse2 can be built as native variant. this patch allows to build fuse3-native which is required to build flatpak-native Signed-off-by: Markus Volk --- meta-filesystems/recipes-support/fuse/fuse3_3.15.1.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta-filesystems/recipes-support/fuse/fuse3_3.15.1.bb b/meta-filesystems/recipes-support/fuse/fuse3_3.15.1.bb index de2996db1..6a75f4423 100644 --- a/meta-filesystems/recipes-support/fuse/fuse3_3.15.1.bb +++ b/meta-filesystems/recipes-support/fuse/fuse3_3.15.1.bb @@ -11,8 +11,7 @@ LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LGPL2.txt;md5=4fbd65380cdd255951079008b364516c \ file://LICENSE;md5=a55c12a2d7d742ecb41ca9ae0a6ddc66" -SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.gz \ -" +SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.gz" SRC_URI[sha256sum] = "13ef77cda531a21c2131f9576042970e98035c0a5f019abf661506efd2d38a4e" S = "${WORKDIR}/fuse-${PV}" @@ -59,7 +58,7 @@ do_install_ptest() { done } -DEPENDS = "udev" +DEPENDS:class-target = "udev" PACKAGES =+ "fuse3-utils" @@ -78,3 +77,7 @@ DEBIAN_NOAUTONAME:${PN}-dbg = "1" do_install:append() { rm -rf ${D}${base_prefix}/dev } + +EXTRA_OEMESON:class-native = "-Dutils=false -Dexamples=false" + +BBCLASSEXTEND = "native nativesdk" From patchwork Sat Aug 26 00:04:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 29521 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 6201CC83F0B for ; Sat, 26 Aug 2023 00:05:22 +0000 (UTC) Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by mx.groups.io with SMTP id smtpd.web11.39.1693008313478358034 for ; Fri, 25 Aug 2023 17:05:13 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.83, mailfrom: f_l_k@t-online.de) Received: from fwd79.aul.t-online.de (fwd79.aul.t-online.de [10.223.144.105]) by mailout07.t-online.de (Postfix) with SMTP id 97DE867D1 for ; Sat, 26 Aug 2023 02:04:52 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([84.154.172.109]) by fwd79.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1qZgnM-2CICvL0; Sat, 26 Aug 2023 02:04:52 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [RFC[meta-oe][PATCH 3/3] xdg-desktop-portal: upgrade 1.16.0 -> 1.17.0 Date: Sat, 26 Aug 2023 02:04:33 +0200 Message-ID: <20230826000433.544757-3-f_l_k@t-online.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230826000433.544757-1-f_l_k@t-online.de> References: <20230826000433.544757-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1693008292-ED7F82E6-248C07D4/0/0 CLEAN NORMAL X-TOI-MSGID: 76ae2871-5982-4463-a5ac-bde37c26dece 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 ; Sat, 26 Aug 2023 00:05:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/104615 This is a pre-release version. I'm not sure if it's a blocker, but it has some nice features and if done like this we don't need to patch the .pc files for flatpak and xdg-portal-desktop anymore. I think being able to omit this is an improvement. Remove the dbus-native dependency as it is needed only for tests and for that we also would need to provide python3-dbusmock-native Explicitly set the target directories for dbus-service-dir and flatpak-interfaces-dir Signed-off-by: Markus Volk --- ...p-portal-pc-in-add-pc_sysrootdir-dir.patch | 27 ------------------- ...1.16.0.bb => xdg-desktop-portal_1.17.0.bb} | 15 ++++++----- 2 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-xdg-desktop-portal-pc-in-add-pc_sysrootdir-dir.patch rename meta-oe/recipes-support/xdg-desktop-portal/{xdg-desktop-portal_1.16.0.bb => xdg-desktop-portal_1.17.0.bb} (73%) diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-xdg-desktop-portal-pc-in-add-pc_sysrootdir-dir.patch b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-xdg-desktop-portal-pc-in-add-pc_sysrootdir-dir.patch deleted file mode 100644 index 1997d0ffe..000000000 --- a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-xdg-desktop-portal-pc-in-add-pc_sysrootdir-dir.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7727dbfef4dd7ced3958ae9ada59a8899976b12d Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Mon, 12 Dec 2022 18:40:31 +0100 -Subject: [PATCH] xdg-desktop-portal.pc.in: add pc_sysrootdir dir - ---- -Upstream-Status: Pending - - xdg-desktop-portal.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xdg-desktop-portal.pc.in b/xdg-desktop-portal.pc.in -index 585c0c8..15b5817 100644 ---- a/xdg-desktop-portal.pc.in -+++ b/xdg-desktop-portal.pc.in -@@ -2,7 +2,7 @@ prefix=@prefix@ - datarootdir=@datarootdir@ - datadir=@datadir@ - --interfaces_dir=${datadir}/dbus-1/interfaces/ -+interfaces_dir=${pc_sysrootdir}${datadir}/dbus-1/interfaces - - Name: xdg-desktop-portal - Description: Desktop integration portal --- -2.34.1 - diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.16.0.bb b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.17.0.bb similarity index 73% rename from meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.16.0.bb rename to meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.17.0.bb index 0b3a93ab3..daf52f72e 100644 --- a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.16.0.bb +++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.17.0.bb @@ -8,10 +8,10 @@ REQUIRED_DISTRO_FEATURES = "polkit" DEPENDS = " \ json-glib \ glib-2.0 \ + flatpak-native \ libportal \ geoclue \ pipewire \ - dbus-native \ fuse3 \ xmlto-native \ flatpak \ @@ -27,17 +27,18 @@ RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS}" inherit meson pkgconfig python3native features_check -SRC_URI = " \ - git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=main \ - file://0001-xdg-desktop-portal-pc-in-add-pc_sysrootdir-dir.patch \ -" +SRC_URI = "git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=main" S = "${WORKDIR}/git" -SRCREV = "88af6c8ca4106fcf70925355350a669848e9fd5a" +SRCREV = "e31960ab3d3ecd3efeef1c97d1d40d94b866f4b7" FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1" -EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross" +EXTRA_OEMESON += " \ + --cross-file=${WORKDIR}/meson-${PN}.cross \ + -Dflatpak-interfaces-dir=${STAGING_DATADIR_NATIVE}/dbus-1/interfaces \ + -Ddbus-service-dir=${datadir}/dbus-1/services \ +" do_write_config:append() { cat >${WORKDIR}/meson-${PN}.cross <