The package rpms/criu.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/criu.git/commit/?id=22c4e6e9b2a18....
Change:
+ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
Thanks.
Full change:
============
commit 55994a603c019c2ec96cbd17effbb42a117c753f
Author: Adrian Reber <adrian(a)lisas.de>
Date: Thu Oct 26 17:53:42 2017 +0200
Update to 3.6
diff --git a/.gitignore b/.gitignore
index ef77a54..b46d49a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@
/criu-3.3.tar.bz2
/criu-3.4.tar.bz2
/criu-3.5.tar.bz2
+/criu-3.6.tar.bz2
diff --git a/criu.spec b/criu.spec
index 59534f1..58a09dd 100644
--- a/criu.spec
+++ b/criu.spec
@@ -5,8 +5,8 @@
%endif
Name: criu
-Version: 3.5
-Release: 5%{?dist}
+Version: 3.6
+Release: 1%{?dist}
Provides: crtools = %{version}-%{release}
Obsoletes: crtools <= 1.0-2
Summary: Tool for Checkpoint/Restore in User-space
@@ -14,8 +14,6 @@ Group: System Environment/Base
License: GPLv2
URL:
http://criu.org/
Source0:
http://download.openvz.org/criu/criu-%{version}.tar.bz2
-Patch0: 0001-fix-building-on-newest-glibc-and-kernel.patch
-Patch1: 36f3ab45867338e98e43ea5f1f26764ae3946fc2.patch
%if ! 0%{?fedora}
BuildRequires: perl
@@ -83,8 +81,6 @@ their content in human-readable form.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%if 0%{?rhel}
%patch100 -p1
@@ -154,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT%{_libexecdir}/%{name}
%changelog
+* Thu Oct 26 2017 Adrian Reber <adrian(a)lisas.de> - 3.6-1
+- Update to 3.6
+
* Wed Oct 18 2017 Adrian Reber <adrian(a)lisas.de> - 3.5-5
- Added patch to fix build on Fedora rawhide aarch64
diff --git a/sources b/sources
index 92de5fa..17deb49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (criu-3.5.tar.bz2) =
2f2bd3e04ba3412fdfa215c8ac4d47f286f07b45f8ef7b609ce8ca8953036fcc6bfac3a5c68cdde9190723c35005bbf1bf4e67742f628917b766d4cb13cd29b0
+SHA512 (criu-3.6.tar.bz2) =
5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586
commit d179db5c6c663727220d4ed29ce3dad53d93e0c0
Author: Adrian Reber <adrian(a)lisas.de>
Date: Wed Oct 18 21:44:01 2017 +0200
Added patch to fix build on Fedora rawhide aarch64
Merge back some RHEL changes
diff --git a/36f3ab45867338e98e43ea5f1f26764ae3946fc2.patch
b/36f3ab45867338e98e43ea5f1f26764ae3946fc2.patch
new file mode 100644
index 0000000..0c7c579
--- /dev/null
+++ b/36f3ab45867338e98e43ea5f1f26764ae3946fc2.patch
@@ -0,0 +1,44 @@
+From 36f3ab45867338e98e43ea5f1f26764ae3946fc2 Mon Sep 17 00:00:00 2001
+From: Andrei Vagin <avagin(a)virtuozzo.com>
+Date: Tue, 17 Oct 2017 22:22:57 +0300
+Subject: [PATCH] fedora aarch64
+
+Signed-off-by: Andrei Vagin <avagin(a)virtuozzo.com>
+---
+ .travis.yml | 2 ++
+ compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h | 14 +++++++++++++-
+ scripts/build/Dockerfile.fedora-rawhide-aarch64.hdr | 3 +++
+ scripts/build/Dockerfile.fedora-rawhide-aarch64.tmpl | 1 +
+ scripts/build/Makefile | 4 +---
+ 5 files changed, 20 insertions(+), 4 deletions(-)
+ create mode 100644 scripts/build/Dockerfile.fedora-rawhide-aarch64.hdr
+ create mode 120000 scripts/build/Dockerfile.fedora-rawhide-aarch64.tmpl
+
+diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
+index 22246b8fa..ad6b218b9 100644
+--- a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
++++ b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
+@@ -41,10 +41,22 @@ struct rt_sigframe {
+ : "r"(new_sp) \
+ : "sp", "x8", "memory")
+
++struct cr_sigcontext {
++ __u64 fault_address;
++ /* AArch64 registers */
++ __u64 regs[31];
++ __u64 sp;
++ __u64 pc;
++ __u64 pstate;
++ /* 4K reserved for FP/SIMD state and future expansion */
++ __u8 __reserved[4096] __attribute__((__aligned__(16)));
++};
++
+ #define RT_SIGFRAME_UC(rt_sigframe) (&rt_sigframe->uc)
+ #define RT_SIGFRAME_REGIP(rt_sigframe) ((long unsigned
int)(rt_sigframe)->uc.uc_mcontext.pc)
+ #define RT_SIGFRAME_HAS_FPU(rt_sigframe) (1)
+-#define RT_SIGFRAME_AUX_CONTEXT(rt_sigframe) ((struct
aux_context*)&(rt_sigframe)->uc.uc_mcontext.__reserved)
++#define RT_SIGFRAME_SIGCONTEXT(rt_sigframe) ((struct cr_sigcontext
*)&(rt_sigframe)->uc.uc_mcontext)
++#define RT_SIGFRAME_AUX_CONTEXT(rt_sigframe) ((struct
aux_context*)&(RT_SIGFRAME_SIGCONTEXT(rt_sigframe)->__reserved))
+ #define
RT_SIGFRAME_FPU(rt_sigframe) (&RT_SIGFRAME_AUX_CONTEXT(rt_sigframe)->fpsimd)
+ #define RT_SIGFRAME_OFFSET(rt_sigframe) 0
+
diff --git a/criu.spec b/criu.spec
index ed32ca8..59534f1 100644
--- a/criu.spec
+++ b/criu.spec
@@ -6,7 +6,7 @@
Name: criu
Version: 3.5
-Release: 2%{?dist}
+Release: 5%{?dist}
Provides: crtools = %{version}-%{release}
Obsoletes: crtools <= 1.0-2
Summary: Tool for Checkpoint/Restore in User-space
@@ -15,10 +15,11 @@ License: GPLv2
URL:
http://criu.org/
Source0:
http://download.openvz.org/criu/criu-%{version}.tar.bz2
Patch0: 0001-fix-building-on-newest-glibc-and-kernel.patch
+Patch1: 36f3ab45867338e98e43ea5f1f26764ae3946fc2.patch
%if ! 0%{?fedora}
BuildRequires: perl
-# RHEL has no asciidoc; take man-page from Fedora 24
+# RHEL has no asciidoc; take man-page from Fedora 26
# zcat /usr/share/man/man8/criu.8.gz > criu.8
Source1: criu.8
Source2: crit.1
@@ -83,6 +84,7 @@ their content in human-readable form.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%if 0%{?rhel}
%patch100 -p1
@@ -152,6 +154,15 @@ rm -rf $RPM_BUILD_ROOT%{_libexecdir}/%{name}
%changelog
+* Wed Oct 18 2017 Adrian Reber <adrian(a)lisas.de> - 3.5-5
+- Added patch to fix build on Fedora rawhide aarch64
+
+* Tue Oct 10 2017 Adrian Reber <areber(a)redhat.com> - 3.5-4
+- Upgrade imported manpages to 3.5
+
+* Mon Oct 09 2017 Adrian Reber <areber(a)redhat.com> - 3.5-3
+- Fix ExclusiveArch on RHEL
+
* Mon Oct 02 2017 Adrian Reber <adrian(a)lisas.de> - 3.5-2
- Merge RHEL and Fedora spec file
commit 6999954b12457f71a5b6294755f89e2d73219835
Author: Adrian Reber <adrian(a)lisas.de>
Date: Mon Oct 2 16:24:44 2017 +0200
remove unused patches
diff --git a/0001-compel-aarch64-glibc-renamed-ucontext-to-ucontext_t.patch
b/0001-compel-aarch64-glibc-renamed-ucontext-to-ucontext_t.patch
deleted file mode 100644
index 65599d2..0000000
--- a/0001-compel-aarch64-glibc-renamed-ucontext-to-ucontext_t.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b0de9a656116e8f596c1c6d7f9bb4038eee6fb6b Mon Sep 17 00:00:00 2001
-From: Adrian Reber <areber(a)redhat.com>
-Date: Thu, 20 Jul 2017 02:57:08 -0400
-Subject: [PATCH 1/4] compel/aarch64: glibc renamed ucontext to ucontext_t
-
-The upcoming glibc release renamed 'struct ucontext' to
-'struct ucontext_t':
-
-https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=251287734e89a52da3db682a8241eb6bccc050c9;hp=c86ed71d633c22d6f638576f7660c52a5f783d66
-
-Instead of using 'struct ucontext' this patch changes it
-to the typedef ucontext_t which already exists in older and
-new versions of glibc.
-
-Signed-off-by: Adrian Reber <areber(a)redhat.com>
----
- compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
-index c890d103..22246b8f 100644
---- a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
-+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
-@@ -27,7 +27,7 @@ struct aux_context {
-
- struct rt_sigframe {
- siginfo_t info;
-- struct ucontext uc;
-+ ucontext_t uc;
- uint64_t fp;
- uint64_t lr;
- };
---
-2.13.2
-
diff --git a/0003-compel-ppc64-glibc-renamed-ucontext-to-ucontext_t.patch
b/0003-compel-ppc64-glibc-renamed-ucontext-to-ucontext_t.patch
deleted file mode 100644
index e5a54d9..0000000
--- a/0003-compel-ppc64-glibc-renamed-ucontext-to-ucontext_t.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From a2bac7a99fd62c8f7f2fae6d7d85677c5e1607c7 Mon Sep 17 00:00:00 2001
-From: Adrian Reber <areber(a)redhat.com>
-Date: Thu, 20 Jul 2017 11:33:48 -0400
-Subject: [PATCH 3/4] compel/ppc64: glibc renamed ucontext to ucontext_t
-
-The upcoming glibc release renamed 'struct ucontext' to
-'struct ucontext_t':
-
-https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=251287734e89a52da3db682a8241eb6bccc050c9;hp=c86ed71d633c22d6f638576f7660c52a5f783d66
-
-Instead of using 'struct ucontext' this patch changes it
-to the typedef ucontext_t which already exists in older and
-new versions of glibc.
-
-Signed-off-by: Adrian Reber <areber(a)redhat.com>
----
- compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h | 6 +++---
- criu/arch/ppc64/crtools.c | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
b/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
-index bfaee878..6f8b6ec5 100644
---- a/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
-+++ b/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
-@@ -28,12 +28,12 @@
- #define TRAMP_SIZE 6
-
- /*
-- * ucontext defined in /usr/include/powerpc64le-linux-gnu/sys/ucontext.h
-+ * ucontext_t defined in /usr/include/powerpc64le-linux-gnu/sys/ucontext.h
- */
- struct rt_sigframe {
- /* sys_rt_sigreturn requires the ucontext be the first field */
-- struct ucontext uc;
-- struct ucontext uc_transact; /* Transactional state */
-+ ucontext_t uc;
-+ ucontext_t uc_transact; /* Transactional state */
- unsigned long _unused[2];
- unsigned int tramp[TRAMP_SIZE];
- struct rt_siginfo *pinfo;
-diff --git a/criu/arch/ppc64/crtools.c b/criu/arch/ppc64/crtools.c
-index ecda5ce9..5a5966ad 100644
---- a/criu/arch/ppc64/crtools.c
-+++ b/criu/arch/ppc64/crtools.c
-@@ -259,7 +259,7 @@ static int put_tm_regs(struct rt_sigframe *f, UserPpc64TmRegsEntry
*tme)
- * For the case of getting a signal and simply returning from it,
- * we don't need to re-copy them here.
- */
-- struct ucontext *tm_uc = &f->uc_transact;
-+ ucontext_t *tm_uc = &f->uc_transact;
-
- pr_debug("Restoring TM registers FP:%d VR:%d VSX:%d\n",
- !!(tme->fpstate), !!(tme->vrstate), !!(tme->vsxstate));
---
-2.13.2
-
commit 52f8897697bf7e5999c4048cfcfeec68c6b7e5d9
Author: Adrian Reber <adrian(a)lisas.de>
Date: Mon Oct 2 15:06:52 2017 +0200
one more fix for not Fedora
diff --git a/criu.spec b/criu.spec
index e514ec2..ed32ca8 100644
--- a/criu.spec
+++ b/criu.spec
@@ -101,7 +101,7 @@ make docs V=1
make install-criu DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}
make install-lib DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}
%if 0%{?fedora}
-# ony install documentation on Fedora as it requires asciidoc,
+# only install documentation on Fedora as it requires asciidoc,
# which is not available on RHEL7
make install-man DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}
%else
@@ -118,6 +118,7 @@ install -d -m 0755 %{buildroot}/run/%{name}/
rm -rf $RPM_BUILD_ROOT%{_includedir}/criu
rm $RPM_BUILD_ROOT%{_libdir}/*.so*
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+rm -rf $RPM_BUILD_ROOT%{_libexecdir}/%{name}
%endif
%post -p /sbin/ldconfig
commit a7e95eda93bc1b43637a4cfad278e76ed7936891
Author: Adrian Reber <adrian(a)lisas.de>
Date: Mon Oct 2 14:39:58 2017 +0200
fix perl BR on Fedora and RHEL
diff --git a/criu.spec b/criu.spec
index 5664bbb..e514ec2 100644
--- a/criu.spec
+++ b/criu.spec
@@ -17,6 +17,7 @@ Source0:
http://download.openvz.org/criu/criu-%{version}.tar.bz2
Patch0: 0001-fix-building-on-newest-glibc-and-kernel.patch
%if ! 0%{?fedora}
+BuildRequires: perl
# RHEL has no asciidoc; take man-page from Fedora 24
# zcat /usr/share/man/man8/criu.8.gz > criu.8
Source1: criu.8
@@ -31,9 +32,9 @@ Source3: criu-tmpfiles.conf
BuildRequires: systemd
BuildRequires: libnet-devel
BuildRequires: protobuf-devel protobuf-c-devel python2-devel libnl3-devel libcap-devel
-BuildRequires: perl-interpreter
%if 0%{?fedora}
BuildRequires: asciidoc xmlto
+BuildRequires: perl-interpreter
%endif
# user-space and kernel changes are only available for x86_64, arm,
commit 22c4e6e9b2a18188e54d4d374094a1ae11970f05
Author: Adrian Reber <adrian(a)lisas.de>
Date: Mon Oct 2 14:26:50 2017 +0200
Merge RHEL and Fedora spec file
diff --git a/criu.spec b/criu.spec
index d7f4974..5664bbb 100644
--- a/criu.spec
+++ b/criu.spec
@@ -6,7 +6,7 @@
Name: criu
Version: 3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Provides: crtools = %{version}-%{release}
Obsoletes: crtools <= 1.0-2
Summary: Tool for Checkpoint/Restore in User-space
@@ -16,11 +16,14 @@ URL:
http://criu.org/
Source0:
http://download.openvz.org/criu/criu-%{version}.tar.bz2
Patch0: 0001-fix-building-on-newest-glibc-and-kernel.patch
-%if 0%{?rhel}
+%if ! 0%{?fedora}
# RHEL has no asciidoc; take man-page from Fedora 24
# zcat /usr/share/man/man8/criu.8.gz > criu.8
Source1: criu.8
Source2: crit.1
+# The patch aio-fix.patch is needed as RHEL7
+# doesn't do "nr_events *= 2" in ioctx_alloc().
+Patch100: aio-fix.patch
%endif
Source3: criu-tmpfiles.conf
@@ -36,11 +39,11 @@ BuildRequires: asciidoc xmlto
# user-space and kernel changes are only available for x86_64, arm,
# ppc64le, aarch64 and s390x
#
https://bugzilla.redhat.com/show_bug.cgi?id=902875
-%if 0%{?fedora} > 26
-ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
-%else
-# kernel support for s390x was only enabled for > f26
+%if 0%{?fedora} < 27
ExclusiveArch: x86_64 %{arm} ppc64le aarch64
+%else
+# kernel support for s390x was only enabled for >= f27
+ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
%endif
%description
@@ -80,6 +83,10 @@ their content in human-readable form.
%setup -q
%patch0 -p1
+%if 0%{?rhel}
+%patch100 -p1
+%endif
+
%build
# %{?_smp_mflags} does not work
# -fstack-protector breaks build
@@ -105,7 +112,7 @@ mkdir -p %{buildroot}%{_tmpfilesdir}
install -m 0644 %{SOURCE3} %{buildroot}%{_tmpfilesdir}/%{name}.conf
install -d -m 0755 %{buildroot}/run/%{name}/
-%if 0%{?rhel}
+%if ! 0%{?fedora}
# remove devel package
rm -rf $RPM_BUILD_ROOT%{_includedir}/criu
rm $RPM_BUILD_ROOT%{_libdir}/*.so*
@@ -143,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%changelog
+* Mon Oct 02 2017 Adrian Reber <adrian(a)lisas.de> - 3.5-2
+- Merge RHEL and Fedora spec file
+
* Thu Sep 28 2017 Adrian Reber <adrian(a)lisas.de> - 3.5-1
- Update to 3.5 (#1496614)