From 21a016a4e8a89819c6f5903e93ee5035d64d3110 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 11 Dec 2012 12:39:47 +0400 Subject: [PATCH 1/5] fix #878416 - build OpenVZ in secondary architectures. The minor update from vzctl-4.1 to vzctl-4.1.1 fixes this. Since it is a minor realease, let's just update instead of carrying the patch --- vzctl.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vzctl.spec b/vzctl.spec index 09744dd..de3ac6c 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -23,8 +23,8 @@ Summary: OpenVZ containers control utility Name: vzctl -Version: 4.1 -%define rel 2 +Version: 4.1.1 +%define rel 3 Release: %{rel}%{?dist} License: GPLv2+ Group: System Environment/Kernel @@ -192,6 +192,10 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/ %changelog +* Tue Dec 11 2012 Glauber Costa - 4.1.1-3 +- Build on all architectures, fixes #878416. OpenVZ 4.1.1 handles + that, so we don't need to carry a patch. + * Thu Nov 15 2012 Glauber Costa - 4.1-2 - Corrected license: GPLv2 -> GPLv2+, which is what the sources actually claim - Fixed ownership problems with directories _vzdir/template/ and /var/lib/vzctl/ From c9d7338f853846fb05d1d68c2d0bc307dca1028f Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 11 Dec 2012 12:59:48 +0400 Subject: [PATCH 2/5] commiting to sources file for #878416 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a649984..131d946 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /vzctl-4.1.tar.bz2 +/vzctl-4.1.1.tar.bz2 diff --git a/sources b/sources index e438714..8edbabe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6cb0072890fa30864586b6033b640441 vzctl-4.1.tar.bz2 +1b22d7213c1dbe02f897b7e0b529edc5 vzctl-4.1.1.tar.bz2 From afdb9e4fe801f338ded09984ce56ea036de8c154 Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Fri, 7 Jun 2013 02:00:31 +0400 Subject: [PATCH 3/5] Fix compilation on architectures without support for VZ (rhbz 971821) Signed-off-by: Andrey Vagin --- ...on-architectures-without-support-for.patch | 29 +++++++++++++++++++ vzctl.spec | 7 ++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-compilation-on-architectures-without-support-for.patch diff --git a/0001-Fix-compilation-on-architectures-without-support-for.patch b/0001-Fix-compilation-on-architectures-without-support-for.patch new file mode 100644 index 0000000..271e8d2 --- /dev/null +++ b/0001-Fix-compilation-on-architectures-without-support-for.patch @@ -0,0 +1,29 @@ +From b2a4926e26ca7f0dd644485e137068a4310a2cd5 Mon Sep 17 00:00:00 2001 +From: Andrey Vagin +Date: Fri, 7 Jun 2013 01:23:02 +0400 +Subject: [PATCH] Fix compilation on architectures without support for VZ + +https://bugzilla.redhat.com/show_bug.cgi?id=971821 + +Signed-off-by: Andrey Vagin +--- + src/lib/cpt.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/lib/cpt.c b/src/lib/cpt.c +index d4fb7c0..01649ec 100644 +--- a/src/lib/cpt.c ++++ b/src/lib/cpt.c +@@ -39,6 +39,9 @@ + #include "logger.h" + #include "util.h" + ++extern void clean_hardlink_dir(const char *mntdir) __attribute__((weak)); ++void clean_hardlink_dir(const char *mntdir) {} ++ + int cpt_cmd(vps_handler *h, envid_t veid, const char *root, + int action, int cmd, unsigned int ctx) + { +-- +1.8.2 + diff --git a/vzctl.spec b/vzctl.spec index f476ff3..bbfcee8 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,12 +25,13 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.3.1 -%define rel 2 +%define rel 3 Release: %{rel}%{?dist} License: GPLv2+ Group: System Environment/Kernel Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 Patch0: 0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch +Patch1: 0001-Fix-compilation-on-architectures-without-support-for.patch URL: http://openvz.org/ # OpenVZ can run on its own kernel, and if that it is the case, some more @@ -64,6 +65,7 @@ i.e. create, start, shutdown, set various options and limits etc. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build CFLAGS="$RPM_OPT_FLAGS" %configure \ @@ -206,6 +208,9 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/ %changelog +* Fri Jun 7 2013 Andrey Vagin - 4.3.1-3 +- Fix compilation on architectures without support for VZ (rhbz 971821) + * Thu Jun 6 2013 Andrey Vagin - 4.3.1-2 - Include missing dependency for gnugpg. From db4d39d6c15f3e18aae5098910ba211a935aa092 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 23 Jul 2013 15:00:36 +0400 Subject: [PATCH 4/5] crtools requirements only for x86_64 arch Signed-off-by: Igor Gnatenko Signed-off-by: Andrey Vagin --- vzctl.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index 5e48449..3d9d058 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -24,7 +24,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.4 -%define rel 1 +%define rel 2 Release: %{rel}%{?dist} License: GPLv2+ Group: System Environment/Kernel @@ -40,7 +40,9 @@ Summary: OpenVZ containers control utility core Group: System Environment/Kernel Requires: fileutils Requires: tar +%ifarch x86_64 Requires: crtools +%endif # these reqs are for vz helper scripts Requires: gawk Requires: sed @@ -205,6 +207,9 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Tue Jul 23 2013 Igor Gnatenko - 4.4-2 +- crtools requirements only for x86_64 arch (wiki page with known issues updated) + * Fri Jul 19 2013 Igor Gnatenko - 4.4-1 - Update to 4.4 ( changelog: http://openvz.org/Download/vzctl/4.4/changes ) - fix spec: macros instead of bash variables From 61d87c9c1a4d734f13148bbbcb6b43024604e34b Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Mon, 5 Aug 2013 21:45:19 +0400 Subject: [PATCH 5/5] Remove crtools from dependencies crtools appeared in FC19 (rhbz 992199) --- vzctl.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vzctl.spec b/vzctl.spec index 3d9d058..492ecb3 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -24,7 +24,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.4 -%define rel 2 +%define rel 3 Release: %{rel}%{?dist} License: GPLv2+ Group: System Environment/Kernel @@ -40,9 +40,6 @@ Summary: OpenVZ containers control utility core Group: System Environment/Kernel Requires: fileutils Requires: tar -%ifarch x86_64 -Requires: crtools -%endif # these reqs are for vz helper scripts Requires: gawk Requires: sed @@ -207,6 +204,9 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Mon Aug 5 2013 Andrey Vagin - 4.4-3 +- remove crtools from dependencies (rhbz 992199) + * Tue Jul 23 2013 Igor Gnatenko - 4.4-2 - crtools requirements only for x86_64 arch (wiki page with known issues updated)