Merge "Removes building quagga/zrpc" into stable/danube

[apex.git] / build / Makefile

diff --git a/build/Makefile b/build/Makefile
index 3a26b4c..b81ddd3 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -60,14 +60,17 @@ clean:
 clean-cache:
        rm -rf $(CACHE_DIR)
 
+# ONOS integration did not get updated for Danube,
+# removing it from the default builds
+
 .PHONY: images
-images: undercloud overcloud-full overcloud-opendaylight overcloud-onos
+images: undercloud overcloud-full overcloud-opendaylight # overcloud-onos
 
 .PHONY: rpms
-rpms: common-rpm undercloud-rpm opendaylight-rpm onos-rpm
+rpms: common-rpm undercloud-rpm opendaylight-rpm # onos-rpm
 
 .PHONY: rpms-check
-rpms-check: release-rpm-check common-rpm-check undercloud-rpm-check opendaylight-rpm-check onos-rpm-check
+rpms-check: release-rpm-check common-rpm-check undercloud-rpm-check opendaylight-rpm-check # onos-rpm-check
 
 .PHONY: rpms-clean
 rpms-clean:
@@ -174,7 +177,7 @@ congress-clean:
 $(BUILD_DIR)/openstack-congress.tar.gz:
        @echo "Preparing the Congress RPM prerequisites"
        git clone $(CONGRESS_REPO) -b $(CONGRESS_BRANCH) $(BUILD_DIR)/openstack-congress-2016.2
-       cd $(BUILD_DIR)/openstack-congress-2016.2 && curl -O https://radez.fedorapeople.org/openstack-congress.service
+       cp rpm_specs/openstack-congress-server.service $(BUILD_DIR)/openstack-congress-2016.2
        tar czf $(BUILD_DIR)/openstack-congress.tar.gz -C $(BUILD_DIR) openstack-congress-2016.2
 
 .PHONY: congress-rpm
@@ -245,7 +248,7 @@ $(BUILD_DIR)/overcloud-full.qcow2: congress-rpm tacker-rpm networking-vpp-rpm
 ###############
 
 .PHONY: overcloud-opendaylight
-overcloud-opendaylight: quagga-zrpc $(BUILD_DIR)/overcloud-full-opendaylight.qcow2
+overcloud-opendaylight: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2
 
 $(BUILD_DIR)/overcloud-full-opendaylight.qcow2: $(BUILD_DIR)/overcloud-full.qcow2
        @echo "Building the Apex OpenDaylight Overcloud Image"