diff options
Diffstat (limited to 'external/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop')
2 files changed, 40 insertions, 45 deletions
diff --git a/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch b/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch deleted file mode 100644 index aa11e8a6..00000000 --- a/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 96753d85d8b53dd8f87b8f444892efffdbfab388 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 5 Oct 2017 14:54:17 +0300 -Subject: [PATCH] Disable libseccomp (sycall filtering mechanism) - -Upstream forgot to make it optional, and it is not currently used in Yocto - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - configure.ac | 20 -------------------- - 1 file changed, 20 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 118d04f..47c8894 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -151,26 +151,6 @@ fi - - SECCOMP_PKG="" - enable_seccomp="no" --dnl Check for bubblewrap compatible platform --case $host_os in -- linux*) -- case $host_cpu in -- alpha|ia64|m68k|sh4|sparc64) -- enable_seccomp="no (not available on this architecture)" -- AC_MSG_WARN("seccomp not available on this architecture") -- ;; -- *) -- PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp]) -- SECCOMP_PKG="libseccomp" -- AC_DEFINE([ENABLE_SECCOMP], [1], [Define if using seccomp]) -- enable_seccomp="yes" -- ;; -- esac -- AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define to include GNU extensions]) -- AC_DEFINE_UNQUOTED(HAVE_BWRAP, 1, [Define to 1 if Bubblewrap support is available]) -- AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "$prefix", [Path to library install prefix]) -- ;; --esac - - dnl pkg-config dependency checks - diff --git a/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch b/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch new file mode 100644 index 00000000..4b3894f0 --- /dev/null +++ b/external/meta-openembedded/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?= <schnitzeltony@gmail.com> +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 <schnitzeltony@gmail.com> +--- + meson.build | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 2e7160d..f83677d 100644 +--- a/meson.build ++++ b/meson.build +@@ -58,12 +58,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', 'riscv64', '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 + |