diff options
Diffstat (limited to 'meta/recipes-gnome/gnome-desktop/gnome-desktop')
2 files changed, 19 insertions, 45 deletions
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch index 10b07435c4..aa11e8a62e 100644 --- a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch +++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9dfada06f8d2e02d7a04f793ba6e1d4a2aa5ffb7 Mon Sep 17 00:00:00 2001 | 1 | From 96753d85d8b53dd8f87b8f444892efffdbfab388 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 5 Oct 2017 14:54:17 +0300 | 3 | Date: Thu, 5 Oct 2017 14:54:17 +0300 |
4 | Subject: [PATCH] Disable libseccomp (sycall filtering mechanism) | 4 | Subject: [PATCH] Disable libseccomp (sycall filtering mechanism) |
@@ -7,32 +7,39 @@ Upstream forgot to make it optional, and it is not currently used in Yocto | |||
7 | 7 | ||
8 | Upstream-Status: Inappropriate [oe-core specific] | 8 | Upstream-Status: Inappropriate [oe-core specific] |
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
10 | |||
10 | --- | 11 | --- |
11 | configure.ac | 11 ----------- | 12 | configure.ac | 20 -------------------- |
12 | 1 file changed, 11 deletions(-) | 13 | 1 file changed, 20 deletions(-) |
13 | 14 | ||
14 | diff --git a/configure.ac b/configure.ac | 15 | diff --git a/configure.ac b/configure.ac |
15 | index 86bcf1f..8911f19 100644 | 16 | index 118d04f..47c8894 100644 |
16 | --- a/configure.ac | 17 | --- a/configure.ac |
17 | +++ b/configure.ac | 18 | +++ b/configure.ac |
18 | @@ -157,17 +157,6 @@ else | 19 | @@ -151,26 +151,6 @@ fi |
19 | fi | ||
20 | 20 | ||
21 | SECCOMP_PKG="" | 21 | SECCOMP_PKG="" |
22 | enable_seccomp="no" | ||
22 | -dnl Check for bubblewrap compatible platform | 23 | -dnl Check for bubblewrap compatible platform |
23 | -case $host_os in | 24 | -case $host_os in |
24 | - linux*) | 25 | - linux*) |
25 | - PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp]) | 26 | - case $host_cpu in |
26 | - SECCOMP_PKG="libseccomp" | 27 | - alpha|ia64|m68k|sh4|sparc64) |
28 | - enable_seccomp="no (not available on this architecture)" | ||
29 | - AC_MSG_WARN("seccomp not available on this architecture") | ||
30 | - ;; | ||
31 | - *) | ||
32 | - PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp]) | ||
33 | - SECCOMP_PKG="libseccomp" | ||
34 | - AC_DEFINE([ENABLE_SECCOMP], [1], [Define if using seccomp]) | ||
35 | - enable_seccomp="yes" | ||
36 | - ;; | ||
37 | - esac | ||
27 | - AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define to include GNU extensions]) | 38 | - AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define to include GNU extensions]) |
28 | - AC_DEFINE_UNQUOTED(HAVE_BWRAP, 1, [Define to 1 if Bubblewrap support is available]) | 39 | - AC_DEFINE_UNQUOTED(HAVE_BWRAP, 1, [Define to 1 if Bubblewrap support is available]) |
29 | - AC_DEFINE([ENABLE_SECCOMP], [1], [Define if using seccomp]) | ||
30 | - AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "$prefix", [Path to library install prefix]) | 40 | - AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "$prefix", [Path to library install prefix]) |
31 | - ;; | 41 | - ;; |
32 | -esac | 42 | -esac |
33 | 43 | ||
34 | dnl pkg-config dependency checks | 44 | dnl pkg-config dependency checks |
35 | 45 | ||
36 | -- | ||
37 | 2.14.1 | ||
38 | |||
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch deleted file mode 100644 index e95393c6b5..0000000000 --- a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 834bc861921fe0361f2d6a5b5716fc97a9519478 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Thu, 6 Jul 2017 13:13:45 +0300 | ||
4 | Subject: [PATCH] configure.ac: Remove gnome-common macro calls | ||
5 | |||
6 | gnome-common is deprecated and these aren't doing much for us. | ||
7 | |||
8 | Upstreamable fix would probably involve using autoconf-archive: | ||
9 | Trying to avoid that dependency for now. | ||
10 | |||
11 | Upstream-Status: Inappropriate | ||
12 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
13 | --- | ||
14 | configure.ac | 3 --- | ||
15 | 1 file changed, 3 deletions(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 7adcf0e..bb7659d 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -71,9 +71,6 @@ AC_SUBST(GNOME_DATE) | ||
22 | AC_SUBST(GNOME_DATE_COMMENT_START) | ||
23 | AC_SUBST(GNOME_DATE_COMMENT_END) | ||
24 | |||
25 | -GNOME_COMPILE_WARNINGS([maximum]) | ||
26 | -GNOME_MAINTAINER_MODE_DEFINES | ||
27 | - | ||
28 | AC_ARG_ENABLE(deprecation_flags, | ||
29 | [AC_HELP_STRING([--enable-deprecation-flags], | ||
30 | [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],, | ||
31 | -- | ||
32 | 2.1.4 | ||
33 | |||