diff options
| author |   Dan Radez <dradez@redhat.com> | 2015-12-15 15:47:55 -0500 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2015-12-18 17:06:14 -0500 |
| commit | cd890bcf3bacc4c28a2e4b3716eca6677d7355bb (patch) | |
| tree | 7fc4cecfc43a6d9b00b6cf9624f9d1bc3788d797 /build | |
| parent | f79e4a1703ba54008e7049b041600546e0482f75 (diff) | |
cleaning out some tarball manipulations from Makefile that are unnessesary
Change-Id: I4a585a5e72872fa1887aa4487ebd7b17d07feacc
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 4 | ||||
| -rw-r--r-- | build/opnfv-apex.spec | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/build/Makefile b/build/Makefile index 7fd32281..87e8db08 100644 --- a/build/Makefile +++ b/build/Makefile @@ -110,11 +110,7 @@ rpm: tar -u --xform="s:brbm1-net.xml:opnfv-apex-$(RPMVERS)/build/brbm1-net.xml:" --file=opnfv-apex.tar brbm1-net.xml tar -u --xform="s:default-pool.xml:opnfv-apex-$(RPMVERS)/build/default-pool.xml:" --file=opnfv-apex.tar default-pool.xml tar -u --xform="s:instackenv-virt.json:opnfv-apex-$(RPMVERS)/build/instackenv-virt.json:" --file=opnfv-apex.tar instackenv-virt.json - tar -u --xform="s:instackenv.json.example:opnfv-apex-$(RPMVERS)/build/instackenv.json.example:" --file=opnfv-apex.tar instackenv.json.example tar -u --xform="s:stack/overcloud-full-odl.qcow2:opnfv-apex-$(RPMVERS)/build/stack/overcloud-full.qcow2:" --file=opnfv-apex.tar stack/overcloud-full-odl.qcow2 - tar -u --xform="s:network-environment.yaml:opnfv-apex-$(RPMVERS)/build/network-environment.yaml:" --file=opnfv-apex.tar network-environment.yaml - tar -u --xform="s:opendaylight-puppet-neutron.patch:opnfv-apex-$(RPMVERS)/build/opendaylight-puppet-neutron.patch:" --file=opnfv-apex.tar opendaylight-puppet-neutron.patch - tar -u --xform="s:opendaylight-tripleo-heat-templates.patch:opnfv-apex-$(RPMVERS)/build/opendaylight-tripleo-heat-templates.patch:" --file=opnfv-apex.tar opendaylight-tripleo-heat-templates.patch gzip -f opnfv-apex.tar rpmbuild -ba opnfv-apex.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(REVSTATE) | tr -d '_-')" diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec index ee819481..9b6a6f85 100644 --- a/build/opnfv-apex.spec +++ b/build/opnfv-apex.spec @@ -43,8 +43,6 @@ install build/default-pool.xml %{buildroot}%{_var}/opt/opnfv/ install build/network-environment.yaml %{buildroot}%{_var}/opt/opnfv/ install build/nics/controller.yaml %{buildroot}%{_var}/opt/opnfv/nics/ install build/nics/compute.yaml %{buildroot}%{_var}/opt/opnfv/nics/ -install build/opendaylight-puppet-neutron.patch %{buildroot}%{_var}/opt/opnfv/ -install build/opendaylight-tripleo-heat-templates.patch %{buildroot}%{_var}/opt/opnfv/ install build/instackenv-virt.json %{buildroot}%{_var}/opt/opnfv/ install build/instackenv.json.example %{buildroot}%{_var}/opt/opnfv/ @@ -70,8 +68,6 @@ install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_s %{_var}/opt/opnfv/network-environment.yaml %{_var}/opt/opnfv/nics/controller.yaml %{_var}/opt/opnfv/nics/compute.yaml -%{_var}/opt/opnfv/opendaylight-puppet-neutron.patch -%{_var}/opt/opnfv/opendaylight-tripleo-heat-templates.patch %{_var}/opt/opnfv/instackenv-virt.json %{_var}/opt/opnfv/instackenv.json.example %{_var}/opt/opnfv/stack/overcloud-full.qcow2 @@ -86,6 +82,7 @@ install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_s %changelog * Tue Dec 15 2015 Dan Radez <dradez@redhat.com> - 2.6-1 - Added deploy settings for flat network config +- cleaned up files that don't need to be in the rpm * Wed Dec 09 2015 Dan Radez <dradez@redhat.com> - 2.5-1 - Updating the OpenDaylight Patch * Fri Dec 05 2015 Dan Radez <dradez@redhat.com> - 2.4-1 |