Update to 2.11.1

This commit is contained in:
Adrian Reber 2017-02-17 22:19:27 +01:00
parent 73b6b6d84e
commit b4e64d30b4
4 changed files with 6 additions and 37 deletions

1
.gitignore vendored
View File

@ -30,3 +30,4 @@
/criu-2.9.tar.bz2
/criu-2.10.tar.bz2
/criu-2.11.tar.bz2
/criu-2.11.1.tar.bz2

View File

@ -1,5 +1,5 @@
Name: criu
Version: 2.11
Version: 2.11.1
Release: 1%{?dist}
Provides: crtools = %{version}-%{release}
Obsoletes: crtools <= 1.0-2
@ -8,7 +8,6 @@ Group: System Environment/Base
License: GPLv2
URL: http://criu.org/
Source0: http://download.openvz.org/criu/criu-%{version}.tar.bz2
Patch0: fix-clobber-list-item.patch
%if 0%{?rhel}
# RHEL has no asciidoc; take man-page from Fedora 24
@ -68,7 +67,6 @@ their content in human-readable form.
%prep
%setup -q
%patch0 -p1
%build
# %{?_smp_mflags} does not work
@ -126,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%changelog
* Fri Feb 17 2017 Adrian Reber <adrian@lisas.de> - 2.11.1-1
- Update to 2.11.1
* Thu Feb 16 2017 Adrian Reber <adrian@lisas.de> - 2.11-1
- Update to 2.11

View File

@ -1,33 +0,0 @@
The JUMP_TO_RESTORER_BLOB assembly macro has been rewrote through the
commit '89d6b39cfe36 ppc64: pie -- Add ppc64le relocation's
processing', but the Clobber list hasn't been updated.
This doesn't generate build neither runtime errors since the Clobber
list was larger than needed but GCC 7 is now raising an error when an
assembly macro is clobbering the r2 register.
This patch fix the Clobber list to just modified registers.
Fixes: 89d6b39cfe36 ("ppc64: pie -- Add ppc64le relocation's processing")
Reported-by: Adrian Reber <adrian@lisas.de>
Signed-off-by: Laurent Dufour <ldufour@linux.vnet.ibm.com>
---
criu/arch/ppc64/include/asm/restore.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/criu/arch/ppc64/include/asm/restore.h b/criu/arch/ppc64/include/asm/restore.h
index bac7bb566abb..8d4516090c65 100644
--- a/criu/arch/ppc64/include/asm/restore.h
+++ b/criu/arch/ppc64/include/asm/restore.h
@@ -21,7 +21,7 @@
: "r"(new_sp), \
"r"((unsigned long)restore_task_exec_start), \
"r"(task_args) \
- : "r1", "1", "2", "3", "12", "memory")
+ : "1", "3", "12")
/* There is nothing to do since TLS is accessed through r13 */
#define core_get_tls(pcore, ptls)
--
2.7.4

View File

@ -1 +1 @@
SHA512 (criu-2.11.tar.bz2) = fba02203c95841909e3d7178b09dd6075fff1e9913ad12ac2aca43aef6e6565fc4f822a5a0dcb3cb146d15c57f0a9c17d6e645375aa3922f93108dfb2477f867
SHA512 (criu-2.11.1.tar.bz2) = 2f4a8d19bda1a73ac2f769c327af5aba5903d28547d46361e5124c9a81c76d0cd73c03180aefabdcb9511f0523f982ec99e2657b6ff46b92ac655ede9fdffd97