diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-05-22 09:56:50 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-05-22 10:02:49 -0400 |
| commit | dc55f3a5bc343802bc60cd901ef8adcbafd3fe33 (patch) | |
| tree | ff167ffa3ee93f515b4c8aa1d59f13801b300a6f | |
| parent | 96d6db26ad1f31ef5790e5cc0904361712598c77 (diff) | |
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>
| -rw-r--r-- | build/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/Makefile b/build/Makefile index 9b98f200..a446cc52 100644 --- 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 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 @@ -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 -apex-rpm: $(BUILD_DIR)/opnfv-apex.tar.gz $(RPMCOM) +rpm: $(BUILD_DIR)/opnfv-apex.tar.gz $(RPMCOM) $(RPMCOM): @echo "Building the Apex RPM" |