diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-03-03 23:14:07 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-03-04 10:41:27 -0800 |
commit | 049db79869ac345f4450956790e9fa18405b7558 (patch) | |
tree | a47a8c77399277b519e49797150b22fdb6f3505a | |
parent | 722f52981add6cd1a11bedf575cedb0a6e795c5b (diff) | |
download | meta-openembedded-049db79869ac345f4450956790e9fa18405b7558.tar.gz |
gnome-desktop: Make seccomp dependency optional for rv32
rv32 support in libseccomp is not yet upstream, therefore add rv32 to
seccomp unsupported architectures
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch | 29 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_43.bb | 5 |
2 files changed, 33 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch new file mode 100644 index 000000000..65e06dafc --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 6937685426aff8059b68b2941a0fe549eca21ce5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 3 Mar 2023 23:04:56 -0800 | ||
4 | Subject: [PATCH] meson: Add riscv32 to seccomp unsupported list | ||
5 | |||
6 | rv32 needs to upstream the libseccomp support | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | meson.build | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/meson.build b/meson.build | ||
15 | index 6a888b8..a87c419 100644 | ||
16 | --- a/meson.build | ||
17 | +++ b/meson.build | ||
18 | @@ -65,7 +65,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) | ||
19 | host_os = host_machine.system() | ||
20 | host_cpu = host_machine.cpu() | ||
21 | supported_os = ['linux'] | ||
22 | -unsupported_cpus = ['alpha', 'ia64', 'm68k', 'sh4', 'sparc', 'sparc64'] | ||
23 | +unsupported_cpus = ['alpha', 'ia64', 'm68k', 'riscv32', 'sh4', 'sparc', 'sparc64'] | ||
24 | if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu) | ||
25 | seccomp_dep = dependency('libseccomp') | ||
26 | else | ||
27 | -- | ||
28 | 2.39.2 | ||
29 | |||
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_43.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_43.bb index 7695056ea..254551884 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_43.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_43.bb | |||
@@ -16,7 +16,8 @@ REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" | |||
16 | 16 | ||
17 | GIR_MESON_OPTION = "" | 17 | GIR_MESON_OPTION = "" |
18 | 18 | ||
19 | SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch" | 19 | SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ |
20 | file://0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch" | ||
20 | SRC_URI[archive.sha256sum] = "3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69" | 21 | SRC_URI[archive.sha256sum] = "3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69" |
21 | 22 | ||
22 | DEPENDS += " \ | 23 | DEPENDS += " \ |
@@ -34,6 +35,8 @@ DEPENDS += " \ | |||
34 | xrandr \ | 35 | xrandr \ |
35 | " | 36 | " |
36 | 37 | ||
38 | DEPENDS:remove:riscv32 = "libseccomp" | ||
39 | |||
37 | GTKDOC_MESON_OPTION = "gtk_doc" | 40 | GTKDOC_MESON_OPTION = "gtk_doc" |
38 | EXTRA_OEMESON = "-Ddesktop_docs=false" | 41 | EXTRA_OEMESON = "-Ddesktop_docs=false" |
39 | 42 | ||