packaging: use libuuid x86_64 package for cloudstack-common (#2706)

* packaging: use libuuid x86_64 package for cloudstack-common

Signed-off-by: Rohit Yadav <rohit.yadav@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 b3fb8957fe.

* post scan filter to exclude libuuid.so.1 (centos63)

* revert removal of 32 bit support for vhd-util libs

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

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

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