From d3a3b5530fb5cc225f88b99fe5eb43a022ea6244 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Apr 04 2018 15:19:36 +0000 Subject: update to remove patch0 for el7a/armhfp kernels --- diff --git a/SPECS/criu.spec b/SPECS/criu.spec index 4c8e29c..eaff0b5 100644 --- a/SPECS/criu.spec +++ b/SPECS/criu.spec @@ -10,7 +10,7 @@ URL: http://criu.org/ Source0: http://download.openvz.org/criu/criu-%{version}.tar.bz2 # The patch aio-fix.patch is needed as RHEL7 # doesn't do "nr_events *= 2" in ioctx_alloc(). -Patch0: aio-fix.patch +#Patch0: aio-fix.patch Patch1: 0001-kerndat-Detect-if-we-have-guard-page-mangle-in-procf.patch Patch2: 0002-mem-Don-t-assume-guard-page-is-returned-in-procfs-wi.patch Patch3: 0001-Fix-ppc64el-build-failure-by-not-redefining-AT_VECTO.patch @@ -76,7 +76,7 @@ their content in human-readable form. %prep %setup -q -%patch0 -p1 +# patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -141,6 +141,7 @@ rm -rf $RPM_BUILD_ROOT%{_libexecdir}/%{name} %changelog * Wed Apr 4 2018 Johnny Hughes - 2.12-4.0.1 - Roll in el7a patch and consolidate tree for arm32 and aarch64/ppc64le +- remove patch0 for el7a/armhfp kernels * Wed Apr 4 2018 Pablo Greco - 2.12-2 - Update to build on armhfp