X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2FMakefile;h=8a498a662e220c34272aee197243fca4ec43bc3a;hb=refs%2Fchanges%2F91%2F12191%2F1;hp=e7def26fa14343a0e2647ebb46c4bfbf71444b8b;hpb=48d62412ec1e2302edae13e3eee15d1f38c2ab7b;p=apex.git diff --git a/build/Makefile b/build/Makefile index e7def26f..8a498a66 100644 --- a/build/Makefile +++ b/build/Makefile @@ -12,7 +12,7 @@ export CENTDNLD = http://mirrors.cat.pdx.edu/centos/7.2.1511/isos/x86_64/CentOS- export CENTISO = $(shell pwd)/$(shell basename $(CENTDNLD)) export RELEASE = "0" export ISO = $(shell pwd)/release/OPNFV-CentOS-7-x86_64-${RELEASE}.iso -export RPMVERS = $(shell grep Version $(shell pwd)/opnfv-apex.spec | awk '{ print $$2 }') +export RPMVERS = $(shell grep Version $(shell pwd)/opnfv-apex.spec | head -n 1 | awk '{ print $$2 }') export RPMCOM = $(shell pwd)/noarch/opnfv-apex-common-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm export RPMUDR = $(shell pwd)/noarch/opnfv-apex-undercloud-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm export RPMODL = $(shell pwd)/noarch/opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm @@ -239,7 +239,7 @@ iso: iso-clean images rpms $(CENTISO) @ln $(RPMODL) centos/Packages @ln $(RPMONO) centos/Packages @ln $(RPMSFC) centos/Packages - cd centos/Packages && yumdownloader openvswitch && yumdownloader openstack-tripleo + cd centos/Packages && yumdownloader openvswitch && yumdownloader openstack-tripleo && yumdownloader jq # regenerate yum repo data @echo "Generating new yum metadata" createrepo --update -g ../c7-opnfv-x86_64-comps.xml centos