Fixes for building on v4.0
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
Change-Id: I3f24280ee0cc745a512e8879990f2dfa86d0feda
diff --git a/Makefile b/Makefile
index 8e0da21..7548100 100644
--- a/Makefile
+++ b/Makefile
@@ -61,6 +61,7 @@
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 25de71a..bccf9ae 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 4fa3273..c1d91ac 100755
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@
]
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,