diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2019-04-06 20:54:08 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-04-07 08:26:15 -0700 |
commit | 6bf84eb5ecd3a578b4f422d3cf9915a8ba939d94 (patch) | |
tree | 4773efe962315844529b33eea96a5b645583da43 /meta-gnome | |
parent | 410baed3e987ba0664feec46707978e5113efdc3 (diff) | |
download | meta-openembedded-6bf84eb5ecd3a578b4f422d3cf9915a8ba939d94.tar.gz |
gnome-desktop3: Disable libseccomp for all archs
It does not seem mandatory and can cause unsatisfied dependency [1].
[1] https://errors.yoctoproject.org/Errors/Details/235565/
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch | 40 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb | 5 |
2 files changed, 44 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch new file mode 100644 index 000000000..e93d5b674 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From de0d33b068a5d8e61cc0c82d88d15b9a8aa97977 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Sat, 6 Apr 2019 18:07:17 +0200 | ||
4 | Subject: [PATCH] meson.build: Disable libseccomp for all archs | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | It does not seem mandatory and can cause unsatisfied dependency [1]. | ||
10 | |||
11 | [1] https://errors.yoctoproject.org/Errors/Details/235565/ | ||
12 | |||
13 | Upstream-Status: Inappropriate [configuration] | ||
14 | |||
15 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
16 | --- | ||
17 | meson.build | 7 +------ | ||
18 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
19 | |||
20 | diff --git a/meson.build b/meson.build | ||
21 | index 83407b4..80eab84 100644 | ||
22 | --- a/meson.build | ||
23 | +++ b/meson.build | ||
24 | @@ -53,12 +53,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) | ||
25 | host_os = host_machine.system() | ||
26 | host_cpu = host_machine.cpu() | ||
27 | supported_os = ['linux'] | ||
28 | -unsupported_cpus = ['alpha', 'ia64', 'm68k', 'sh4', 'sparc', 'sparc64'] | ||
29 | -if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu) | ||
30 | - seccomp_dep = dependency('libseccomp') | ||
31 | -else | ||
32 | - seccomp_dep = dependency('', required: false) | ||
33 | -endif | ||
34 | +seccomp_dep = dependency('', required: false) | ||
35 | fontconfig_cache_path = fontconfig_dep.get_pkgconfig_variable('cachedir') | ||
36 | |||
37 | xkb_base = xkb_config_dep.get_pkgconfig_variable('xkb_base') | ||
38 | -- | ||
39 | 2.20.1 | ||
40 | |||
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb index bba81663d..ffd7dcea4 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb | |||
@@ -17,7 +17,10 @@ UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" | |||
17 | SRC_URI[archive.md5sum] = "e423ed6d648c6c4f9798fa9cd9ea8d99" | 17 | SRC_URI[archive.md5sum] = "e423ed6d648c6c4f9798fa9cd9ea8d99" |
18 | SRC_URI[archive.sha256sum] = "a6393dc5fc29fc0652ac84c73b3da205d0b0168128c4cf6d27797a08f3d07b54" | 18 | SRC_URI[archive.sha256sum] = "a6393dc5fc29fc0652ac84c73b3da205d0b0168128c4cf6d27797a08f3d07b54" |
19 | 19 | ||
20 | SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch" | 20 | SRC_URI += " \ |
21 | file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ | ||
22 | file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ | ||
23 | " | ||
21 | 24 | ||
22 | DEPENDS += "itstool-native gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" | 25 | DEPENDS += "itstool-native gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" |
23 | 26 | ||