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
=== added file 'plugins/xenserver/xenapi/Makefile'
--- plugins/xenserver/xenapi/Makefile 1970-01-01 00:00:00 +0000
+++ plugins/xenserver/xenapi/Makefile 2011-07-07 03:53:24 +0000
@@ -0,0 +1,23 @@
1#spec file
2SPEC := xenapi-openstack-plugins.spec
3
4#output RPM
5RPM := rpm/noarch/xenapi-openstack-plugins-0.1-1.noarch.rpm
6
7#paths
8tmp_dest = tmp/xenapi-openstack-plugins/etc/xapi.d/plugins
9src := etc/xapi.d/plugins
10
11#rpm target
12$(RPM) : $(SPEC)
13 mkdir -p $(dir $@)
14 mkdir -p $(tmp_dest)
15 cp -r $(src)/* $(tmp_dest)
16 chmod a+x $(tmp_dest)/*
17 rpmbuild --define "_builddir tmp/xenapi-openstack-plugins" --define "_rpmdir rpm" -bb $<
18
19rpm: $(RPM)
20
21clean:
22 rm -rf tmp/
23 rm -rf rpm/
024
=== added file 'plugins/xenserver/xenapi/xenapi-openstack-plugins.spec'
--- plugins/xenserver/xenapi/xenapi-openstack-plugins.spec 1970-01-01 00:00:00 +0000
+++ plugins/xenserver/xenapi/xenapi-openstack-plugins.spec 2011-07-07 03:53:24 +0000
@@ -0,0 +1,37 @@
1Summary: XenAPI OpenStack Plugins
2Name: xenapi-openstack-plugins
3Version: 0.1
4Release: 1
5License: Apache
6Vendor: Xen.org
7BuildRoot: /tmp/%{name}
8BuildArch: noarch
9
10%description
11
12%prep
13exit 0
14
15%build
16mkdir -p %{buildroot}/etc
17cp -r etc/* %{buildroot}/etc
18
19%install
20exit 0
21
22%clean
23exit 0
24
25%post
26
27%preun
28
29%files
30%defattr(-,root,root,-)
31/etc/xapi.d/plugins/agent
32/etc/xapi.d/plugins/glance
33/etc/xapi.d/plugins/migration
34/etc/xapi.d/plugins/objectstore
35/etc/xapi.d/plugins/pluginlib_nova.py
36/etc/xapi.d/plugins/xenhost
37/etc/xapi.d/plugins/xenstore.py