summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-08-18 12:20:01 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-18 12:20:01 +0000
commit22e8ced8778bbfcf1f396abf4a829cf0564ba90a (patch)
tree6994e9da5c610771a20de8a6afaf9ff90009a937 /build
parent92ecd83a55059b938ea92bfe0c351621f0826f2c (diff)
parente025c67845061b21b379c721477e93f80e57f4aa (diff)
Merge "Moving rpm spec files to a sub directory"
Diffstat (limited to 'build')
-rw-r--r--build/Makefile34
-rw-r--r--[-rwxr-xr-x]build/rpm_specs/openstack-congress.spec (renamed from build/openstack-congress.spec)0
-rw-r--r--build/rpm_specs/openstack-tacker.spec (renamed from build/openstack-tacker.spec)0
-rw-r--r--build/rpm_specs/opnfv-apex-common.spec (renamed from build/opnfv-apex-common.spec)0
-rw-r--r--build/rpm_specs/opnfv-apex-onos.spec (renamed from build/opnfv-apex-onos.spec)0
-rw-r--r--build/rpm_specs/opnfv-apex-opendaylight-sfc.spec (renamed from build/opnfv-apex-opendaylight-sfc.spec)0
-rw-r--r--build/rpm_specs/opnfv-apex-undercloud.spec (renamed from build/opnfv-apex-undercloud.spec)0
-rw-r--r--build/rpm_specs/opnfv-apex.spec (renamed from build/opnfv-apex.spec)0
-rw-r--r--build/rpm_specs/python-tackerclient.spec (renamed from build/python-tackerclient.spec)0
9 files changed, 17 insertions, 17 deletions
diff --git a/build/Makefile b/build/Makefile
index 0d7cba27..cefe4748 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 | head -n 1 | awk '{ print $$2 }')
+export RPMVERS = $(shell grep Version $(shell pwd)/rpm_specs/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
@@ -50,7 +50,7 @@ opnfv-apex-common.tar.gz:
.PHONY: common-rpm-check
common-rpm-check: opnfv-apex-common.tar.gz
- rpmbuild --clean -bi -bl opnfv-apex-common.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+ rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-common.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
.PHONY: common-rpm
common-rpm: opnfv-apex-common.tar.gz $(RPMCOM)
@@ -58,7 +58,7 @@ common-rpm: opnfv-apex-common.tar.gz $(RPMCOM)
$(RPMCOM):
@echo "Building the Apex Common RPM"
# build the common RPM
- rpmbuild --clean -ba opnfv-apex-common.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+ rpmbuild --clean -ba rpm_specs/opnfv-apex-common.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
##################
# PYTHON TESTS #
@@ -104,7 +104,7 @@ tacker-rpm: openstack-tacker.tar.gz openstack-tacker-2015.2-1.trozet.noarch.rpm
openstack-tacker-2015.2-1.trozet.noarch.rpm:
@echo "Building the Tacker RPM"
- rpmbuild --clean -bb --target noarch openstack-tacker.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)'
+ rpmbuild --clean -bb --target noarch rpm_specs/openstack-tacker.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)'
#################
# TACKERCLIENT #
@@ -126,7 +126,7 @@ tackerclient-rpm: python-tackerclient.tar.gz python-tackerclient-2015.2-1.trozet
python-tackerclient-2015.2-1.trozet.noarch.rpm:
@echo "Building the TackerClient RPM"
- rpmbuild --clean -bb --target noarch python-tackerclient.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)'
+ rpmbuild --clean -bb --target noarch rpm_specs/python-tackerclient.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)'
###############
# CONGRESS #
@@ -149,7 +149,7 @@ congress-rpm: openstack-congress.tar.gz openstack-congress-2016.1-1.noarch.rpm
openstack-congress-2016.1-1.noarch.rpm:
@echo "Building the Congress RPM"
- rpmbuild --clean -bb --target noarch openstack-congress.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)'
+ rpmbuild --clean -bb --target noarch rpm_specs/openstack-congress.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)'
###############
# VPP #
@@ -202,14 +202,14 @@ opnfv-apex-undercloud.tar.gz: images/undercloud.qcow2
.PHONY: undercloud-rpm-check
undercloud-rpm-check: opnfv-apex-undercloud.tar.gz
- rpmbuild --clean -bi -bl opnfv-apex-undercloud.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+ rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-undercloud.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
.PHONY: undercloud-rpm
undercloud-rpm: opnfv-apex-undercloud.tar.gz $(RPMUDR)
$(RPMUDR):
@echo "Building the Apex Undercloud RPM"
- rpmbuild --clean -ba opnfv-apex-undercloud.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+ rpmbuild --clean -ba rpm_specs/opnfv-apex-undercloud.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
###############
# OVERCLOUD #
@@ -247,7 +247,7 @@ opnfv-apex.tar.gz: images/overcloud-full-opendaylight.qcow2
.PHONY: opendaylight-rpm-check
opendaylight-rpm-check: opnfv-apex.tar.gz
- rpmbuild --clean -bi -bl opnfv-apex.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+ rpmbuild --clean -bi -bl rpm_specs/opnfv-apex.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
.PHONY: opendaylight-rpm
opendaylight-rpm: opnfv-apex.tar.gz $(RPMODL)
@@ -255,7 +255,7 @@ opendaylight-rpm: opnfv-apex.tar.gz $(RPMODL)
$(RPMODL):
@echo "Building the Apex OpenDaylight RPM"
# build the overcloud RPM
- rpmbuild --clean -ba opnfv-apex.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+ rpmbuild --clean -ba rpm_specs/opnfv-apex.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
###############
# ONOS #
@@ -276,14 +276,14 @@ images/overcloud-full-onos.qcow2: images/overcloud-full.qcow2
.PHONY: onos-rpm-clean
onos-rpm-clean:
- @rpmbuild --clean opnfv-apex-onos.spec -D "release $(shell echo $RELEASE | tr -d '_-')"
+ @rpmbuild --clean rpm_specs/opnfv-apex-onos.spec -D "release $(shell echo $RELEASE | tr -d '_-')"
opnfv-apex-onos.tar.gz: images/overcloud-full-onos.qcow2
tar -czf opnfv-apex-onos.tar.gz --xform="s:images/overcloud-full-onos.qcow2:opnfv-apex-onos-$(RPMVERS)/build/images/overcloud-full-onos.qcow2:" images/overcloud-full-onos.qcow2
.PHONY: onos-rpm-check
onos-rpm-check: opnfv-apex-onos.tar.gz
- rpmbuild --clean -bi -bl opnfv-apex-onos.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+ rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-onos.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
.PHONY: onos-rpm
onos-rpm: opnfv-apex-onos.tar.gz $(RPMONO)
@@ -291,7 +291,7 @@ onos-rpm: opnfv-apex-onos.tar.gz $(RPMONO)
$(RPMONO):
@echo "Building the Apex ONOS RPM"
# build the overcloud RPM
- rpmbuild --clean -ba opnfv-apex-onos.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+ rpmbuild --clean -ba rpm_specs/opnfv-apex-onos.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
###############
# ODL-SFC #
@@ -313,14 +313,14 @@ opnfv-apex-opendaylight-sfc.tar.gz: images/overcloud-full-opendaylight-sfc.qcow2
.PHONY: opendaylight-sfc-rpm-check
opendaylight-sfc-rpm-check: opnfv-apex-opendaylight-sfc.tar.gz
- rpmbuild --clean -bi -bl opnfv-apex-opendaylight-sfc.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+ rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-opendaylight-sfc.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
.PHONY: opendaylight-sfc-rpm
opendaylight-sfc-rpm: opnfv-apex-opendaylight-sfc.tar.gz $(RPMSFC)
$(RPMSFC):
@echo "Building the Apex OpenDaylight SFC RPM"
- rpmbuild --clean -ba opnfv-apex-opendaylight-sfc.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+ rpmbuild --clean -ba rpm_specs/opnfv-apex-opendaylight-sfc.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
###############
# ISO #
@@ -381,9 +381,9 @@ 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 python-jinja2-2.8-5.fc24.src.rpm
diff --git a/build/openstack-congress.spec b/build/rpm_specs/openstack-congress.spec
index 0dd3491c..0dd3491c 100755..100644
--- a/build/openstack-congress.spec
+++ b/build/rpm_specs/openstack-congress.spec
diff --git a/build/openstack-tacker.spec b/build/rpm_specs/openstack-tacker.spec
index b4c9adaa..b4c9adaa 100644
--- a/build/openstack-tacker.spec
+++ b/build/rpm_specs/openstack-tacker.spec
diff --git a/build/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index 6b86bf87..6b86bf87 100644
--- a/build/opnfv-apex-common.spec
+++ b/build/rpm_specs/opnfv-apex-common.spec
diff --git a/build/opnfv-apex-onos.spec b/build/rpm_specs/opnfv-apex-onos.spec
index e99bfa9a..e99bfa9a 100644
--- a/build/opnfv-apex-onos.spec
+++ b/build/rpm_specs/opnfv-apex-onos.spec
diff --git a/build/opnfv-apex-opendaylight-sfc.spec b/build/rpm_specs/opnfv-apex-opendaylight-sfc.spec
index a63ec7c5..a63ec7c5 100644
--- a/build/opnfv-apex-opendaylight-sfc.spec
+++ b/build/rpm_specs/opnfv-apex-opendaylight-sfc.spec
diff --git a/build/opnfv-apex-undercloud.spec b/build/rpm_specs/opnfv-apex-undercloud.spec
index 7b688b55..7b688b55 100644
--- a/build/opnfv-apex-undercloud.spec
+++ b/build/rpm_specs/opnfv-apex-undercloud.spec
diff --git a/build/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec
index acc8a53e..acc8a53e 100644
--- a/build/opnfv-apex.spec
+++ b/build/rpm_specs/opnfv-apex.spec
diff --git a/build/python-tackerclient.spec b/build/rpm_specs/python-tackerclient.spec
index 72cbf629..72cbf629 100644
--- a/build/python-tackerclient.spec
+++ b/build/rpm_specs/python-tackerclient.spec