diff options
| author |   Markus Volk <f_l_k@t-online.de> | 2023-07-10 09:24:22 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2023-07-10 11:01:40 -0700 |
| commit | ed0c5261ad886e8424aeb573d227b055187334c4 (patch) | |
| tree | ed6fec977e2b0d94b8e8b61732d6d1e3225262b2 /meta-oe/recipes-extended | |
| parent | 564af52a771d1454b4b859553a4bbbbc3dfe38ea (diff) | |
| download | meta-openembedded-contrib-ed0c5261ad886e8424aeb573d227b055187334c4.tar.gz | |
flatpak: update dependencies
- use system bubblewrap and xdg-dbus-proxy instead of building subprojects
- fix seccomp PACKAGECONFIG
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
| -rw-r--r-- | meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb | 9 |
1 files changed, 7 insertions, 2 deletions
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 fcf80fc854..163d732a86 100644 --- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb +++ b/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb @@ -28,11 +28,13 @@ DEPENDS = " \ json-glib \ libarchive \ libcap \ + libxml2 \ libxslt-native \ ostree \ polkit \ python3-pyparsing-native \ xmlto-native \ + zstd \ " RDEPENDS:${PN} = " \ @@ -40,17 +42,20 @@ RDEPENDS:${PN} = " \ ca-certificates \ dconf \ flatpak-xdg-utils \ + xdg-dbus-proxy \ " +EXTRA_OEMESON += "-Dsystem_dbus_proxy=${bindir}/xdg-dbus-proxy -Dsystem_bubblewrap=${bindir}/bwrap" + GIR_MESON_OPTION = "" -PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native" 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)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \ " FILES:${PN} += "${libdir} ${datadir}" |