Merge lp:~todd-deshane/nova/working into lp:~hudson-openstack/nova/trunk

Proposed by Todd Deshane
Status: Rejected
Rejected by: Soren Hansen
Proposed branch: lp:~todd-deshane/nova/working
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 69 lines (+60/-0)
2 files modified
plugins/xenserver/xenapi/Makefile (+23/-0)
plugins/xenserver/xenapi/xenapi-openstack-plugins.spec (+37/-0)
To merge this branch: bzr merge lp:~todd-deshane/nova/working
Reviewer Review Type Date Requested Status
Todd Deshane (community) Disapprove
Brian Lamar (community) Needs Information
Review via email: mp+67114@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Lamar (blamar) wrote :

While it's done slightly differently, can you potentially work with what was put into trunk recently?

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

review: Needs Information
Revision history for this message
Todd Deshane (todd-deshane) wrote :

Yes, that will be fine. I'll submit patches against that if necessary. Thanks.

review: Disapprove

Unmerged revisions

1245. By Todd Deshane <email address hidden>

initial commit of xenapi-openstack-plugins build scripts

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'plugins/xenserver/xenapi/Makefile'
2--- plugins/xenserver/xenapi/Makefile 1970-01-01 00:00:00 +0000
3+++ plugins/xenserver/xenapi/Makefile 2011-07-07 03:53:24 +0000
4@@ -0,0 +1,23 @@
5+#spec file
6+SPEC := xenapi-openstack-plugins.spec
7+
8+#output RPM
9+RPM := rpm/noarch/xenapi-openstack-plugins-0.1-1.noarch.rpm
10+
11+#paths
12+tmp_dest = tmp/xenapi-openstack-plugins/etc/xapi.d/plugins
13+src := etc/xapi.d/plugins
14+
15+#rpm target
16+$(RPM) : $(SPEC)
17+ mkdir -p $(dir $@)
18+ mkdir -p $(tmp_dest)
19+ cp -r $(src)/* $(tmp_dest)
20+ chmod a+x $(tmp_dest)/*
21+ rpmbuild --define "_builddir tmp/xenapi-openstack-plugins" --define "_rpmdir rpm" -bb $<
22+
23+rpm: $(RPM)
24+
25+clean:
26+ rm -rf tmp/
27+ rm -rf rpm/
28
29=== added file 'plugins/xenserver/xenapi/xenapi-openstack-plugins.spec'
30--- plugins/xenserver/xenapi/xenapi-openstack-plugins.spec 1970-01-01 00:00:00 +0000
31+++ plugins/xenserver/xenapi/xenapi-openstack-plugins.spec 2011-07-07 03:53:24 +0000
32@@ -0,0 +1,37 @@
33+Summary: XenAPI OpenStack Plugins
34+Name: xenapi-openstack-plugins
35+Version: 0.1
36+Release: 1
37+License: Apache
38+Vendor: Xen.org
39+BuildRoot: /tmp/%{name}
40+BuildArch: noarch
41+
42+%description
43+
44+%prep
45+exit 0
46+
47+%build
48+mkdir -p %{buildroot}/etc
49+cp -r etc/* %{buildroot}/etc
50+
51+%install
52+exit 0
53+
54+%clean
55+exit 0
56+
57+%post
58+
59+%preun
60+
61+%files
62+%defattr(-,root,root,-)
63+/etc/xapi.d/plugins/agent
64+/etc/xapi.d/plugins/glance
65+/etc/xapi.d/plugins/migration
66+/etc/xapi.d/plugins/objectstore
67+/etc/xapi.d/plugins/pluginlib_nova.py
68+/etc/xapi.d/plugins/xenhost
69+/etc/xapi.d/plugins/xenstore.py