diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-11-28 15:14:11 -0500 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2016-12-22 08:58:53 -0500 |
| commit | 93aba2bc54c77f14ff77c78be4da0f7d5131162e (patch) | |
| tree | edf0b760d98bb9847c0d82af06552cea708760a3 /build/Makefile | |
| parent | 66ca37b6205d256454f2f1973de32ed7fa062902 (diff) | |
Updating Congress version to Newton
- Congress is not in THT now so this will not install yet
- Removing doctor driver sideload in build
The doctor driver is upstream in Newton. No need to side load the
driver into the congress codebase anymore.
- moving to upstream puppet module
Change-Id: Ia60d7d33039dddda634cb5485a3c40ce6ec2b261
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'build/Makefile')
| -rw-r--r-- | build/Makefile | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/build/Makefile b/build/Makefile index 30af162b..af84ea85 100644 --- a/build/Makefile +++ b/build/Makefile @@ -162,17 +162,21 @@ $(BUILD_DIR)/noarch/python-tackerclient-2016.2-1.git$(TACKERCLIENT_COMMIT).noarc # CONGRESS # ############### +.PHONY: congress-clean +congress-clean: + @rm -rf $(BUILD_DIR)/openstack-congress-2016.2 + @rm -f $(BUILD_DIR)/openstack-congress.tar.gz + $(BUILD_DIR)/openstack-congress.tar.gz: @echo "Preparing the Congress RPM prerequisites" - git clone $(CONGRESS_REPO) -b $(CONGRESS_BRANCH) $(BUILD_DIR)/openstack-congress-2016.1 - cd $(BUILD_DIR)/openstack-congress-2016.1 && curl -O https://radez.fedorapeople.org/openstack-congress.service - tar czf $(BUILD_DIR)/openstack-congress.tar.gz -C $(BUILD_DIR) openstack-congress-2016.1 + 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 + tar czf $(BUILD_DIR)/openstack-congress.tar.gz -C $(BUILD_DIR) openstack-congress-2016.2 .PHONY: congress-rpm -congress-rpm: $(BUILD_DIR)/openstack-congress.tar.gz $(BUILD_DIR)/noarch/openstack-congress-2016.1-1.git$(CONGRESS_COMMIT).noarch.rpm - +congress-rpm: $(BUILD_DIR)/noarch/openstack-congress-2016.2-1.git$(CONGRESS_COMMIT).noarch.rpm -$(BUILD_DIR)/noarch/openstack-congress-2016.1-1.git$(CONGRESS_COMMIT).noarch.rpm: +$(BUILD_DIR)/noarch/openstack-congress-2016.2-1.git$(CONGRESS_COMMIT).noarch.rpm: $(BUILD_DIR)/openstack-congress.tar.gz @echo "Building the Congress RPM" rpmbuild --clean -ba --target noarch rpm_specs/openstack-congress.spec $(RPM_DIR_ARGS) -D 'git .git$(CONGRESS_COMMIT)' |