diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-06-07 02:29:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-07 02:29:41 +0000 |
| commit | d21460f3adaa6e454ee52b27a837f9d7e0ea7819 (patch) | |
| tree | 6680025d65ce33f3fb65be03edd44f020ecf49b8 /build | |
| parent | b9f63d58a83e18dd221be13348e585533eedcedc (diff) | |
| parent | 0f2d4a54e838f590837ded99e40fba530d6086d4 (diff) | |
Merge "Fixes missing ramdisk and kernel in rpm"
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 4 | ||||
| -rw-r--r-- | build/rpm_specs/opnfv-apex.spec | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/build/Makefile b/build/Makefile index 51cb3e47..8e2af86d 100644 --- a/build/Makefile +++ b/build/Makefile @@ -194,7 +194,7 @@ $(BUILD_DIR)/overcloud-full-opendaylight.qcow2: $(BUILD_DIR)/overcloud-full.qcow @./overcloud-opendaylight.sh $(BUILD_DIR)/opnfv-apex.tar.gz: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 - tar -czf $(BUILD_DIR)/opnfv-apex.tar.gz --xform="s:.*overcloud-full-opendaylight.qcow2:opnfv-apex-$(RPMVERS)/build/overcloud-full-opendaylight.qcow2:" $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 + tar -czf $(BUILD_DIR)/opnfv-apex.tar.gz --xform="s:.*/:opnfv-apex-$(RPMVERS)/build/:" $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 $(BUILD_DIR)/overcloud-full.initrd $(BUILD_DIR)/overcloud-full.vmlinuz .PHONY: opendaylight-rpm-check opendaylight-rpm-check: $(BUILD_DIR)/opnfv-apex.tar.gz @@ -220,7 +220,7 @@ $(BUILD_DIR)/overcloud-full-onos.qcow2: $(BUILD_DIR)/overcloud-full.qcow2 @./overcloud-onos.sh $(BUILD_DIR)/opnfv-apex-onos.tar.gz: $(BUILD_DIR)/overcloud-full-onos.qcow2 - tar -czf $(BUILD_DIR)/opnfv-apex-onos.tar.gz --xform="s:.*overcloud-full-onos.qcow2:opnfv-apex-onos-$(RPMVERS)/build/overcloud-full-onos.qcow2:" $(BUILD_DIR)/overcloud-full-onos.qcow2 + tar -czf $(BUILD_DIR)/opnfv-apex-onos.tar.gz --xform="s:.*/:opnfv-apex-onos-$(RPMVERS)/build/:" $(BUILD_DIR)/overcloud-full-onos.qcow2 .PHONY: onos-rpm-check onos-rpm-check: $(BUILD_DIR)/opnfv-apex-onos.tar.gz diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec index 450044c0..fe6a9f2c 100644 --- a/build/rpm_specs/opnfv-apex.spec +++ b/build/rpm_specs/opnfv-apex.spec @@ -22,12 +22,18 @@ https://wiki.opnfv.org/apex %install mkdir -p %{buildroot}%{_var}/opt/opnfv/images/ install build/overcloud-full-opendaylight.qcow2 %{buildroot}%{_var}/opt/opnfv/images/ +install build/overcloud-full.vmlinuz %{buildroot}%{_var}/opt/opnfv/images/ +install build/overcloud-full.initrd %{buildroot}%{_var}/opt/opnfv/images/ %files %defattr(644, root, root, -) %{_var}/opt/opnfv/images/overcloud-full-opendaylight.qcow2 +%{_var}/opt/opnfv/images/overcloud-full.vmlinuz +%{_var}/opt/opnfv/images/overcloud-full.initrd %changelog +* Fri May 26 2017 Tim Rozet <trozet@redhat.com> - 5.0-2 +- Fixes missing ramdisk and kernel * Tue Apr 04 2017 Dan Radez <dradez@redhat.com> - 5.0-1 - Version update for Euphrates * Wed Dec 7 2016 Tim Rozet <trozet@redhat.com> - 4.0-2 |