Fixes missing ramdisk and kernel in rpm

Change-Id: I970c79dc2a558af3c904d3b19218da53c98378d1
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/build/Makefile b/build/Makefile
index 51cb3e4..8e2af86 100644 (file)
--- 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 450044c..fe6a9f2 100644 (file)
--- 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