diff options
Diffstat (limited to 'external/meta-openembedded/meta-gnome/recipes-gnome/gvfs')
| -rw-r--r-- | external/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb (renamed from external/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.39.1.bb) | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/external/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.39.1.bb b/external/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb index ca1eb6aa..f04246f1 100644 --- a/external/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.39.1.bb +++ b/external/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb @@ -3,24 +3,23 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" GNOMEBASEBUILDCLASS = "meson" -inherit gnome bash-completion gettext +inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check useradd -DEPENDS += "libsecret glib-2.0 gconf intltool-native libgudev udisks2 polkit shadow-native" +DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \ + gsettings-desktop-schemas dbus" SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" +SRC_URI[archive.md5sum] = "8dea2f6a3f327a814a347758d4350e4b" +SRC_URI[archive.sha256sum] = "b57af97573bd295aa50037eed29c6ba7a36188230c515e007c3018855a5cf949" -SRC_URI[archive.md5sum] = "4c68899cfd80d57a153771534193bb9a" -SRC_URI[archive.sha256sum] = "6e7213570389b17b67433695f515f3b17705ba976168a4c8828fc177cce50223" - +# depends on gsettings-desktop-schemas->gcr->gtk+3-> x11 +REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OEMESON = " \ -Dbluray=false \ - -Dgdu=false \ -Dgoa=false \ -Dgoogle=false \ -Dnfs=false \ - -Dudisks2=true \ - -Ddocumentation=false \ " PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" @@ -33,7 +32,6 @@ FILES_${PN} += " \ ${libdir}/tmpfiles.d \ ${systemd_user_unitdir} \ " -RDEPENDS_${PN} = "udisks2" FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" FILES_${PN}-dev += "${libdir}/gio/modules/*.la" @@ -44,8 +42,14 @@ FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.moun RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" -PACKAGECONFIG ?= "libgphoto2 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG ?= "libgphoto2 \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','polkit','udisks2','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','polkit','admin','',d)} \ + " +PACKAGECONFIG[udisks2] = "-Dudisks2=true, -Dudisks2=false, udisks2, udisks2" +PACKAGECONFIG[admin] = "-Dadmin=true, -Dadmin=false, libcap polkit" PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" @@ -63,8 +67,21 @@ PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse" # libcdio-paranoia recipe doesn't exist yet PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" -# Fix up permissions on polkit rules.d to work with rpm4 constraints +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 polkitd" + do_install_append() { - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'true', 'false', d)}; then + # Fix up permissions on polkit rules.d to work with rpm4 constraints + chmod 700 ${D}/${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + fi + + # After rebuilds (not from scracth) it can happen that the executables in + # libexec ar missing executable permission flag. Not sure but it came up + # during transition to meson. Looked into build files and logs but could + # not find suspicious + for exe in `find ${D}/${libexecdir}`; do + chmod +x $exe + done } |