From f8d25feed1f92437aa0e90e23ad697a2aa05e278 Mon Sep 17 00:00:00 2001 From: Mate Lakat Date: Wed, 20 Mar 2013 14:58:32 +0000 Subject: [PATCH] xenapi: rpmbuild fixes Fixes bug 1157695 This fix removes the parted dependency from the rpm specification file, and also gets rid of the assumption, that the build-rpm.sh is executed at a specific directory. Change-Id: I1dcf9096a783a88bc09af0f4f4d5541a7e505748 --- plugins/xenserver/xenapi/contrib/build-rpm.sh | 6 ++++-- .../contrib/rpmbuild/SPECS/openstack-xen-plugins.spec | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/xenserver/xenapi/contrib/build-rpm.sh b/plugins/xenserver/xenapi/contrib/build-rpm.sh index f7bed4d84bdc..016dc750eded 100755 --- a/plugins/xenserver/xenapi/contrib/build-rpm.sh +++ b/plugins/xenserver/xenapi/contrib/build-rpm.sh @@ -1,6 +1,8 @@ #!/bin/bash PACKAGE=openstack-xen-plugins -RPMBUILD_DIR=$PWD/rpmbuild +THIS_DIR=$(cd $(dirname $0) && pwd) +RPMBUILD_DIR="$THIS_DIR/rpmbuild" + if [ ! -d $RPMBUILD_DIR ]; then echo $RPMBUILD_DIR is missing exit 1 @@ -13,7 +15,7 @@ done rm -rf /tmp/$PACKAGE mkdir /tmp/$PACKAGE -cp -r ../etc/xapi.d /tmp/$PACKAGE +cp -r "$THIS_DIR/../etc/xapi.d" /tmp/$PACKAGE tar czf $RPMBUILD_DIR/SOURCES/$PACKAGE.tar.gz -C /tmp $PACKAGE rpmbuild -ba --nodeps --define "_topdir $RPMBUILD_DIR" \ diff --git a/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec b/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec index 19b508d2e1a4..66c13967edbb 100644 --- a/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec +++ b/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec @@ -7,7 +7,6 @@ Group: Applications/Utilities Source0: openstack-xen-plugins.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: parted %define debug_package %{nil}