From 6bf84eb5ecd3a578b4f422d3cf9915a8ba939d94 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 6 Apr 2019 20:54:08 +0200 Subject: gnome-desktop3: Disable libseccomp for all archs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Khem Raj --- ...on.build-Disable-libseccomp-for-all-archs.patch | 40 ++++++++++++++++++++++ .../gnome-desktop/gnome-desktop3_3.32.0.bb | 5 ++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch (limited to 'meta-gnome') 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 0000000000..e93d5b674c --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch @@ -0,0 +1,40 @@ +From de0d33b068a5d8e61cc0c82d88d15b9a8aa97977 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 6 Apr 2019 18:07:17 +0200 +Subject: [PATCH] meson.build: Disable libseccomp for all archs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It does not seem mandatory and can cause unsatisfied dependency [1]. + +[1] https://errors.yoctoproject.org/Errors/Details/235565/ + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + meson.build | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 83407b4..80eab84 100644 +--- a/meson.build ++++ b/meson.build +@@ -53,12 +53,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) + host_os = host_machine.system() + host_cpu = host_machine.cpu() + supported_os = ['linux'] +-unsupported_cpus = ['alpha', 'ia64', 'm68k', 'sh4', 'sparc', 'sparc64'] +-if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu) +- seccomp_dep = dependency('libseccomp') +-else +- seccomp_dep = dependency('', required: false) +-endif ++seccomp_dep = dependency('', required: false) + fontconfig_cache_path = fontconfig_dep.get_pkgconfig_variable('cachedir') + + xkb_base = xkb_config_dep.get_pkgconfig_variable('xkb_base') +-- +2.20.1 + 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 bba81663de..ffd7dcea40 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" SRC_URI[archive.md5sum] = "e423ed6d648c6c4f9798fa9cd9ea8d99" SRC_URI[archive.sha256sum] = "a6393dc5fc29fc0652ac84c73b3da205d0b0168128c4cf6d27797a08f3d07b54" -SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch" +SRC_URI += " \ + file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ + file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ +" DEPENDS += "itstool-native gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" -- cgit 1.2.3-korg