Compare commits

...

2 Commits

Author SHA1 Message Date
f970dd7503
Merge remote-tracking branch 'up/f29' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
2018-08-26 21:24:37 +03:00
6856047d81
Disable seccomp on RISC-V (riscv64)
Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
2018-08-11 18:09:59 +03:00
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/configure.ac b/configure.ac
index 6c8194a..5e906db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,7 +155,7 @@ dnl Check for bubblewrap compatible platform
case $host_os in
linux*)
case $host_cpu in
- alpha|ia64|m68k|sh4|sparc64)
+ alpha|ia64|m68k|sh4|sparc64|riscv64)
enable_seccomp="no (not available on this architecture)"
AC_MSG_WARN("seccomp not available on this architecture")
;;

View File

@ -7,13 +7,16 @@
Name: gnome-desktop3
Version: 3.29.90.1
Release: 1%{?dist}
Release: 1.0.riscv64%{?dist}
Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
License: GPLv2+ and LGPLv2+
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/3.29/gnome-desktop-%{version}.tar.xz
# Seccomp support is missing in RISC-V (riscv64) kernel
Patch0: gnome-desktop-3.28.2-disable-riscv64-seccomp.patch
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= %{gdk_pixbuf2_version}
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@ -21,7 +24,9 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version}
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
BuildRequires: pkgconfig(iso-codes)
%ifnarch riscv64
BuildRequires: pkgconfig(libseccomp)
%endif
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(xkeyboard-config)
BuildRequires: gettext
@ -29,6 +34,13 @@ BuildRequires: gtk-doc >= %{gtk_doc_version}
BuildRequires: intltool
BuildRequires: itstool
# Needed to re-gen configure scripts on RISC-V (riscv6)
BuildRequires: autoconf-archive
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: yelp-tools
Requires: bubblewrap
Requires: gdk-pixbuf2%{?_isa} >= %{gdk_pixbuf2_version}
Requires: glib2%{?_isa} >= %{glib2_version}
@ -73,6 +85,9 @@ the functionality of the installed %{name} package.
%autosetup -p1 -n gnome-desktop-%{version}
%build
# We modified configure.ac to drop seccomp on RISC-V (riscv64)
autoreconf -fiv
%configure --enable-installed-tests
make %{?_smp_mflags}
@ -107,6 +122,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_datadir}/installed-tests
%changelog
* Sun Aug 26 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 3.29.90.1-1.0.riscv64
- Disable seccomp on RISC-V (riscv64)
* Sun Aug 12 2018 Kalev Lember <klember@redhat.com> - 3.29.90.1-1
- Update to 3.29.90.1