diff options
author | zangrc <zangrc.fnst@fujitsu.com> | 2021-06-08 09:34:43 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-06-09 08:49:20 -0700 |
commit | cfb70a6bbcbcec18462c63fcc4b8d396f74384a8 (patch) | |
tree | 7602c7d1ee1d3e2acda7fef0f432d845f5693893 /meta-gnome | |
parent | 85199e55e4b42e0300a26c25561a874ee029617b (diff) | |
download | meta-openembedded-cfb70a6bbcbcec18462c63fcc4b8d396f74384a8.tar.gz |
tracker-miners: upgrade 3.0.5 -> 3.1.1
Refresh the following patch:
0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch
Enable seccomp if distro feature is on
Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch | 4 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/tracker/tracker-miners_3.1.1.bb (renamed from meta-gnome/recipes-gnome/tracker/tracker-miners_3.0.5.bb) | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch index c9eb7994e..53c5f2664 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch | |||
@@ -23,8 +23,8 @@ diff --git a/meson.build b/meson.build | |||
23 | index 71a9df4..1eaa1a0 100644 | 23 | index 71a9df4..1eaa1a0 100644 |
24 | --- a/meson.build | 24 | --- a/meson.build |
25 | +++ b/meson.build | 25 | +++ b/meson.build |
26 | @@ -279,7 +279,7 @@ cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu) | 26 | @@ 299,7 +299,7 @@ cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu) |
27 | seccomp_required = system_supports_seccomp and cpu_supports_seccomp | 27 | seccomp_required = system_supports_seccomp and cpu_supports_seccomp and get_option('seccomp') and get_option('extract') |
28 | 28 | ||
29 | if not libseccomp.found() and seccomp_required | 29 | if not libseccomp.found() and seccomp_required |
30 | - error('Libseccomp is mandatory for sandboxed metadata extraction') | 30 | - error('Libseccomp is mandatory for sandboxed metadata extraction') |
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.0.5.bb b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.1.1.bb index 6672195e0..7287ec23d 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.0.5.bb +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.1.1.bb | |||
@@ -15,7 +15,7 @@ GNOMEBASEBUILDCLASS = "meson" | |||
15 | 15 | ||
16 | inherit gnomebase gsettings gobject-introspection vala bash-completion features_check | 16 | inherit gnomebase gsettings gobject-introspection vala bash-completion features_check |
17 | 17 | ||
18 | SRC_URI[archive.sha256sum] = "c9be14871b1398e6e656a354a8f8f59e69e93169017f2b28308ef439324fd12b" | 18 | SRC_URI[archive.sha256sum] = "e4d361351b156f2862a524415fbebf0539c781cd87c6629662f0265b4803b8b8" |
19 | SRC_URI += "file://0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch" | 19 | SRC_URI += "file://0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch" |
20 | 20 | ||
21 | # gobject-introspection is mandatory and cannot be configured | 21 | # gobject-introspection is mandatory and cannot be configured |
@@ -34,6 +34,7 @@ PACKAGECONFIG ??= " \ | |||
34 | png \ | 34 | png \ |
35 | tiff \ | 35 | tiff \ |
36 | xml \ | 36 | xml \ |
37 | ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ | ||
37 | " | 38 | " |
38 | 39 | ||
39 | PACKAGECONFIG[battery] = "-Dbattery_detection=upower,-Dbattery_detection=none,upower" | 40 | PACKAGECONFIG[battery] = "-Dbattery_detection=upower,-Dbattery_detection=none,upower" |
@@ -54,7 +55,7 @@ PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=dis | |||
54 | 55 | ||
55 | # For security reasons it is strongly recommended to set add meta-security in | 56 | # For security reasons it is strongly recommended to set add meta-security in |
56 | # your layers and 'libseccomp' to PACKAGECONFIG". | 57 | # your layers and 'libseccomp' to PACKAGECONFIG". |
57 | PACKAGECONFIG[libseccomp] = ",,libseccomp" | 58 | PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp" |
58 | # not yet in meta-gnome | 59 | # not yet in meta-gnome |
59 | PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" | 60 | PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" |
60 | 61 | ||