diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-26 20:16:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-26 20:16:35 +0000 |
| commit | f428527a061a669e07b1901e0ef2d9de86dcb5f7 (patch) | |
| tree | 6be64c826db05aeae3bed15c4d53b353fe727dbe | |
| parent | 2900258d5e117afd302ecff3411658910078d431 (diff) | |
| parent | f8d25feed1f92437aa0e90e23ad697a2aa05e278 (diff) | |
Merge "xenapi: rpmbuild fixes"
| -rwxr-xr-x | plugins/xenserver/xenapi/contrib/build-rpm.sh | 6 | ||||
| -rw-r--r-- | plugins/xenserver/xenapi/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 f7bed4d84..016dc750e 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 19b508d2e..66c13967e 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} |