From patchwork Fri Dec 23 03:11:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 17147 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 BB5C9C3DA79 for ; Fri, 23 Dec 2022 03:11:35 +0000 (UTC) Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by mx.groups.io with SMTP id smtpd.web11.64370.1671765088559595457 for ; Thu, 22 Dec 2022 19:11:28 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.19, mailfrom: f_l_k@t-online.de) Received: from fwd89.dcpf.telekom.de (fwd89.aul.t-online.de [10.223.144.115]) by mailout06.t-online.de (Postfix) with SMTP id 6137841C0 for ; Fri, 23 Dec 2022 04:11:26 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([84.163.43.10]) by fwd89.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1p8YSq-4MWH3b0; Fri, 23 Dec 2022 04:11:16 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Cc: Markus Volk Subject: [meta-oe][PATCHv2 3/3] flatpak: add recipe Date: Fri, 23 Dec 2022 04:11:04 +0100 Message-Id: <20221223031104.13517-3-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221223031104.13517-1-f_l_k@t-online.de> References: <20221223031104.13517-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1671765076-FAC5D742-656E7486/0/0 CLEAN NORMAL X-TOI-MSGID: 44a581ad-17ac-4cd8-9cb1-75f7d29328d6 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 ; Fri, 23 Dec 2022 03:11:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100195 Signed-off-by: Markus Volk --- .../0001-flatpak-pc-add-pc_sysrootdir.patch | 26 ++++++++ .../flatpak/flatpak_1.15.1.bb | 64 +++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch create mode 100644 meta-oe/recipes-extended/flatpak/flatpak_1.15.1.bb 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 new file mode 100644 index 000000000..99e9cd23b --- /dev/null +++ b/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch @@ -0,0 +1,26 @@ +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 +--- + 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.1.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.15.1.bb new file mode 100644 index 000000000..a906e6761 --- /dev/null +++ b/meta-oe/recipes-extended/flatpak/flatpak_1.15.1.bb @@ -0,0 +1,64 @@ +DESCRIPTION = "Desktop containment framework." +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 \ +" + +SRCREV = "47ea3934c0e055605b8dff93edad2136141e48ec" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig gettext systemd gobject-introspection python3native useradd mime features_check + +REQUIRED_DISTRO_FEATURES = "polkit" + +DEPENDS = " \ + appstream \ + bison-native \ + curl \ + dconf \ + fuse3 \ + gdk-pixbuf \ + glib-2.0 \ + gpgme \ + json-glib \ + libarchive \ + libcap \ + libxslt-native \ + ostree \ + polkit \ + python3-pyparsing-native \ + xmlto-native \ +" + +RDEPENDS:${PN} = " \ + bubblewrap \ + ca-certificates \ + dconf \ +" + +GIR_MESON_OPTION = "" + +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth" +PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth" +PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp" + +PACKAGECONFIG ?= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xauth', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'security', 'seccomp', '', d)} \ +" + +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() { + chmod 0700 ${D}/${datadir}/polkit-1/rules.d + chown polkitd ${D}/${datadir}/polkit-1/rules.d + chgrp root ${D}/${datadir}/polkit-1/rules.d +}