From 21cbac8334a37f15595088bc0c99f8f04451f1a7 Mon Sep 17 00:00:00 2001
From: Naveed Massjouni <naveedm9@gmail.com>
Date: Mon, 27 Jun 2011 00:20:53 -0400
Subject: Adding files for building an rpm for xenserver xenapi plugins.

---
 plugins/xenserver/xenapi/contrib/build.sh          | 20 ++++++++++++
 .../rpmbuild/SPECS/nova-xenapi-plugins.spec        | 36 ++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100755 plugins/xenserver/xenapi/contrib/build.sh
 create mode 100644 plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/nova-xenapi-plugins.spec

(limited to 'plugins')

diff --git a/plugins/xenserver/xenapi/contrib/build.sh b/plugins/xenserver/xenapi/contrib/build.sh
new file mode 100755
index 000000000..b194fface
--- /dev/null
+++ b/plugins/xenserver/xenapi/contrib/build.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+PACKAGE=nova-xenapi-plugins
+RPMBUILD_DIR=$PWD/rpmbuild
+if [ ! -d $RPMBUILD_DIR ]; then
+    echo $RPMBUILD_DIR is missing
+    exit 1
+fi
+
+for dir in BUILD BUILDROOT SRPMS RPMS SOURCES; do
+    rm -rf $RPMBUILD_DIR/$dir
+    mkdir -p $RPMBUILD_DIR/$dir
+done
+
+rm -rf /tmp/$PACKAGE
+mkdir /tmp/$PACKAGE
+cp -r ../etc/xapi.d /tmp/$PACKAGE
+tar czf $RPMBUILD_DIR/SOURCES/$PACKAGE.tar.gz -C /tmp $PACKAGE
+
+rpmbuild -ba --nodeps --define "_topdir $RPMBUILD_DIR" \
+    $RPMBUILD_DIR/SPECS/$PACKAGE.spec
diff --git a/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/nova-xenapi-plugins.spec b/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/nova-xenapi-plugins.spec
new file mode 100644
index 000000000..1a61dbbad
--- /dev/null
+++ b/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/nova-xenapi-plugins.spec
@@ -0,0 +1,36 @@
+Name:           nova-xenapi-plugins
+Version:        1.0
+Release:        1
+Summary:        Files for XenAPI support.
+License:        Apache
+Group:          Applications/Utilities
+Source0:        nova-xenapi-plugins.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%define debug_package %{nil}
+
+%description
+This package contains files that are required for XenAPI support for OpenStack.
+
+%prep
+%setup -q -n nova-xenapi-plugins
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc
+cp -r xapi.d $RPM_BUILD_ROOT/etc
+chmod u+x $RPM_BUILD_ROOT/etc/xapi.d/plugins/objectstore
+#%{_fixperms} $RPM_BUILD_ROOT/*
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+/etc/xapi.d/plugins/agent
+/etc/xapi.d/plugins/glance
+/etc/xapi.d/plugins/migration
+/etc/xapi.d/plugins/objectstore
+/etc/xapi.d/plugins/pluginlib_nova.py
+/etc/xapi.d/plugins/xenhost
+/etc/xapi.d/plugins/xenstore.py
-- 
cgit 


From 998b5ba2c709054c535583195ba489454e384f41 Mon Sep 17 00:00:00 2001
From: Naveed Massjouni <naveedm9@gmail.com>
Date: Mon, 27 Jun 2011 12:04:44 -0400
Subject: Changed package name to openstack-xen-plugins per dprince's
 suggestion. All the files in /etc/xapi.d/plugins must be executable. Added
 dependency on parted. Renamed build.sh to build-rpm.sh.

---
 plugins/xenserver/xenapi/contrib/build-rpm.sh      | 20 ++++++++++++
 plugins/xenserver/xenapi/contrib/build.sh          | 20 ------------
 .../rpmbuild/SPECS/nova-xenapi-plugins.spec        | 36 ----------------------
 .../rpmbuild/SPECS/openstack-xen-plugins.spec      | 36 ++++++++++++++++++++++
 4 files changed, 56 insertions(+), 56 deletions(-)
 create mode 100755 plugins/xenserver/xenapi/contrib/build-rpm.sh
 delete mode 100755 plugins/xenserver/xenapi/contrib/build.sh
 delete mode 100644 plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/nova-xenapi-plugins.spec
 create mode 100644 plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec

(limited to 'plugins')

diff --git a/plugins/xenserver/xenapi/contrib/build-rpm.sh b/plugins/xenserver/xenapi/contrib/build-rpm.sh
new file mode 100755
index 000000000..f7bed4d84
--- /dev/null
+++ b/plugins/xenserver/xenapi/contrib/build-rpm.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+PACKAGE=openstack-xen-plugins
+RPMBUILD_DIR=$PWD/rpmbuild
+if [ ! -d $RPMBUILD_DIR ]; then
+    echo $RPMBUILD_DIR is missing
+    exit 1
+fi
+
+for dir in BUILD BUILDROOT SRPMS RPMS SOURCES; do
+    rm -rf $RPMBUILD_DIR/$dir
+    mkdir -p $RPMBUILD_DIR/$dir
+done
+
+rm -rf /tmp/$PACKAGE
+mkdir /tmp/$PACKAGE
+cp -r ../etc/xapi.d /tmp/$PACKAGE
+tar czf $RPMBUILD_DIR/SOURCES/$PACKAGE.tar.gz -C /tmp $PACKAGE
+
+rpmbuild -ba --nodeps --define "_topdir $RPMBUILD_DIR" \
+    $RPMBUILD_DIR/SPECS/$PACKAGE.spec
diff --git a/plugins/xenserver/xenapi/contrib/build.sh b/plugins/xenserver/xenapi/contrib/build.sh
deleted file mode 100755
index b194fface..000000000
--- a/plugins/xenserver/xenapi/contrib/build.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-PACKAGE=nova-xenapi-plugins
-RPMBUILD_DIR=$PWD/rpmbuild
-if [ ! -d $RPMBUILD_DIR ]; then
-    echo $RPMBUILD_DIR is missing
-    exit 1
-fi
-
-for dir in BUILD BUILDROOT SRPMS RPMS SOURCES; do
-    rm -rf $RPMBUILD_DIR/$dir
-    mkdir -p $RPMBUILD_DIR/$dir
-done
-
-rm -rf /tmp/$PACKAGE
-mkdir /tmp/$PACKAGE
-cp -r ../etc/xapi.d /tmp/$PACKAGE
-tar czf $RPMBUILD_DIR/SOURCES/$PACKAGE.tar.gz -C /tmp $PACKAGE
-
-rpmbuild -ba --nodeps --define "_topdir $RPMBUILD_DIR" \
-    $RPMBUILD_DIR/SPECS/$PACKAGE.spec
diff --git a/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/nova-xenapi-plugins.spec b/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/nova-xenapi-plugins.spec
deleted file mode 100644
index 1a61dbbad..000000000
--- a/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/nova-xenapi-plugins.spec
+++ /dev/null
@@ -1,36 +0,0 @@
-Name:           nova-xenapi-plugins
-Version:        1.0
-Release:        1
-Summary:        Files for XenAPI support.
-License:        Apache
-Group:          Applications/Utilities
-Source0:        nova-xenapi-plugins.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define debug_package %{nil}
-
-%description
-This package contains files that are required for XenAPI support for OpenStack.
-
-%prep
-%setup -q -n nova-xenapi-plugins
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc
-cp -r xapi.d $RPM_BUILD_ROOT/etc
-chmod u+x $RPM_BUILD_ROOT/etc/xapi.d/plugins/objectstore
-#%{_fixperms} $RPM_BUILD_ROOT/*
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-/etc/xapi.d/plugins/agent
-/etc/xapi.d/plugins/glance
-/etc/xapi.d/plugins/migration
-/etc/xapi.d/plugins/objectstore
-/etc/xapi.d/plugins/pluginlib_nova.py
-/etc/xapi.d/plugins/xenhost
-/etc/xapi.d/plugins/xenstore.py
diff --git a/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec b/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec
new file mode 100644
index 000000000..864ca7ff7
--- /dev/null
+++ b/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec
@@ -0,0 +1,36 @@
+Name:           openstack-xen-plugins
+Version:        2011.3
+Release:        1
+Summary:        Files for XenAPI support.
+License:        Apache
+Group:          Applications/Utilities
+Source0:        openstack-xen-plugins.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:       parted
+
+%define debug_package %{nil}
+
+%description
+This package contains files that are required for XenAPI support for OpenStack.
+
+%prep
+%setup -q -n openstack-xen-plugins
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc
+cp -r xapi.d $RPM_BUILD_ROOT/etc
+chmod a+x $RPM_BUILD_ROOT/etc/xapi.d/plugins/*
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+/etc/xapi.d/plugins/agent
+/etc/xapi.d/plugins/glance
+/etc/xapi.d/plugins/migration
+/etc/xapi.d/plugins/objectstore
+/etc/xapi.d/plugins/pluginlib_nova.py
+/etc/xapi.d/plugins/xenhost
+/etc/xapi.d/plugins/xenstore.py
-- 
cgit 


From 7b6ded922adc26f26dd208d5de1763b708866cea Mon Sep 17 00:00:00 2001
From: Naveed Massjouni <naveedm9@gmail.com>
Date: Mon, 27 Jun 2011 12:10:47 -0400
Subject: Updating license to ASL 2.0

---
 .../xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

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 864ca7ff7..91ff20e5f 100644
--- a/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec
+++ b/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec
@@ -2,7 +2,7 @@ Name:           openstack-xen-plugins
 Version:        2011.3
 Release:        1
 Summary:        Files for XenAPI support.
-License:        Apache
+License:        ASL 2.0
 Group:          Applications/Utilities
 Source0:        openstack-xen-plugins.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-- 
cgit