Fix RPM build

networking-vpp was referencing variables from the old variables.sh.
Moving those values into the Makefile as the variables.sh file was
removed.

Change-Id: I8ef5e6988299e7e3855d442657db2ed20086689f
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/build/Makefile b/build/Makefile
index 9b98f20..a446cc5 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -20,8 +20,8 @@ export RPM_DIR_ARGS = -D '_topdir $(BUILD_DIR)' -D '_builddir $(BUILD_DIR)' -D '
 export RPMCOM = $(BUILD_DIR)/noarch/python34-opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
 
 export NETVPP_VERS := $(shell grep Version $(shell pwd)/rpm_specs/networking-vpp.spec | head -n 1 | awk '{ print $$2 }')
 export RPMCOM = $(BUILD_DIR)/noarch/python34-opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
 
 export NETVPP_VERS := $(shell grep Version $(shell pwd)/rpm_specs/networking-vpp.spec | head -n 1 | awk '{ print $$2 }')

-export NETVPP_REPO := $(shell awk -F\= '/^netvpp_repo/ {print $$2}' variables.sh )
-export NETVPP_BRANCH := $(shell awk -F\= '/^netvpp_branch/ {print $$2}' variables.sh )
+export NETVPP_REPO := "https://github.com/fepan/networking-vpp"
+export NETVPP_BRANCH := "test-fdio-fix"

 export NETVPP_COMMIT := $(shell git ls-remote $(NETVPP_REPO) $(NETVPP_BRANCH) | awk '{print substr($$1,1,7)}')
 
 .PHONY: all
 export NETVPP_COMMIT := $(shell git ls-remote $(NETVPP_REPO) $(NETVPP_BRANCH) | awk '{print substr($$1,1,7)}')
 
 .PHONY: all


@@ -52,7 +52,7 @@ apex-rpm-check: $(BUILD_DIR)/opnfv-apex.tar.gz
        rpmbuild --clean -bi -bl rpm_specs/opnfv-apex.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')"
 
 .PHONY: rpm
        rpmbuild --clean -bi -bl rpm_specs/opnfv-apex.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')"
 
 .PHONY: rpm

-apex-rpm: $(BUILD_DIR)/opnfv-apex.tar.gz $(RPMCOM)
+rpm: $(BUILD_DIR)/opnfv-apex.tar.gz $(RPMCOM)

 
 $(RPMCOM):
        @echo "Building the Apex RPM"
 
 $(RPMCOM):
        @echo "Building the Apex RPM"