nautilus fix / gsettings + upstream-version-is-even consolidation
cover nautilus fix / gsettings + upstream-version-is-even consolidation
nautilus should work now
Andreas Müller (9):
file-roller: add gsettings to inherit
tracker: add gsettings to inherit
tracker-miners: initial add 2.3.1
nautilus: add gsettings to inherit
nautilus: add tracker-miners to RDPENDS
libgweather: add gsetings & upstream-version-is-even to inherit
gnome-settings-daemon: add gsettings to inherit
gnome-terminal: add gsettings to inherit
gedit: add gsettings to inherit
.../file-roller/file-roller_3.32.2.bb | 2 +- .../recipes-gnome/gedit/gedit_3.34.0.bb | 2 +- .../gnome-settings-daemon_3.34.1.bb | 2 +- .../gnome-terminal/gnome-terminal_3.34.2.bb | 2 +- .../libgweather/libgweather_3.34.0.bb | 2 +- .../recipes-gnome/nautilus/nautilus_3.34.1.bb | 6 +- .../tracker/tracker-miners_2.3.1.bb | 66 +++++++++++++++++++ .../recipes-gnome/tracker/tracker_2.3.1.bb | 2 +- 8 files changed, 77 insertions(+), 7 deletions(-) create mode 100644 meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.1.bb
Signature · 1 line
2.21.0
PATCH 1/9 file-roller: add gsettings to inherit
--- meta-gnome/recipes-gnome/file-roller/file-roller_3.32.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/file-roller/file-roller_3.32.2.bb +1 -1
@@ -12,7 +12,7 @@ DEPENDS = " \ libnotify \ " -inherit gnomebase itstool gnome-help gettext upstream-version-is-even +inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even SRC_URI[archive.md5sum] = "e79715bb2400df83c0f67cc0cce2b655" SRC_URI[archive.sha256sum] = "c60a79e0baf74cb1c09a1c8f5ffe0d6e311227ca14ecc5b1156beb3715341a71"
Signature · 1 line
2.21.0
PATCH 2/9 tracker: add gsettings to inherit
In reply to Andreas Müller--- meta-gnome/recipes-gnome/tracker/tracker_2.3.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/tracker/tracker_2.3.1.bb +1 -1
@@ -20,7 +20,7 @@ DEPENDS = " \ GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection vala gtk-doc manpages bash-completion distro_features_check +inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion distro_features_check SRC_URI[archive.md5sum] = "5e75b611b190c4cebf53e3de15266429" SRC_URI[archive.sha256sum] = "b6748726e465ad2f4d991560634b1fd0df8841f3d981b3b837c4162abedf08a1"
Signature · 1 line
2.21.0
PATCH 3/9 tracker-miners: initial add 2.3.1
In reply to Andreas Müllertracker-miners is a mandatory runtime-dependency for nautilus
--- .../tracker/tracker-miners_2.3.1.bb | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.1.bb
meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.1.bb new file +66 -0
@@ -0,0 +1,66 @@ +SUMMARY = "Tracker miners and metadata extractors" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ + file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" + +DEPENDS = " \ + intltool-native \ + tracker \ + zlib \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion distro_features_check + +SRC_URI[archive.md5sum] = "0321d8f4ad27e3fccdbc8384e5b3cb83" +SRC_URI[archive.sha256sum] = "7b1de06a7a79ea1c7813c8a21f8cd1c55f2b95f799cf9f47f0204f3be8a590e0" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +PACKAGECONFIG ??= " \ + ffmpeg \ + flac \ + gexiv2 \ + gstreamer \ + icu \ + libexif \ + libgsf \ + jpeg \ + png \ + tiff \ + xml \ + pdf \ +" + +PACKAGECONFIG[ffmpeg] = ",,ffmpeg" +PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" +PACKAGECONFIG[gexiv2] = ",,gexiv2" +PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[gupnp] = ",,gupnp-dlna" +PACKAGECONFIG[icu] = ",,icu" +PACKAGECONFIG[libexif] = "-Dexif=enabled,-Dexif=disabled,libexif" +PACKAGECONFIG[libgsf] = "-Dgsf=enabled,-Dgsf=disabled,libgsf" +PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" +PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" +PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" +PACKAGECONFIG[xml] = "-Dxml=enabled,-Dxml=disabled,libxml2" +PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis" +PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler" +PACKAGECONFIG[upower] = ",,upower" + +# meta-selinux +PACKAGECONFIG[libseccomp] = ",,libseccomp" +# not yet in meta-gnome +PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/tracker \ + ${libdir}/tracker-miners-2.0 \ + ${systemd_user_unitdir} \ +"
Signature · 1 line
2.21.0
Re: [PATCH 3/9] tracker-miners: initial add 2.3.1
Quoted 3 lines · Andreas Müller
tracker-miners is a mandatory runtime-dependency for nautilus
fails to build on x86
https://errors.yoctoproject.org/Errors/Details/277884/
Quoted 86 lines
Signed-off-by Andreas Müller <[email protected]>--- .../tracker/tracker-miners_2.3.1.bb | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.1.bbmeta-gnome/recipes-gnome/tracker/tracker-miners_2.3.1.bb new file +66
-1@@ -0,0 +1,66 @@ +SUMMARY = "Tracker miners and metadata extractors" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ + file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" + +DEPENDS = " \ + intltool-native \ + tracker \ + zlib \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion distro_features_check + +SRC_URI[archive.md5sum] = "0321d8f4ad27e3fccdbc8384e5b3cb83" +SRC_URI[archive.sha256sum] = "7b1de06a7a79ea1c7813c8a21f8cd1c55f2b95f799cf9f47f0204f3be8a590e0" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +PACKAGECONFIG ??= " \ + ffmpeg \ + flac \ + gexiv2 \ + gstreamer \ + icu \ + libexif \ + libgsf \ + jpeg \ + png \ + tiff \ + xml \ + pdf \ +" + +PACKAGECONFIG[ffmpeg] = ",,ffmpeg" +PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" +PACKAGECONFIG[gexiv2] = ",,gexiv2" +PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[gupnp] = ",,gupnp-dlna" +PACKAGECONFIG[icu] = ",,icu" +PACKAGECONFIG[libexif] = "-Dexif=enabled,-Dexif=disabled,libexif" +PACKAGECONFIG[libgsf] = "-Dgsf=enabled,-Dgsf=disabled,libgsf" +PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" +PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" +PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" +PACKAGECONFIG[xml] = "-Dxml=enabled,-Dxml=disabled,libxml2" +PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis" +PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler" +PACKAGECONFIG[upower] = ",,upower" + +# meta-selinux +PACKAGECONFIG[libseccomp] = ",,libseccomp" +# not yet in meta-gnome +PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/tracker \ + ${libdir}/tracker-miners-2.0 \ + ${systemd_user_unitdir} \ +" --2.21.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [PATCH 3/9] tracker-miners: initial add 2.3.1
Quoted 10 lines · Khem Raj
Quoted 3 lines · Andreas Müller
tracker-miners is a mandatory runtime-dependency for nautilus
fails to build on x86
Same procedure - hope V2 coming soon...
Andreas
Re: [PATCH 3/9] tracker-miners: initial add 2.3.1
Quoted 4 lines · Andreas Müller
Quoted 4 lines
fails to build on x86
This turns tricky so I first try explain the issue and then ask for suggestions/discussion:
1.
meson.build contains:
| libseccomp = dependency('libseccomp', version: '>= 2.0', required: false)
| ...
| host_system = host_machine.system()
| host_cpu = host_machine.cpu()| # You can find a list of architectures that seccomp supports in the seccomp | # project README. See: https://github.com/seccomp/libseccomp/ | unsupported_cpus = [ | 'alpha', | 'ia64', | 'm68k', | 'parisc', | 'parisc64', | 'sh4', | 'sparc', | 'sparc64', |] | | system_supports_seccomp = host_system == 'linux' | cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu) | seccomp_required = system_supports_seccomp and cpu_supports_seccomp | |if not libseccomp.found() and seccomp_required | error('Libseccomp is mandatory for sandboxed metadata extraction') | endif
That means:
* tracker-miners' developers make libseccom a _mandatory_ dependency- except for those arches not supported by libseccomp
* my test build passed accidentally because host_machine.system() reports 'linux-gnueabi' and that is not detected as 'linux'
2.
I see the following ways to go:
a. Patch the check away and add a comment in the recipe like: "For security reasons it is strongly recommended to set add meta-security in your layers and 'libseccomp' to PACKAGECONFIG".
b. Move libseccomp form meta-security -> meta-oe. That would need some COMPATIBLE_HOST dance (at leas for riscv) in libseccomp and tracker-miners
c. Give up nautilus because it crashes without tracke-miners
After looking into e.g [1] I
* don't think that riscv support will ever come to libseccomp
* am afraid that libseccomp can cause strange effects with very old/new kernel versions
* prefer a.
OK - long talk: What do others think?
Cheers
Andreas
[1] https://github.com/seccomp/libseccomp/blob/master/src/arch-arm-syscalls.c
Re: [PATCH 3/9] tracker-miners: initial add 2.3.1
Quoted 54 lines · Andreas Müller
Quoted 4 lines · Andreas Müller
Quoted 4 lines
fails to build on x86
This turns tricky so I first try explain the issue and then ask for suggestions/discussion:
1.
meson.build contains:| libseccomp = dependency('libseccomp', version: '>= 2.0', required: false) | ... | host_system = host_machine.system() | host_cpu = host_machine.cpu()| # You can find a list of architectures that seccomp supports in the seccomp | # project README. See: https://github.com/seccomp/libseccomp/ | unsupported_cpus = [ | 'alpha', | 'ia64', | 'm68k', | 'parisc', | 'parisc64', | 'sh4', | 'sparc', | 'sparc64', |] | | system_supports_seccomp = host_system == 'linux' | cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu) | seccomp_required = system_supports_seccomp and cpu_supports_seccomp | |if not libseccomp.found() and seccomp_required | error('Libseccomp is mandatory for sandboxed metadata extraction') | endifThat means:
* tracker-miners' developers make libseccom a _mandatory_ dependency- except for those arches not supported by libseccomp
* my test build passed accidentally becausehost_machine.system()reports 'linux-gnueabi' and that is not detected as 'linux'2.
I see the following ways to go:
a. Patch the check away and add a comment in the recipe like: "For security reasons it is strongly recommended to set add meta-security in your layers and 'libseccomp' to PACKAGECONFIG".
b. Move libseccomp form meta-security -> meta-oe. That would need someCOMPATIBLE_HOSTdance (at leas for riscv) in libseccomp and tracker-miners
c. Give up nautilus because it crashes without tracke-miners
Quoted 8 lines
After looking into e.g [1] I
* don't think that riscv support will ever come to libseccomp
* am afraid that libseccomp can cause strange effects with very old/new kernel versions
* prefer a.OK - long talk: What do others think?
there has been attempts to bring libseccomp to meta-oe [1] since it was used in wide
variety of packages. I am willing to maintain it in OE if someone can make the needed changes
and address review comments from last attempt.
secondly, if the support is optional, then we can make it so via packageconfig and keep it disabled
but seems thats not the case, in such a case, I think your proposal 'a' is ok
[1] https://patchwork.openembedded.org/patch/163384/
Quoted 5 lines
Cheers
Andreas
[1] https://github.com/seccomp/libseccomp/blob/master/src/arch-arm-syscalls.c
PATCH 4/9 nautilus: add gsettings to inherit
In reply to Andreas Müller--- meta-gnome/recipes-gnome/nautilus/nautilus_3.34.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/nautilus/nautilus_3.34.1.bb +1 -1
@@ -15,7 +15,7 @@ DEPENDS = " \ tracker \ " -inherit gnomebase gobject-introspection gtk-doc gettext distro_features_check +inherit gnomebase gsettings gobject-introspection gtk-doc gettext distro_features_check upstream-version-is-even SRC_URI[archive.md5sum] = "19e4f1d89fb9d0ff135d5b1974ce43b5" SRC_URI[archive.sha256sum] = "37ce2c16a610c589dcc7660f9092446465568e38e29bce6ed8c24f2e8e0077f3"
Signature · 1 line
2.21.0
PATCH 5/9 nautilus: add tracker-miners to RDPENDS
In reply to Andreas Müllernautilus does not start and complains:
| (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed
Thought I tested that successfully...
--- meta-gnome/recipes-gnome/nautilus/nautilus_3.34.1.bb | 4 ++++ 1 file changed, 4 insertions(+)
meta-gnome/recipes-gnome/nautilus/nautilus_3.34.1.bb +4 -0
@@ -30,3 +30,7 @@ FILES_${PN} += " \ ${datadir}/metainfo \ ${datadir}/gnome-shell \ " + +# mandatory - not checked during configuration: +# | (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed +RDEPENDS_${PN} += "tracker-miners"
Signature · 1 line
2.21.0
PATCH 6/9 libgweather: add gsetings & upstream-version-is-even to inherit
In reply to Andreas Müller--- meta-gnome/recipes-gnome/libgweather/libgweather_3.34.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/libgweather/libgweather_3.34.0.bb +1 -1
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gettext gtk-doc vala distro_features_check +inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala distro_features_check upstream-version-is-even SRC_URI[archive.md5sum] = "52c3b1e27887fc88f862c92c42d930c1" SRC_URI[archive.sha256sum] = "02245395d639d9749fe2d19b7e66b64a152b9509ab0e5aad92514538b9c6f1b9"
Signature · 1 line
2.21.0
PATCH 7/9 gnome-settings-daemon: add gsettings to inherit
In reply to Andreas Müller--- .../gnome-settings-daemon/gnome-settings-daemon_3.34.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.1.bb +1 -1
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gettext distro_features_check upstream-version-is-even +inherit gnomebase gsettings gobject-introspection gettext distro_features_check upstream-version-is-even SRC_URI[archive.md5sum] = "528b0b7cc2dd22c6026a9c8739c71fa7" SRC_URI[archive.sha256sum] = "7ce4979817866911a94ecb75b36db56797e038c0c524c5c1a81aefccafc17337"
Signature · 1 line
2.21.0
PATCH 8/9 gnome-terminal: add gsettings to inherit
In reply to Andreas Müller--- .../recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb +1 -1
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ " -inherit gnomebase gnome-help gettext itstool upstream-version-is-even +inherit gnomebase gsettings gnome-help gettext itstool upstream-version-is-even DEPENDS = " \ glib-2.0-native \
Signature · 1 line
2.21.0
PATCH 9/9 gedit: add gsettings to inherit
In reply to Andreas Müller--- meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb +1 -1
@@ -19,7 +19,7 @@ DEPENDS = " \ gtksourceview4 \ " -inherit gnomebase itstool gnome-help gobject-introspection gtk-doc vala gettext distro_features_check upstream-version-is-even +inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext distro_features_check upstream-version-is-even REQUIRED_DISTRO_FEATURES = "x11"
Signature · 1 line
2.21.0