You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2018/06/19 11:34:49 UTC
[cloudstack] branch 4.11 updated: packaging: use libuuid x86_64
package for cloudstack-common (#2706)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.11 by this push:
new c87ca1b packaging: use libuuid x86_64 package for cloudstack-common (#2706)
c87ca1b is described below
commit c87ca1b26282bc818f997bec236a3766d041c8dd
Author: Rohit Yadav <ro...@apache.org>
AuthorDate: Tue Jun 19 17:04:44 2018 +0530
packaging: use libuuid x86_64 package for cloudstack-common (#2706)
* packaging: use libuuid x86_64 package for cloudstack-common
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
* 64 bit links is packaged
* post scan filter to exclude libuuid.so.1
* Revert "packaging: use libuuid x86_64 package for cloudstack-common"
This reverts commit b3fb8957fe4e98c85949be2010f0316c89d535a9.
* post scan filter to exclude libuuid.so.1 (centos63)
* revert removal of 32 bit support for vhd-util libs
---
packaging/centos63/cloud.spec | 1 +
packaging/centos7/cloud.spec | 1 +
.../appliance/systemvmtemplate/scripts/install_systemvm_packages.sh | 6 ++++--
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 87d2c1e..68e2c56 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -109,6 +109,7 @@ Obsoletes: cloud-daemonize < 4.1.0
Group: System Environment/Libraries
%description common
The Apache CloudStack files shared between agent and management server
+%global __requires_exclude ^libuuid\\.so\\.1$
%package agent
Summary: CloudStack Agent for KVM hypervisors
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 96b679c..a4f4dcc 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -93,6 +93,7 @@ Requires: python-netaddr
Group: System Environment/Libraries
%description common
The Apache CloudStack files shared between agent and management server
+%global __requires_exclude ^libuuid\\.so\\.1$
%package agent
Summary: CloudStack Agent for KVM hypervisors
diff --git a/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh b/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh
index c1c3e94..585b38d 100644
--- a/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh
+++ b/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh
@@ -78,11 +78,13 @@ function install_packages() {
apt-get clean
apt-get autoclean
- #32 bit architecture support:: not required for 32 bit template
+ ${apt_get} install links
+
+ #32 bit architecture support for vhd-util: not required for 32 bit template
if [ "${arch}" != "i386" ]; then
dpkg --add-architecture i386
apt-get update
- ${apt_get} install links:i386 libuuid1:i386 libc6:i386
+ ${apt_get} install libuuid1:i386 libc6:i386
fi
# Install xenserver guest utilities as debian repos don't have it