Updates sol006 branch with master

[osm/IM.git] / Makefile

diff --git a/Makefile b/Makefile
index ab9550a..c158738 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,6 @@ yang2swagger:
 
 package:
        tox -e build
-       tox -e build3
        ./build-docs.sh
 
 deps:
@@ -113,7 +112,7 @@ deps:
        $(Q)sudo -H python3 -m pip install -U pyang pyangbind stdeb
        $(Q)sudo -H python2 -m pip install -U pyang pyangbind stdeb
        $(Q)mkdir -p ~/.m2
-       $(Q)cp -n ~/.m2/settings.xml{,.orig} ; wget -q -O - https://raw.githubusercontent.com/opendaylight/odlparent/master/settings.xml > ~/.m2/settings.xml
+       $(Q)cp -n ~/.m2/settings.xml ~/.m2/settings.xml.orig ; wget -q -O - https://raw.githubusercontent.com/opendaylight/odlparent/master/settings.xml > ~/.m2/settings.xml
 
 sol006_deps:
        $(Q)git clone --single-branch --branch v2.6.1 https://forge.etsi.org/rep/nfv/SOL006.git sol006_model