[ovirt-engine/f17] Revert "Update to upstream 3.1.0 release"
Juan Hernandez
jhernand at fedoraproject.org
Sat Dec 29 17:29:49 UTC 2012
commit 5ca15517e597d6897ee2a425e204fd390bf9b6d4
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date: Sat Dec 29 10:55:57 2012 +0100
Revert "Update to upstream 3.1.0 release"
This reverts commit 813236d43fccb8e1a6f679b738d29321614982ba.
.gitignore | 33 +------
...e-create-sysctl-config-if-it-doesnt-exist.patch | 42 --------
ovirt-engine-dont-modify-sysctl.patch | 100 ++++++++++++++++++++
ovirt-engine-fix-commons-classpath-building.patch | 92 ------------------
ovirt-engine.spec | 51 +++++------
sources | 2 +-
6 files changed, 126 insertions(+), 194 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c0dcf01..75ee4bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,31 +1,2 @@
-# ovirt-engine global ignore list
-###########################
-
-# mvn folders
-###########################
-target
-
-# build-time files
-###########################
-.metadata
-*.class
-*.swp
-*.iws
-
-# IDE files
-###########################
-.settings
-.project
-.classpath
-.factorypath
-.pmd
-*.ipr
-*.iml
-.idea
-
-# UI folders
-###########################
-/frontend/webadmin/modules/userportal-gwtp/gen
-/frontend/webadmin/modules/webadmin/gen
-/frontend/webadmin/modules/webadmin/war
-/ovirt-engine-3.1.0.tar.gz
+/ovirt-engine-3.0.0_0001.tar.gz
+/ovirt-engine-3.1.0.tar.xz
diff --git a/ovirt-engine-dont-modify-sysctl.patch b/ovirt-engine-dont-modify-sysctl.patch
new file mode 100644
index 0000000..56d974e
--- /dev/null
+++ b/ovirt-engine-dont-modify-sysctl.patch
@@ -0,0 +1,100 @@
+From 5ce9af877085c8c86bdd87d575c31035bc5de056 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Wed, 1 Aug 2012 16:07:59 +0200
+Subject: [PATCH] Don't try to modify /etc/sysctl.conf
+
+---
+ packaging/fedora/setup/basedefs.py | 3 ---
+ packaging/fedora/setup/engine-setup.py | 27 +--------------------------
+ packaging/fedora/setup/output_messages.py | 2 --
+ 3 files changed, 1 insertion(+), 31 deletions(-)
+
+diff --git a/packaging/fedora/setup/basedefs.py b/packaging/fedora/setup/basedefs.py
+index 022dc4d..61e2b71 100644
+--- a/packaging/fedora/setup/basedefs.py
++++ b/packaging/fedora/setup/basedefs.py
+@@ -86,7 +86,6 @@ FILE_HTTPD_CONF="/etc/httpd/conf/httpd.conf"
+ FILE_VIRTIO_WIN_VFD="/usr/share/virtio-win/virtio-win.vfd"
+ FILE_VIRTIO_WIN_ISO="/usr/share/virtio-win/virtio-win.iso"
+ FILE_RHEV_GUEST_TOOLS_ISO="/usr/share/rhev-guest-tools-iso/rhev-tools-setup.iso"
+-FILE_SYSCTL="/etc/sysctl.conf"
+
+ EXEC_IPTABLES="/sbin/iptables"
+ EXEC_SLIMMING_PROFILE="%s/ovirt-engine/scripts/slimmingEAP51.sh" % DIR_USR_SHARE
+@@ -110,7 +109,6 @@ EXEC_PGRESTORE="/usr/bin/pg_restore"
+ EXEC_DROPDB="/usr/bin/dropdb"
+ EXEC_SHELL="/bin/sh"
+ EXEC_SSH_KEYGEN="/usr/bin/ssh-keygen"
+-EXEC_SYSCTL="/sbin/sysctl"
+ EXEC_SETSEBOOL="/usr/sbin/setsebool"
+ EXEC_SEMANAGE="/usr/sbin/semanage"
+
+@@ -131,7 +129,6 @@ CONST_ORG_NAME_SIZE_LIMIT=64
+ CONST_VDSM_UID = 36
+ CONST_KVM_GID = 36
+ CONST_MAX_PSQL_CONNS= 150
+-CONST_SHMMAX=35554432
+
+ # This is needed for avoiding error in create_ca when supporting max cn length of 64.
+ # please DONT increase this size, any value over 55 will fail the setup.
+diff --git a/packaging/fedora/setup/engine-setup.py b/packaging/fedora/setup/engine-setup.py
+index 8f80cb2..636ce76 100755
+--- a/packaging/fedora/setup/engine-setup.py
++++ b/packaging/fedora/setup/engine-setup.py
+@@ -95,9 +95,7 @@ def initSequences():
+ { 'description' : 'Initial Steps',
+ 'condition' : [],
+ 'condition_match' : [],
+- 'steps' : [ { 'title' : output_messages.INFO_CONFIG_OVIRT_ENGINE,
+- 'functions' : [setMaxSharedMemory] },
+- { 'title' : output_messages.INFO_CREATE_CA,
++ 'steps' : [ { 'title' : output_messages.INFO_CREATE_CA,
+ 'functions' : [_createCA]},
+ { 'title' : output_messages.INFO_UPD_JBOSS_CONF,
+ 'functions' : [configJbossXml, _editWebConf] },
+@@ -1566,29 +1564,6 @@ def _configNfsShare():
+ logging.error(traceback.format_exc())
+ raise Exception(output_messages.ERR_FAILED_CFG_NFS_SHARE)
+
+-def setMaxSharedMemory():
+- """
+- Check and verify that the kernel.shmmax kernel parameter is above 35mb
+- """
+- # First verify that kernel.shmmax is not set and is below the requested value.
+- logging.debug("loading %s", basedefs.FILE_SYSCTL)
+- txtHandler = utils.TextConfigFileHandler(basedefs.FILE_SYSCTL)
+- txtHandler.open()
+-
+- # Compare to basedefs.CONST_SHMMAX
+- currentShmmax = txtHandler.getParam("kernel.shmmax")
+- if currentShmmax and (int(currentShmmax) >= basedefs.CONST_SHMMAX):
+- logging.debug("current shared memory max in kernel is %s, there is no need to update the kernel parameters", currentShmmax)
+- return
+-
+- # If we got here, it means we need to update kernel.shmmax in sysctl.conf
+- logging.debug("setting SHARED MEMORY MAX to: %s", basedefs.CONST_SHMMAX)
+- txtHandler.editParam("kernel.shmmax", basedefs.CONST_SHMMAX)
+- txtHandler.close()
+-
+- # Execute sysctl -a
+- utils.execExternalCmd("%s -e -p" % basedefs.EXEC_SYSCTL, True, output_messages.ERR_EXP_FAILED_KERNEL_PARAMS)
+-
+ def _addIsoDomaintoDB(uuid, description):
+ logging.debug("Adding iso domain into DB")
+ sqlQuery = "select inst_add_iso_storage_domain ('%s', '%s', '%s:%s', %s, %s)" % (uuid, description, controller.CONF["HOST_FQDN"], controller.CONF["NFS_MP"], 0, 0)
+diff --git a/packaging/fedora/setup/output_messages.py b/packaging/fedora/setup/output_messages.py
+index 1253ac8..d296498 100644
+--- a/packaging/fedora/setup/output_messages.py
++++ b/packaging/fedora/setup/output_messages.py
+@@ -382,8 +382,6 @@ ERR_NO_ANSWER_FILE="Error: Could not find file %s"
+
+ ERR_EXP_EDIT_PSQL_CONF="Error: failed editing %s" % basedefs.FILE_PSQL_CONF
+
+-ERR_EXP_FAILED_KERNEL_PARAMS="Error: failed setting the kernel parameters"
+-
+ # Prerequisites Packages
+ ERR_HTTPD_NOT_INSTALLED="Error: Httpd is not installed in the system"
+ ERR_MOD_SSL_NOT_INSTALLED="Error: mod_ssl is not installed in the system"
+--
+1.7.11.2
+
diff --git a/ovirt-engine.spec b/ovirt-engine.spec
index e5472f5..0bc5dcc 100644
--- a/ovirt-engine.spec
+++ b/ovirt-engine.spec
@@ -24,16 +24,18 @@ bin/getent group %{engine_group} >/dev/null || /sbin/groupadd -r %{engine_group}
Name: ovirt-engine
Version: 3.1.0
-Release: 1%{?dist}
+Release: 0.1.20120701git95220c%{?dist}
Summary: Management server for Open Virtualization
Group: Applications/System
License: ASL 2.0
URL: http://www.ovirt.org
-Source0: http://www.ovirt.org/releases/stable/src/%{name}-%{version}.tar.gz
+# git checkout git://gerrit.ovirt.org/ovirt-engine
+# git archive --prefix=ovirt-engine-3.1.0/ --format=tar 95220cd6c4d2c9cfddc52391f6d04ed750692d51 | xz > ovirt-engine-3.1.0.tar.xz
+Source0: %{name}-%{version}.tar.xz
# Update to Hibernate 3.6.10:
-Patch10: %{name}-update-hibernate.patch
+Patch0: %{name}-update-hibernate.patch
# Build only the backend:
Patch20: %{name}-build-backend-only.patch
@@ -43,35 +45,32 @@ Patch30: %{name}-fix-checkstyle-gav.patch
# Update to Spring 3:
# Upstream: http://gerrit.ovirt.org/3002
-Patch40: %{name}-update-spring.patch
+Patch45: %{name}-update-spring.patch
# Remove Spring from the RESTAPI:
# Upstream: http://gerrit.ovirt.org/1390
-Patch50: %{name}-remove-spring-from-restapi.patch
+Patch60: %{name}-remove-spring-from-restapi.patch
# Remove the frontend related content from the ear:
-Patch60: %{name}-remove-frontend-from-ear.patch
+Patch70: %{name}-remove-frontend-from-ear.patch
# Make dependency on commons-collections explicit:
# Upstream: http://gerrit.ovirt.org/6597
-Patch70: %{name}-make-dependency-on-commons-collections-explicit.patch
+Patch71: %{name}-make-dependency-on-commons-collections-explicit.patch
# Update to commons-configuration 1.8:
-Patch80: %{name}-update-commons-configuration.patch
+Patch72: %{name}-update-commons-configuration.patch
-# Create the sysctl.conf file if it doesn't exist:
-Patch90: %{name}-create-sysctl-config-if-it-doesnt-exist.patch
-
-# Fix building of classpaths using commons as the "apache-" symlink is being
-# removed:
-Patch100: %{name}-fix-commons-classpath-building.patch
+# Don't try to modify /etc/sysctl.conf as this file doesn't exist in Fedora 18
+# and the modification that we are doing is not needed:
+Patch73: %{name}-dont-modify-sysctl.patch
# Add a README file:
-Patch110: %{name}-add-readme.patch
+Patch80: %{name}-add-readme.patch
# Replace the index page with one that doesn't include links to the user portal
# or webadmin:
-Patch120: %{name}-replace-index-page.patch
+Patch90: %{name}-replace-index-page.patch
BuildArch: noarch
@@ -164,7 +163,7 @@ Requires: postgresql-server >= 8.4.7
Requires: postgresql-contrib >= 8.4.7
# Require JBoss AS 7:
-Requires: jboss-as >= 7.1.1-6
+Requires: jboss-as >= 7.1.1-3
# We can't require exactly the same version and release of the
# setup package because it needs to be updated independely as part
@@ -314,21 +313,20 @@ All-in-one plugin for oVirt Engine's setup
%prep
# Unpack and patch the sources:
-%setup -q -c -n %{name}-%{version}
+%setup -q
# Apply the patches:
-%patch10 -p1
+%patch0 -p1
%patch20 -p1
%patch30 -p1
-%patch40 -p1
-%patch50 -p1
+%patch45 -p1
%patch60 -p1
%patch70 -p1
+%patch71 -p1
+%patch72 -p1
+%patch73 -p1
%patch80 -p1
%patch90 -p1
-%patch100 -p1
-%patch110 -p1
-%patch120 -p1
%build
@@ -752,10 +750,7 @@ fi
%changelog
-* Thu Aug 09 2012 Juan Hernandez <juan.hernandez at redhat.com> - 3.1.0-1
-- Update to upstream 3.1 release
-
-* Fri Aug 07 2012 Juan Hernandez <juan.hernandez at redhat.com> - 3.1.0-0.1.20120701git95220c
+* Fri May 25 2012 Juan Hernandez <juan.hernandez at redhat.com> - 3.1.0-0.1.20120701git95220c
- Update to upstream 3.1 pre-release
* Tue Apr 24 2012 Juan Hernandez <juan.hernandez at redhat.com> - 3.0.0.0001-12
diff --git a/sources b/sources
index 70fcb4b..6cb1d2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-05a83991cd5b97cc836d87bc05b66abb ovirt-engine-3.1.0.tar.gz
+ac37722f0428b44c6f0cbf432173ff11 ovirt-engine-3.1.0.tar.xz
More information about the scm-commits
mailing list