X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2FMakefile;h=ed983256d48d880a352a51c2c7fb68ddbacb1218;hb=refs%2Fchanges%2F21%2F35421%2F5;hp=b81ddd3d070be8ef043ce64e25102ae467bda0cc;hpb=51dae541542e7434a34fc2468810c4470afe8f34;p=apex.git diff --git a/build/Makefile b/build/Makefile index b81ddd3d..ed983256 100644 --- a/build/Makefile +++ b/build/Makefile @@ -60,17 +60,14 @@ 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: @@ -331,7 +328,6 @@ iso: iso-clean images rpms $(CENTISO) @ln $(RPMCOM) $(BUILD_DIR)/centos/Packages @ln $(RPMUDR) $(BUILD_DIR)/centos/Packages @ln $(RPMODL) $(BUILD_DIR)/centos/Packages - @ln $(RPMONO) $(BUILD_DIR)/centos/Packages # add packages to the centos packages cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch openstack-tripleo jq python34 python34-libs python34-yaml python34-setuptools ipxe-roms-qemu cd $(BUILD_DIR)/centos/Packages && curl -O https://radez.fedorapeople.org/python34-markupsafe-0.23-9.el7.centos.x86_64.rpm