From: hoban <adrian.hoban@intel.com>
Date: Mon, 25 Sep 2017 10:43:34 +0000 (+0200)
Subject: Merge changes I3b2a87cd,If344b5e0
X-Git-Tag: v3.0.0rc02~2
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=commitdiff_plain;h=d6ccaf7e0a66331e9be1046642868f84e7184a31;hp=e27e0b2fcd1d2278a5f82dc8b090aa8bcd0177b0

Merge changes I3b2a87cd,If344b5e0

* changes:
  Adding pyang folder to .gitignore
  Support of pyang debian package generation
---

diff --git a/.gitignore b/.gitignore
index 5fecc9a..0025eee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,6 @@ dist
 *.gz
 osm_im
 pyangbind
+pyang
 dists
 pool
diff --git a/Makefile b/Makefile
index 396956c..b606e30 100644
--- a/Makefile
+++ b/Makefile
@@ -52,12 +52,16 @@ $(RW_PB_EXT):
 package:
 	tox -e build
 
-pyangbind:
+pyangbind: pyang
 	git clone https://github.com/robshakir/pyangbind
 	cd pyangbind; python setup.py --command-packages=stdeb.command bdist_deb; cd ..
 
+pyang:
+	git clone https://github.com/mbj4668/pyang
+	cd pyang; python setup.py --command-packages=stdeb.command bdist_deb; cd ..
+
 pyang-json-schema-plugin:
 	git clone https://github.com/cmoberg/pyang-json-schema-plugin
 
 clean:
-	$(Q)rm -rf build dist osm_im.egg-info deb deb_dist *.gz pyangbind pyang-json-schema-plugin $(OUT_DIR)
+	$(Q)rm -rf build dist osm_im.egg-info deb deb_dist *.gz pyang pyangbind pyang-json-schema-plugin $(OUT_DIR)
diff --git a/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh
index 9640bac..c696ce6 100755
--- a/devops-stages/stage-archive.sh
+++ b/devops-stages/stage-archive.sh
@@ -6,6 +6,7 @@ rm -rf dists
 mkdir -p pool/$MDG
 mv deb_dist/*.deb pool/$MDG/
 mv pyangbind/deb_dist/*.deb pool/$MDG/
+mv pyang/deb_dist/*.deb pool/$MDG/
 
 mkdir -p dists/unstable/$MDG/binary-amd64/
 apt-ftparchive packages pool/$MDG > dists/unstable/$MDG/binary-amd64/Packages
diff --git a/setup.py b/setup.py
index ce3d5d6..6cfe17b 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ setup(
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
-        #'pyangbind'
+        'pyangbind'
     ],
     setup_requires=['setuptools-version-command'],
     test_suite='nose.collector',