From 76f3ee71b675cd7680598551e4de2eb361c35a99 Mon Sep 17 00:00:00 2001 From: Mike Marchetti Date: Fri, 5 Oct 2018 14:06:23 -0400 Subject: [PATCH 1/1] Fixes for building on v4.0 Signed-off-by: Mike Marchetti Change-Id: I3f24280ee0cc745a512e8879990f2dfa86d0feda --- Makefile | 1 + devops-stages/stage-build.sh | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8e0da21c..75481009 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,7 @@ lib-openvim: osm-im: $(shell git clone https://osm.etsi.org/gerrit/osm/IM) + git -C IM checkout $(BRANCH) make -C IM clean all package: prepare diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh index 25de71a7..bccf9ae4 100755 --- a/devops-stages/stage-build.sh +++ b/devops-stages/stage-build.sh @@ -1,4 +1,4 @@ #!/bin/sh -make clean all BRANCH=master +make clean all BRANCH=v4.0 #make install && \ #make test diff --git a/setup.py b/setup.py index 4fa32736..c1d91ac2 100755 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ _requirements = [ ] setup(name=_name, - version_command=('git describe', 'pep440-git'), + version_command=('git describe --match v* --tags --long --dirty', 'pep440-git-full'), description = _description, long_description = open('README.rst').read(), author = _author, -- 2.25.1