summaryrefslogtreecommitdiffstats
path: root/build/Makefile
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2017-05-11 16:14:29 -0400
committerDan Radez <dradez@redhat.com>2017-05-17 16:40:09 -0400
commit3fe04fbdbfdbf7d362c45e615e8526285670e8c9 (patch)
tree707e47e3ac933c150d7215bc48526b1c8b225f6e /build/Makefile
parentb411839804e6fca023ef7a695bbb616ea80fd6f3 (diff)
dep updates related to removing openstack-tripleo
- configure-vm requires libvirt-python - removing some references to openstack-tripleo - updating dep urls to artifacts.opnfv.org JIRA: APEX-462 Change-Id: I5ed7f7ad2f2c016fcbc1157b29c2c0e4c5d9b4a7 Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'build/Makefile')
-rw-r--r--build/Makefile34
1 files changed, 1 insertions, 33 deletions
diff --git a/build/Makefile b/build/Makefile
index 1d329fb5..ffd5f46e 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -271,9 +271,7 @@ iso: iso-clean images rpms $(CENTISO)
@ln $(RPMUDR) $(BUILD_DIR)/centos/Packages
@ln $(RPMODL) $(BUILD_DIR)/centos/Packages
# add packages to the centos packages
- cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch openstack-tripleo jq python34 python34-libs python34-PyYAML 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
- cd $(BUILD_DIR)/centos/Packages && curl -O https://radez.fedorapeople.org/python3-jinja2-2.8-5.el7.centos.noarch.rpm
+ cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch jq python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu python34-jinja2 python34-markupsafe
cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.noarch.rpm
# regenerate yum repo data
@echo "Generating new yum metadata"
@@ -284,36 +282,6 @@ iso: iso-clean images rpms $(CENTISO)
isohybrid $(ISO)
@printf "\n\nISO is built at $(ISO)\n\n"
-####################
-# python3-jinja2 #
-####################
-
-.PHONY: python3-jinja2
-python3-jinja2: python3-markupsafe
- cd $(BUILD_DIR) \
- && curl -O -L artifacts.opnfv.org/apex/dependencies/python-jinja2-2.8-5.fc24.src.rpm \
- && rpm2cpio python-jinja2-2.8-5.fc24.src.rpm | cpio -idmv \
- && sed -i 's/python3-devel/python34-devel/' python-jinja2.spec \
- && sed -i 's/python3-setuptools/python34-setuptools/' python-jinja2.spec \
- && sed -i 's/python3-pytest/python34-pytest/' python-jinja2.spec \
- && sed -i 's/python3-markupsafe/python34-markupsafe/' python-jinja2.spec \
- && rpmbuild -ba python-jinja2.spec $(RPM_DIR_ARGS) -D "with_python3 1"
-
-########################
-# python3-markupsafe #
-########################
-
-.PHONY: python3-markupsafe
-python3-markupsafe:
- cd $(BUILD_DIR) \
- && curl -O -L artifacts.opnfv.org/apex/dependencies/python-markupsafe-0.23-9.fc24.src.rpm \
- && rpm2cpio python-markupsafe-0.23-9.fc24.src.rpm | cpio -idmv \
- && sed -i 's/python3-devel/python34-devel/' python-markupsafe.spec \
- && sed -i 's/python3-setuptools/python34-setuptools/' python-markupsafe.spec \
- && sed -i 's/python3-pytest/python34-pytest/' python-markupsafe.spec \
- && sed -i 's/python3-markupsafe/python34-markupsafe/' python-markupsafe.spec \
- && rpmbuild -ba python-markupsafe.spec $(RPM_DIR_ARGS) -D "with_python3 1"
-
##################
# Quagga Clean #
##################