openstack/nova
Code Issues Proposed changes

xenapi: rpmbuild fixes

Browse Source 
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
This commit is contained in:
Mate Lakat
2013-03-20 14:58:32 +00:00
parent 8e2a7a3b62
commit f8d25feed1
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/xenserver/xenapi/contrib/build-rpm.sh
View File

@@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
PACKAGE=openstack-xen-plugins PACKAGE=openstack-xen-plugins
RPMBUILD_DIR=$PWD/rpmbuild THIS_DIR=$(cd $(dirname $0) && pwd)
RPMBUILD_DIR="$THIS_DIR/rpmbuild"
if [ ! -d $RPMBUILD_DIR ]; then if [ ! -d $RPMBUILD_DIR ]; then
echo $RPMBUILD_DIR is missing echo $RPMBUILD_DIR is missing
exit 1 exit 1
@@ -13,7 +15,7 @@ done
rm -rf /tmp/$PACKAGE rm -rf /tmp/$PACKAGE
mkdir /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 tar czf $RPMBUILD_DIR/SOURCES/$PACKAGE.tar.gz -C /tmp $PACKAGE
rpmbuild -ba --nodeps --define "_topdir $RPMBUILD_DIR" \ rpmbuild -ba --nodeps --define "_topdir $RPMBUILD_DIR" \

1
plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec
View File

@@ -7,7 +7,6 @@ Group: Applications/Utilities
Source0: openstack-xen-plugins.tar.gz Source0: openstack-xen-plugins.tar.gz
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: parted
%define debug_package %{nil} %define debug_package %{nil}