From 6c6f90b3ad763c229fe75ae2a9b3f673f84382da Mon Sep 17 00:00:00 2001 From: "Mark D. Gray" Date: Thu, 7 Jan 2016 15:23:03 +0000 Subject: f_ovsnfv-dpdk-pluginbuild: Update repo location The code for fuel-plugin-ovsnfv has been moved to the ovsnfv OPNFV project repository. This patch updates the OPNFV fuel plugin builder to use this location. Change-Id: Ida1640ea6005aa1f4b31be145913556d6b05aa6e Signed-off-by: Mark D. Gray (cherry picked from commit 42d1a8174af0f2081a9de76c798ee2b081cc0686) --- build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile') diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile index 6b76fbe50..70fd22409 100644 --- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile +++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile @@ -37,15 +37,16 @@ release:.ovsnfvbuild @rm -rf fuel-plugin-ovsnfv sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev sudo pip install fuel-plugin-builder - git clone $(OVSNFV_DPDK_REPO) - cd fuel-plugin-ovsnfv; \ + git clone $(OVSNFV_DPDK_REPO) ovsnfv + cd ovsnfv; \ git checkout $(OVSNFV_DPDK_BRANCH); \ if [ ! -z $(OVSNFV_DPDK_CHANGE) ]; then \ git fetch $(OVSNFV_DPDK_REPO) $(OVSNFV_DPDK_CHANGE); \ git checkout FETCH_HEAD; \ fi - INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-ovsnfv/ - @mv fuel-plugin-ovsnfv/fuel-plugin-ovsnfv*.rpm . + cd ovsnfv; \ + INCLUDE_DEPENDENCIES=true fpb --debug --build $(OVSNFV_DPDK_DIR) + @mv ovsnfv/$(OVSNFV_DPDK_DIR)/fuel-plugin-ovsnfv*.rpm . $(REPOINFO) -r . > gitinfo_ovsnfv-dpdk-plugin.txt @rm -rf fuel-plugin-ovsnfv @touch .ovsnfvbuild -- cgit 1.2.3-korg