Skip to contentSkip to conversation

tracker-miners: upgrade 3.0.5 -> 3.1.1

PATCH New Khem Raj 1 participant 1 message Jun 9, 2021 Arm/Amlogic Meson SoC support

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v2 1/1 tracker-miners: upgrade 3.0.5 -> 3.1.1

From: zangrc <[email protected]>

Refresh the following patch:
0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch

Enable seccomp if distro feature is on

---
 ...eson.build-Just-warn-if-we-build-without-libseccomp.patch | 4 ++--
 .../{tracker-miners_3.0.5.bb => tracker-miners_3.1.1.bb}     | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)
 rename meta-gnome/recipes-gnome/tracker/{tracker-miners_3.0.5.bb => tracker-miners_3.1.1.bb} (92%)
meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch +2 -2
index c9eb7994e6..53c5f2664e 100644
@@ -23,8 +23,8 @@ diff --git a/meson.build b/meson.build
 index 71a9df4..1eaa1a0 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -279,7 +279,7 @@ cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu)
- seccomp_required = system_supports_seccomp and cpu_supports_seccomp
+@@ 299,7 +299,7 @@ cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu)
+ seccomp_required = system_supports_seccomp and cpu_supports_seccomp and get_option('seccomp') and get_option('extract')
  
  if not libseccomp.found() and seccomp_required
 -  error('Libseccomp is mandatory for sandboxed metadata extraction')
meta-gnome/recipes-gnome/tracker/tracker-miners_3.1.1.bb renamed from meta-gnome/recipes-gnome/tracker/tracker-miners_3.0.5.bb +3 -2
similarity index 92%
rename from meta-gnome/recipes-gnome/tracker/tracker-miners_3.0.5.bb
rename to meta-gnome/recipes-gnome/tracker/tracker-miners_3.1.1.bb
index 6672195e00..15a6faa71e 100644
@@ -15,7 +15,7 @@ GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase gsettings gobject-introspection vala bash-completion features_check
 
-SRC_URI[archive.sha256sum] = "c9be14871b1398e6e656a354a8f8f59e69e93169017f2b28308ef439324fd12b"
+SRC_URI[archive.sha256sum] = "e4d361351b156f2862a524415fbebf0539c781cd87c6629662f0265b4803b8b8"
 SRC_URI += "file://0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch"
 
 # gobject-introspection is mandatory and cannot be configured
@@ -34,6 +34,7 @@ PACKAGECONFIG ??= " \
     png \
     tiff \
     xml \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \
 "
 
 PACKAGECONFIG[battery]     = "-Dbattery_detection=upower,-Dbattery_detection=none,upower"
@@ -54,7 +55,7 @@ PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=dis
 
 # For security reasons it is strongly recommended to set add meta-security in
 # your layers and 'libseccomp' to PACKAGECONFIG".
-PACKAGECONFIG[libseccomp] = ",,libseccomp"
+PACKAGECONFIG[seccomp] = ",,libseccomp"
 # not yet in meta-gnome
 PACKAGECONFIG[rss]        = "-Dminer_rss=true,-Dminer_rss=false,libgrss"
 
Signature · 1 line
2.32.0