From 1f4ff4e95155b5dda8538d45b59f437164f8d7b6 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Thu, 17 Sep 2020 01:25:37 +0000
Subject: [PATCH 1/9] Update dependencies in setup.py

---
 setup.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/setup.py b/setup.py
index 23a07f7e2d..e40d9f367b 100644
--- a/setup.py
+++ b/setup.py
@@ -151,21 +151,18 @@
             'watchdogutil = watchdogutil.main:watchdogutil',
         ]
     },
-    # NOTE: sonic-utilities also depends on other packages that are either only
-    # available as .whl files or the latest available Debian packages are
-    # out-of-date and we must install newer versions via pip. These
-    # dependencies cannot be listed here, as this package is built as a .deb,
-    # therefore all dependencies will be assumed to also be available as .debs.
-    # These unlistable dependencies are as follows:
-    # - sonic-config-engine
-    # - sonic-py-common
-    # - sonic-py-swsssdk
-    # - tabulate
     install_requires=[
         'click',
         'ipaddress',
+        'jsondiff==1.2.0',
+        'm2crypto',
         'natsort',
-        'm2crypto'
+        'pexpect',
+        'sonic-config-engine',
+        'sonic-py-common',
+        'swsssdk>=2.0.1',
+        'tabulate==0.8.2',
+        'xmltodict==0.12.0'
     ],
     setup_requires= [
         'pytest-runner'

From b10031716865261acf5627f1f379c8df8817aced Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Thu, 17 Sep 2020 02:14:36 +0000
Subject: [PATCH 2/9] Create sonic-utilities-data Debian package

---
 setup.py                                      |  5 -----
 sonic-utilities-data/.gitignore               |  7 +++++++
 sonic-utilities-data/LICENSE                  | 15 +++++++++++++++
 sonic-utilities-data/MAINTAINERS              |  7 +++++++
 sonic-utilities-data/Makefile                 | 19 +++++++++++++++++++
 sonic-utilities-data/README.md                |  4 ++++
 .../src}/bash_completion.d/acl-loader         |  0
 .../src}/bash_completion.d/config             |  0
 .../src}/bash_completion.d/connect            |  0
 .../src}/bash_completion.d/consutil           |  0
 .../src}/bash_completion.d/counterpoll        |  0
 .../src}/bash_completion.d/crm                |  0
 .../src}/bash_completion.d/debug              |  0
 .../src}/bash_completion.d/fwutil             |  0
 .../src}/bash_completion.d/pddf_fanutil       |  0
 .../src}/bash_completion.d/pddf_ledutil       |  0
 .../src}/bash_completion.d/pddf_psuutil       |  0
 .../src}/bash_completion.d/pddf_thermalutil   |  0
 .../src}/bash_completion.d/pfc                |  0
 .../src}/bash_completion.d/pfcwd              |  0
 .../src}/bash_completion.d/psuutil            |  0
 .../src}/bash_completion.d/sfputil            |  0
 .../src}/bash_completion.d/show               |  0
 .../src}/bash_completion.d/sonic-clear        |  0
 .../src}/bash_completion.d/sonic-installer    |  0
 .../src}/bash_completion.d/sonic_installer    |  0
 .../src}/bash_completion.d/undebug            |  0
 sonic-utilities-data/src/debian/changelog     |  5 +++++
 sonic-utilities-data/src/debian/compat        |  1 +
 sonic-utilities-data/src/debian/control       | 11 +++++++++++
 sonic-utilities-data/src/debian/copyright     |  0
 sonic-utilities-data/src/debian/install       |  2 ++
 sonic-utilities-data/src/debian/rules         |  6 ++++++
 .../src}/templates/sonic-environment.j2       |  0
 34 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 sonic-utilities-data/.gitignore
 create mode 100644 sonic-utilities-data/LICENSE
 create mode 100644 sonic-utilities-data/MAINTAINERS
 create mode 100644 sonic-utilities-data/Makefile
 create mode 100644 sonic-utilities-data/README.md
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/acl-loader (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/config (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/connect (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/consutil (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/counterpoll (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/crm (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/debug (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/fwutil (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/pddf_fanutil (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/pddf_ledutil (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/pddf_psuutil (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/pddf_thermalutil (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/pfc (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/pfcwd (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/psuutil (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/sfputil (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/show (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/sonic-clear (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/sonic-installer (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/sonic_installer (100%)
 rename {data/etc => sonic-utilities-data/src}/bash_completion.d/undebug (100%)
 create mode 100644 sonic-utilities-data/src/debian/changelog
 create mode 100644 sonic-utilities-data/src/debian/compat
 create mode 100644 sonic-utilities-data/src/debian/control
 create mode 100644 sonic-utilities-data/src/debian/copyright
 create mode 100644 sonic-utilities-data/src/debian/install
 create mode 100755 sonic-utilities-data/src/debian/rules
 rename {sonic_installer => sonic-utilities-data/src}/templates/sonic-environment.j2 (100%)

diff --git a/setup.py b/setup.py
index e40d9f367b..cb6df6b3c9 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,6 @@
     pkg_resources.require('fastentrypoints')
     import fastentrypoints
 
-import glob
 from setuptools import setup
 
 setup(
@@ -118,10 +117,6 @@
         'scripts/watermarkcfg',
         'scripts/sonic-kdump-config'
     ],
-    data_files=[
-        ('/etc/bash_completion.d', glob.glob('data/etc/bash_completion.d/*')),
-        ('/usr/share/sonic/templates', ['sonic_installer/templates/sonic-environment.j2']),
-    ],
     entry_points={
         'console_scripts': [
             'acl-loader = acl_loader.main:cli',
diff --git a/sonic-utilities-data/.gitignore b/sonic-utilities-data/.gitignore
new file mode 100644
index 0000000000..a692abe033
--- /dev/null
+++ b/sonic-utilities-data/.gitignore
@@ -0,0 +1,7 @@
+src/debian/*
+!src/debian/changelog
+!src/debian/compat
+!src/debian/control
+!src/debian/copyright
+!src/debian/install
+!src/debian/rules
diff --git a/sonic-utilities-data/LICENSE b/sonic-utilities-data/LICENSE
new file mode 100644
index 0000000000..6e2e81a75f
--- /dev/null
+++ b/sonic-utilities-data/LICENSE
@@ -0,0 +1,15 @@
+Copyright (C) 2020 Microsoft
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
diff --git a/sonic-utilities-data/MAINTAINERS b/sonic-utilities-data/MAINTAINERS
new file mode 100644
index 0000000000..fde1eede32
--- /dev/null
+++ b/sonic-utilities-data/MAINTAINERS
@@ -0,0 +1,7 @@
+# This file describes the maintainers for sonic-device-data
+# See the SONiC project governance document for more information
+
+Name = "Joe LeVeque"
+Email = "jolevequ@microsoft.com"
+Github = jleveque
+Mailinglist = sonicproject@googlegroups.com
diff --git a/sonic-utilities-data/Makefile b/sonic-utilities-data/Makefile
new file mode 100644
index 0000000000..dca82cb344
--- /dev/null
+++ b/sonic-utilities-data/Makefile
@@ -0,0 +1,19 @@
+.ONESHELL:
+SHELL = /bin/bash
+.SHELLFLAGS += -e
+
+MAIN_TARGET = sonic-utilities-data_1.0-1_all.deb
+
+$(MAIN_TARGET):
+	pushd ./src
+
+	# Build the package
+	dpkg-buildpackage -rfakeroot -b -us -uc
+
+	popd
+
+clean:
+	pushd ./src
+	dpkg-buildpackage -rfakeroot -Tclean
+	popd
+	rm -rf $(MAIN_TARGET) *.buildinfo *.changes
diff --git a/sonic-utilities-data/README.md b/sonic-utilities-data/README.md
new file mode 100644
index 0000000000..1872377317
--- /dev/null
+++ b/sonic-utilities-data/README.md
@@ -0,0 +1,4 @@
+# sonic-utilities-data
+Data files required for sonic-utilities
+
+See the [SONiC Website](http://azure.github.io/SONiC/) for more information about the SONiC project.
diff --git a/data/etc/bash_completion.d/acl-loader b/sonic-utilities-data/src/bash_completion.d/acl-loader
similarity index 100%
rename from data/etc/bash_completion.d/acl-loader
rename to sonic-utilities-data/src/bash_completion.d/acl-loader
diff --git a/data/etc/bash_completion.d/config b/sonic-utilities-data/src/bash_completion.d/config
similarity index 100%
rename from data/etc/bash_completion.d/config
rename to sonic-utilities-data/src/bash_completion.d/config
diff --git a/data/etc/bash_completion.d/connect b/sonic-utilities-data/src/bash_completion.d/connect
similarity index 100%
rename from data/etc/bash_completion.d/connect
rename to sonic-utilities-data/src/bash_completion.d/connect
diff --git a/data/etc/bash_completion.d/consutil b/sonic-utilities-data/src/bash_completion.d/consutil
similarity index 100%
rename from data/etc/bash_completion.d/consutil
rename to sonic-utilities-data/src/bash_completion.d/consutil
diff --git a/data/etc/bash_completion.d/counterpoll b/sonic-utilities-data/src/bash_completion.d/counterpoll
similarity index 100%
rename from data/etc/bash_completion.d/counterpoll
rename to sonic-utilities-data/src/bash_completion.d/counterpoll
diff --git a/data/etc/bash_completion.d/crm b/sonic-utilities-data/src/bash_completion.d/crm
similarity index 100%
rename from data/etc/bash_completion.d/crm
rename to sonic-utilities-data/src/bash_completion.d/crm
diff --git a/data/etc/bash_completion.d/debug b/sonic-utilities-data/src/bash_completion.d/debug
similarity index 100%
rename from data/etc/bash_completion.d/debug
rename to sonic-utilities-data/src/bash_completion.d/debug
diff --git a/data/etc/bash_completion.d/fwutil b/sonic-utilities-data/src/bash_completion.d/fwutil
similarity index 100%
rename from data/etc/bash_completion.d/fwutil
rename to sonic-utilities-data/src/bash_completion.d/fwutil
diff --git a/data/etc/bash_completion.d/pddf_fanutil b/sonic-utilities-data/src/bash_completion.d/pddf_fanutil
similarity index 100%
rename from data/etc/bash_completion.d/pddf_fanutil
rename to sonic-utilities-data/src/bash_completion.d/pddf_fanutil
diff --git a/data/etc/bash_completion.d/pddf_ledutil b/sonic-utilities-data/src/bash_completion.d/pddf_ledutil
similarity index 100%
rename from data/etc/bash_completion.d/pddf_ledutil
rename to sonic-utilities-data/src/bash_completion.d/pddf_ledutil
diff --git a/data/etc/bash_completion.d/pddf_psuutil b/sonic-utilities-data/src/bash_completion.d/pddf_psuutil
similarity index 100%
rename from data/etc/bash_completion.d/pddf_psuutil
rename to sonic-utilities-data/src/bash_completion.d/pddf_psuutil
diff --git a/data/etc/bash_completion.d/pddf_thermalutil b/sonic-utilities-data/src/bash_completion.d/pddf_thermalutil
similarity index 100%
rename from data/etc/bash_completion.d/pddf_thermalutil
rename to sonic-utilities-data/src/bash_completion.d/pddf_thermalutil
diff --git a/data/etc/bash_completion.d/pfc b/sonic-utilities-data/src/bash_completion.d/pfc
similarity index 100%
rename from data/etc/bash_completion.d/pfc
rename to sonic-utilities-data/src/bash_completion.d/pfc
diff --git a/data/etc/bash_completion.d/pfcwd b/sonic-utilities-data/src/bash_completion.d/pfcwd
similarity index 100%
rename from data/etc/bash_completion.d/pfcwd
rename to sonic-utilities-data/src/bash_completion.d/pfcwd
diff --git a/data/etc/bash_completion.d/psuutil b/sonic-utilities-data/src/bash_completion.d/psuutil
similarity index 100%
rename from data/etc/bash_completion.d/psuutil
rename to sonic-utilities-data/src/bash_completion.d/psuutil
diff --git a/data/etc/bash_completion.d/sfputil b/sonic-utilities-data/src/bash_completion.d/sfputil
similarity index 100%
rename from data/etc/bash_completion.d/sfputil
rename to sonic-utilities-data/src/bash_completion.d/sfputil
diff --git a/data/etc/bash_completion.d/show b/sonic-utilities-data/src/bash_completion.d/show
similarity index 100%
rename from data/etc/bash_completion.d/show
rename to sonic-utilities-data/src/bash_completion.d/show
diff --git a/data/etc/bash_completion.d/sonic-clear b/sonic-utilities-data/src/bash_completion.d/sonic-clear
similarity index 100%
rename from data/etc/bash_completion.d/sonic-clear
rename to sonic-utilities-data/src/bash_completion.d/sonic-clear
diff --git a/data/etc/bash_completion.d/sonic-installer b/sonic-utilities-data/src/bash_completion.d/sonic-installer
similarity index 100%
rename from data/etc/bash_completion.d/sonic-installer
rename to sonic-utilities-data/src/bash_completion.d/sonic-installer
diff --git a/data/etc/bash_completion.d/sonic_installer b/sonic-utilities-data/src/bash_completion.d/sonic_installer
similarity index 100%
rename from data/etc/bash_completion.d/sonic_installer
rename to sonic-utilities-data/src/bash_completion.d/sonic_installer
diff --git a/data/etc/bash_completion.d/undebug b/sonic-utilities-data/src/bash_completion.d/undebug
similarity index 100%
rename from data/etc/bash_completion.d/undebug
rename to sonic-utilities-data/src/bash_completion.d/undebug
diff --git a/sonic-utilities-data/src/debian/changelog b/sonic-utilities-data/src/debian/changelog
new file mode 100644
index 0000000000..a296f8afe4
--- /dev/null
+++ b/sonic-utilities-data/src/debian/changelog
@@ -0,0 +1,5 @@
+sonic-utilities-data (1.0-1) UNRELEASED; urgency=low
+
+  * Initial release. (Closes: #XXXXXX)
+
+ -- Joe LeVeque <jolevequ@microsoft.com>  Thu, 17 Sep 2020 01:48:49 +0000
diff --git a/sonic-utilities-data/src/debian/compat b/sonic-utilities-data/src/debian/compat
new file mode 100644
index 0000000000..ec635144f6
--- /dev/null
+++ b/sonic-utilities-data/src/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/sonic-utilities-data/src/debian/control b/sonic-utilities-data/src/debian/control
new file mode 100644
index 0000000000..02114427d6
--- /dev/null
+++ b/sonic-utilities-data/src/debian/control
@@ -0,0 +1,11 @@
+Source: sonic-utilities-data
+Maintainer: Joe LeVeque <jolevequ@microsoft.com>
+Section: misc
+Priority: optional
+Standards-Version: 0.1
+Build-Depends: debhelper (>=9)
+
+Package: sonic-utilities-data
+Architecture: all
+Depends: ${misc:Depends} bash-completion
+Description: Data files required for sonic-utilities
diff --git a/sonic-utilities-data/src/debian/copyright b/sonic-utilities-data/src/debian/copyright
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sonic-utilities-data/src/debian/install b/sonic-utilities-data/src/debian/install
new file mode 100644
index 0000000000..82d087d54d
--- /dev/null
+++ b/sonic-utilities-data/src/debian/install
@@ -0,0 +1,2 @@
+bash_completion.d/    /etc/
+templates/*.j2        /usr/share/sonic/templates/
diff --git a/sonic-utilities-data/src/debian/rules b/sonic-utilities-data/src/debian/rules
new file mode 100755
index 0000000000..a5e2f5acfc
--- /dev/null
+++ b/sonic-utilities-data/src/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+build:
+
+%:
+	dh $@
diff --git a/sonic_installer/templates/sonic-environment.j2 b/sonic-utilities-data/src/templates/sonic-environment.j2
similarity index 100%
rename from sonic_installer/templates/sonic-environment.j2
rename to sonic-utilities-data/src/templates/sonic-environment.j2

From d5a4a79db020e2b2b18826fcca67db0bd0c35813 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Thu, 17 Sep 2020 22:37:51 +0000
Subject: [PATCH 3/9] Reorganize

---
 .gitignore                                    | 12 ++++++++++++
 sonic-utilities-data/.gitignore               |  7 -------
 sonic-utilities-data/Makefile                 | 19 -------------------
 .../{src => }/bash_completion.d/acl-loader    |  0
 .../{src => }/bash_completion.d/config        |  0
 .../{src => }/bash_completion.d/connect       |  0
 .../{src => }/bash_completion.d/consutil      |  0
 .../{src => }/bash_completion.d/counterpoll   |  0
 .../{src => }/bash_completion.d/crm           |  0
 .../{src => }/bash_completion.d/debug         |  0
 .../{src => }/bash_completion.d/fwutil        |  0
 .../{src => }/bash_completion.d/pddf_fanutil  |  0
 .../{src => }/bash_completion.d/pddf_ledutil  |  0
 .../{src => }/bash_completion.d/pddf_psuutil  |  0
 .../bash_completion.d/pddf_thermalutil        |  0
 .../{src => }/bash_completion.d/pfc           |  0
 .../{src => }/bash_completion.d/pfcwd         |  0
 .../{src => }/bash_completion.d/psuutil       |  0
 .../{src => }/bash_completion.d/sfputil       |  0
 .../{src => }/bash_completion.d/show          |  0
 .../{src => }/bash_completion.d/sonic-clear   |  0
 .../bash_completion.d/sonic-installer         |  0
 .../bash_completion.d/sonic_installer         |  0
 .../{src => }/bash_completion.d/undebug       |  0
 .../{src => }/debian/changelog                |  2 +-
 sonic-utilities-data/{src => }/debian/compat  |  0
 sonic-utilities-data/{src => }/debian/control |  0
 .../{src => }/debian/copyright                |  0
 sonic-utilities-data/{src => }/debian/install |  0
 sonic-utilities-data/{src => }/debian/rules   |  0
 .../{src => }/templates/sonic-environment.j2  |  0
 31 files changed, 13 insertions(+), 27 deletions(-)
 delete mode 100644 sonic-utilities-data/.gitignore
 delete mode 100644 sonic-utilities-data/Makefile
 rename sonic-utilities-data/{src => }/bash_completion.d/acl-loader (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/config (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/connect (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/consutil (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/counterpoll (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/crm (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/debug (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/fwutil (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/pddf_fanutil (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/pddf_ledutil (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/pddf_psuutil (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/pddf_thermalutil (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/pfc (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/pfcwd (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/psuutil (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/sfputil (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/show (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/sonic-clear (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/sonic-installer (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/sonic_installer (100%)
 rename sonic-utilities-data/{src => }/bash_completion.d/undebug (100%)
 rename sonic-utilities-data/{src => }/debian/changelog (76%)
 rename sonic-utilities-data/{src => }/debian/compat (100%)
 rename sonic-utilities-data/{src => }/debian/control (100%)
 rename sonic-utilities-data/{src => }/debian/copyright (100%)
 rename sonic-utilities-data/{src => }/debian/install (100%)
 rename sonic-utilities-data/{src => }/debian/rules (100%)
 rename sonic-utilities-data/{src => }/templates/sonic-environment.j2 (100%)

diff --git a/.gitignore b/.gitignore
index 2a9d7b9348..5457540964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,15 @@ dist/
 *.pyc
 .cache
 *.tar.gz
+
+# Ignores for sonic-utilities-data
+sonic-utilities-data/debian/*
+!sonic-utilities-data/debian/changelog
+!sonic-utilities-data/debian/compat
+!sonic-utilities-data/debian/control
+!sonic-utilities-data/debian/copyright
+!sonic-utilities-data/debian/install
+!sonic-utilities-data/debian/rules
+*.deb
+*.buildinfo
+*.changes
diff --git a/sonic-utilities-data/.gitignore b/sonic-utilities-data/.gitignore
deleted file mode 100644
index a692abe033..0000000000
--- a/sonic-utilities-data/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-src/debian/*
-!src/debian/changelog
-!src/debian/compat
-!src/debian/control
-!src/debian/copyright
-!src/debian/install
-!src/debian/rules
diff --git a/sonic-utilities-data/Makefile b/sonic-utilities-data/Makefile
deleted file mode 100644
index dca82cb344..0000000000
--- a/sonic-utilities-data/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-.SHELLFLAGS += -e
-
-MAIN_TARGET = sonic-utilities-data_1.0-1_all.deb
-
-$(MAIN_TARGET):
-	pushd ./src
-
-	# Build the package
-	dpkg-buildpackage -rfakeroot -b -us -uc
-
-	popd
-
-clean:
-	pushd ./src
-	dpkg-buildpackage -rfakeroot -Tclean
-	popd
-	rm -rf $(MAIN_TARGET) *.buildinfo *.changes
diff --git a/sonic-utilities-data/src/bash_completion.d/acl-loader b/sonic-utilities-data/bash_completion.d/acl-loader
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/acl-loader
rename to sonic-utilities-data/bash_completion.d/acl-loader
diff --git a/sonic-utilities-data/src/bash_completion.d/config b/sonic-utilities-data/bash_completion.d/config
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/config
rename to sonic-utilities-data/bash_completion.d/config
diff --git a/sonic-utilities-data/src/bash_completion.d/connect b/sonic-utilities-data/bash_completion.d/connect
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/connect
rename to sonic-utilities-data/bash_completion.d/connect
diff --git a/sonic-utilities-data/src/bash_completion.d/consutil b/sonic-utilities-data/bash_completion.d/consutil
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/consutil
rename to sonic-utilities-data/bash_completion.d/consutil
diff --git a/sonic-utilities-data/src/bash_completion.d/counterpoll b/sonic-utilities-data/bash_completion.d/counterpoll
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/counterpoll
rename to sonic-utilities-data/bash_completion.d/counterpoll
diff --git a/sonic-utilities-data/src/bash_completion.d/crm b/sonic-utilities-data/bash_completion.d/crm
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/crm
rename to sonic-utilities-data/bash_completion.d/crm
diff --git a/sonic-utilities-data/src/bash_completion.d/debug b/sonic-utilities-data/bash_completion.d/debug
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/debug
rename to sonic-utilities-data/bash_completion.d/debug
diff --git a/sonic-utilities-data/src/bash_completion.d/fwutil b/sonic-utilities-data/bash_completion.d/fwutil
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/fwutil
rename to sonic-utilities-data/bash_completion.d/fwutil
diff --git a/sonic-utilities-data/src/bash_completion.d/pddf_fanutil b/sonic-utilities-data/bash_completion.d/pddf_fanutil
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/pddf_fanutil
rename to sonic-utilities-data/bash_completion.d/pddf_fanutil
diff --git a/sonic-utilities-data/src/bash_completion.d/pddf_ledutil b/sonic-utilities-data/bash_completion.d/pddf_ledutil
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/pddf_ledutil
rename to sonic-utilities-data/bash_completion.d/pddf_ledutil
diff --git a/sonic-utilities-data/src/bash_completion.d/pddf_psuutil b/sonic-utilities-data/bash_completion.d/pddf_psuutil
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/pddf_psuutil
rename to sonic-utilities-data/bash_completion.d/pddf_psuutil
diff --git a/sonic-utilities-data/src/bash_completion.d/pddf_thermalutil b/sonic-utilities-data/bash_completion.d/pddf_thermalutil
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/pddf_thermalutil
rename to sonic-utilities-data/bash_completion.d/pddf_thermalutil
diff --git a/sonic-utilities-data/src/bash_completion.d/pfc b/sonic-utilities-data/bash_completion.d/pfc
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/pfc
rename to sonic-utilities-data/bash_completion.d/pfc
diff --git a/sonic-utilities-data/src/bash_completion.d/pfcwd b/sonic-utilities-data/bash_completion.d/pfcwd
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/pfcwd
rename to sonic-utilities-data/bash_completion.d/pfcwd
diff --git a/sonic-utilities-data/src/bash_completion.d/psuutil b/sonic-utilities-data/bash_completion.d/psuutil
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/psuutil
rename to sonic-utilities-data/bash_completion.d/psuutil
diff --git a/sonic-utilities-data/src/bash_completion.d/sfputil b/sonic-utilities-data/bash_completion.d/sfputil
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/sfputil
rename to sonic-utilities-data/bash_completion.d/sfputil
diff --git a/sonic-utilities-data/src/bash_completion.d/show b/sonic-utilities-data/bash_completion.d/show
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/show
rename to sonic-utilities-data/bash_completion.d/show
diff --git a/sonic-utilities-data/src/bash_completion.d/sonic-clear b/sonic-utilities-data/bash_completion.d/sonic-clear
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/sonic-clear
rename to sonic-utilities-data/bash_completion.d/sonic-clear
diff --git a/sonic-utilities-data/src/bash_completion.d/sonic-installer b/sonic-utilities-data/bash_completion.d/sonic-installer
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/sonic-installer
rename to sonic-utilities-data/bash_completion.d/sonic-installer
diff --git a/sonic-utilities-data/src/bash_completion.d/sonic_installer b/sonic-utilities-data/bash_completion.d/sonic_installer
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/sonic_installer
rename to sonic-utilities-data/bash_completion.d/sonic_installer
diff --git a/sonic-utilities-data/src/bash_completion.d/undebug b/sonic-utilities-data/bash_completion.d/undebug
similarity index 100%
rename from sonic-utilities-data/src/bash_completion.d/undebug
rename to sonic-utilities-data/bash_completion.d/undebug
diff --git a/sonic-utilities-data/src/debian/changelog b/sonic-utilities-data/debian/changelog
similarity index 76%
rename from sonic-utilities-data/src/debian/changelog
rename to sonic-utilities-data/debian/changelog
index a296f8afe4..dba0fada82 100644
--- a/sonic-utilities-data/src/debian/changelog
+++ b/sonic-utilities-data/debian/changelog
@@ -1,5 +1,5 @@
 sonic-utilities-data (1.0-1) UNRELEASED; urgency=low
 
-  * Initial release. (Closes: #XXXXXX)
+  * Initial release
 
  -- Joe LeVeque <jolevequ@microsoft.com>  Thu, 17 Sep 2020 01:48:49 +0000
diff --git a/sonic-utilities-data/src/debian/compat b/sonic-utilities-data/debian/compat
similarity index 100%
rename from sonic-utilities-data/src/debian/compat
rename to sonic-utilities-data/debian/compat
diff --git a/sonic-utilities-data/src/debian/control b/sonic-utilities-data/debian/control
similarity index 100%
rename from sonic-utilities-data/src/debian/control
rename to sonic-utilities-data/debian/control
diff --git a/sonic-utilities-data/src/debian/copyright b/sonic-utilities-data/debian/copyright
similarity index 100%
rename from sonic-utilities-data/src/debian/copyright
rename to sonic-utilities-data/debian/copyright
diff --git a/sonic-utilities-data/src/debian/install b/sonic-utilities-data/debian/install
similarity index 100%
rename from sonic-utilities-data/src/debian/install
rename to sonic-utilities-data/debian/install
diff --git a/sonic-utilities-data/src/debian/rules b/sonic-utilities-data/debian/rules
similarity index 100%
rename from sonic-utilities-data/src/debian/rules
rename to sonic-utilities-data/debian/rules
diff --git a/sonic-utilities-data/src/templates/sonic-environment.j2 b/sonic-utilities-data/templates/sonic-environment.j2
similarity index 100%
rename from sonic-utilities-data/src/templates/sonic-environment.j2
rename to sonic-utilities-data/templates/sonic-environment.j2

From ee373bf837aa706c804944e521052a2967466433 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Thu, 17 Sep 2020 23:34:57 +0000
Subject: [PATCH 4/9] Update .gitignore

---
 .gitignore | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5457540964..36135fb6aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,18 @@
-build/
-deb_dist/
-dist/
-*.egg-info/
+# Compiled Python files
 *.pyc
-.cache
-*.tar.gz
+scripts/aclshowc
+scripts/neighbor_advertiserc
+scripts/port2aliasc
+
+# Generated by packaging
+*.egg-info/
+.eggs/
+build/
+
+# Unit test coverage
+.coverage
+coverage.xml
+htmlcov/
 
 # Ignores for sonic-utilities-data
 sonic-utilities-data/debian/*

From 152d5c647120906488313062c9105c268d1ac08e Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Fri, 18 Sep 2020 07:35:53 +0000
Subject: [PATCH 5/9] Update paths to reflect new utilities install location,
 /usr/local/bin/

---
 config/main.py             |  4 ++--
 scripts/fast-reboot        | 14 +++++++-------
 scripts/generate_dump      |  2 +-
 scripts/sonic-kdump-config |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/config/main.py b/config/main.py
index c22268c6cd..4839187ba1 100755
--- a/config/main.py
+++ b/config/main.py
@@ -1101,7 +1101,7 @@ def reload(db, filename, yes, load_sysinfo, no_service_restart):
         client.set(config_db.INIT_INDICATOR, 1)
 
         # Migrate DB contents to latest version
-        db_migrator='/usr/bin/db_migrator.py'
+        db_migrator='/usr/local/bin/db_migrator.py'
         if os.path.isfile(db_migrator) and os.access(db_migrator, os.X_OK):
             if namespace is None:
                 command = "{} -o migrate".format(db_migrator)
@@ -1200,7 +1200,7 @@ def load_minigraph(db, no_service_restart):
     clicommon.run_command("config qos reload", display_cmd=True)
 
     # Write latest db version string into db
-    db_migrator='/usr/bin/db_migrator.py'
+    db_migrator='/usr/local/bin/db_migrator.py'
     if os.path.isfile(db_migrator) and os.access(db_migrator, os.X_OK):
         for namespace in namespace_list:
             if namespace is DEFAULT_NAMESPACE:
diff --git a/scripts/fast-reboot b/scripts/fast-reboot
index 87bb3a3e94..dc8eb0c5d8 100755
--- a/scripts/fast-reboot
+++ b/scripts/fast-reboot
@@ -12,12 +12,12 @@ FORCE=no
 STRICT=no
 REBOOT_METHOD="/sbin/kexec -e"
 ASSISTANT_IP_LIST=""
-ASSISTANT_SCRIPT="/usr/bin/neighbor_advertiser"
-WATCHDOG_UTIL="/usr/bin/watchdogutil"
+ASSISTANT_SCRIPT="/usr/local/bin/neighbor_advertiser"
+WATCHDOG_UTIL="/usr/local/bin/watchdogutil"
 DEVPATH="/usr/share/sonic/device"
 PLATFORM=$(sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
 PLATFORM_PLUGIN="${REBOOT_TYPE}_plugin"
-LOG_SSD_HEALTH="/usr/bin/log_ssd_health"
+LOG_SSD_HEALTH="/usr/local/bin/log_ssd_health"
 SSD_FW_UPDATE="ssd-fw-upgrade"
 # Require 100M available on the hard drive for warm reboot temp files,
 # Size is in 1K blocks:
@@ -324,7 +324,7 @@ function reboot_pre_check()
     fi
     
     # Make sure ASIC configuration has not changed between images
-    ASIC_CONFIG_CHECK_SCRIPT="/usr/bin/asic_config_check"
+    ASIC_CONFIG_CHECK_SCRIPT="/usr/local/bin/asic_config_check"
     ASIC_CONFIG_CHECK_SUCCESS=0
     if [[ "$REBOOT_TYPE" = "warm-reboot" || "$REBOOT_TYPE" = "fastfast-reboot" ]]; then
         ASIC_CONFIG_CHECK_EXIT_CODE=0
@@ -447,7 +447,7 @@ if [[ "$REBOOT_TYPE" = "fast-reboot" ]]; then
     CONFIG_DB_FILE=/etc/sonic/config_db.json
     mkdir -p $DUMP_DIR
     FAST_REBOOT_DUMP_RC=0
-    /usr/bin/fast-reboot-dump.py -t $DUMP_DIR || FAST_REBOOT_DUMP_RC=$?
+    /usr/local/bin/fast-reboot-dump.py -t $DUMP_DIR || FAST_REBOOT_DUMP_RC=$?
     if [[ FAST_REBOOT_DUMP_RC -ne 0 ]]; then
         error "Failed to run fast-reboot-dump.py. Exit code: $FAST_REBOOT_DUMP_RC"
         unload_kernel
@@ -456,7 +456,7 @@ if [[ "$REBOOT_TYPE" = "fast-reboot" ]]; then
 
     FILTER_FDB_ENTRIES_RC=0
     # Filter FDB entries using MAC addresses from ARP table
-    /usr/bin/filter_fdb_entries -f $DUMP_DIR/fdb.json -a $DUMP_DIR/arp.json -c $CONFIG_DB_FILE || FILTER_FDB_ENTRIES_RC=$?
+    /usr/local/bin/filter_fdb_entries -f $DUMP_DIR/fdb.json -a $DUMP_DIR/arp.json -c $CONFIG_DB_FILE || FILTER_FDB_ENTRIES_RC=$?
     if [[ FILTER_FDB_ENTRIES_RC -ne 0 ]]; then
         error "Failed to filter FDb entries. Exit code: $FILTER_FDB_ENTRIES_RC"
         unload_kernel
@@ -497,7 +497,7 @@ fi
 
 # Kill nat docker after saving the conntrack table
 debug "Stopping nat ..."
-/usr/bin/dump_nat_entries.py
+/usr/local/bin/dump_nat_entries.py
 docker kill nat > /dev/null || true
 systemctl stop nat
 debug "Stopped nat ..."
diff --git a/scripts/generate_dump b/scripts/generate_dump
index 01e45f801a..ba69f02a4f 100755
--- a/scripts/generate_dump
+++ b/scripts/generate_dump
@@ -342,7 +342,7 @@ main() {
     $MKDIR $V -p $TARDIR
 
     # Start with this script so its obvious what code is responsible
-    $LN $V -s /usr/bin/generate_dump $TARDIR
+    $LN $V -s /usr/local/bin/generate_dump $TARDIR
     $TAR $V -chf $TARFILE -C $DUMPDIR $BASE
     $RM $V -f $TARDIR/sonic_dump
 
diff --git a/scripts/sonic-kdump-config b/scripts/sonic-kdump-config
index 696a87adc8..c19b4dea16 100755
--- a/scripts/sonic-kdump-config
+++ b/scripts/sonic-kdump-config
@@ -167,7 +167,7 @@ def get_kdump_administrative_mode():
 #
 #  @return The current memory string used for kdump (read from running configuration)
 def get_kdump_memory():
-    (rc, lines, err_str) = run_command("/usr/bin/show kdump memory", use_shell=False)
+    (rc, lines, err_str) = run_command("show kdump memory", use_shell=False)
     try:
         if rc == 0 and len(lines) == 1:
             p = lines[0].find(': ')
@@ -185,7 +185,7 @@ def get_kdump_memory():
 #  @return The maximum number of kernel dump files stored locally
 #          (read from running configuration)
 def get_kdump_num_dumps():
-    (rc, lines, err_str) = run_command("/usr/bin/show kdump num_dumps", use_shell=False)
+    (rc, lines, err_str) = run_command("show kdump num_dumps", use_shell=False)
     try:
         if rc == 0 and len(lines) == 1:
             p = lines[0].find(': ')
@@ -386,7 +386,7 @@ def cmd_kdump_disable(verbose, image=get_current_image()):
 #                 If None, display current value read from running configuration
 def cmd_kdump_memory(verbose, memory):
     if memory is None:
-        (rc, lines, err_str) = run_command("/usr/bin/show kdump memory", use_shell=False);
+        (rc, lines, err_str) = run_command("show kdump memory", use_shell=False);
         print('\n'.join(lines))
     else:
         use_kdump_in_cfg = read_use_kdump()
@@ -403,7 +403,7 @@ def cmd_kdump_memory(verbose, memory):
 #                 If None, display current value read from running configuration
 def cmd_kdump_num_dumps(verbose, num_dumps):
     if num_dumps is None:
-        (rc, lines, err_str) = run_command("/usr/bin/show kdump num_dumps", use_shell=False);
+        (rc, lines, err_str) = run_command("show kdump num_dumps", use_shell=False);
         print('\n'.join(lines))
     else:
         write_num_dumps(num_dumps)

From 4565663bff6547972ca1571c3ac7cd033632d615 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Fri, 18 Sep 2020 23:35:26 +0000
Subject: [PATCH 6/9] Add build and clean instructions to README.md

---
 sonic-utilities-data/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sonic-utilities-data/README.md b/sonic-utilities-data/README.md
index 1872377317..fa9535f550 100644
--- a/sonic-utilities-data/README.md
+++ b/sonic-utilities-data/README.md
@@ -1,4 +1,19 @@
 # sonic-utilities-data
 Data files required for sonic-utilities
 
+
+## To build
+
+```
+dpkg-buildpackage -rfakeroot -b -us -uc
+```
+
+## To clean
+
+```
+dpkg-buildpackage -rfakeroot -Tclean
+```
+
+---
+
 See the [SONiC Website](http://azure.github.io/SONiC/) for more information about the SONiC project.

From 2799097f40fb994379c3658ba3b0e7402d8b2dff Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Fri, 18 Sep 2020 23:38:39 +0000
Subject: [PATCH 7/9] Update documentation

---
 sonic-utilities-data/README.md      | 2 +-
 sonic-utilities-data/debian/control | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sonic-utilities-data/README.md b/sonic-utilities-data/README.md
index fa9535f550..8abc021cb1 100644
--- a/sonic-utilities-data/README.md
+++ b/sonic-utilities-data/README.md
@@ -1,5 +1,5 @@
 # sonic-utilities-data
-Data files required for sonic-utilities
+Data files required for SONiC command line utilities
 
 
 ## To build
diff --git a/sonic-utilities-data/debian/control b/sonic-utilities-data/debian/control
index 02114427d6..b5de2089a3 100644
--- a/sonic-utilities-data/debian/control
+++ b/sonic-utilities-data/debian/control
@@ -8,4 +8,4 @@ Build-Depends: debhelper (>=9)
 Package: sonic-utilities-data
 Architecture: all
 Depends: ${misc:Depends} bash-completion
-Description: Data files required for sonic-utilities
+Description: Data files required for SONiC command line utilities

From b4a7449fd3ef8555a541c210f2a4c75b9a228d05 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Sat, 19 Sep 2020 01:15:53 +0000
Subject: [PATCH 8/9] Add dist/ to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 36135fb6aa..62efccb3c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ scripts/port2aliasc
 *.egg-info/
 .eggs/
 build/
+dist/
 
 # Unit test coverage
 .coverage

From 5a4d91e120323f1d49f8e6e0a718a84d40f6dd51 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Sat, 19 Sep 2020 01:19:39 +0000
Subject: [PATCH 9/9] More specific ignore patterns

---
 .gitignore | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 62efccb3c1..439e053c64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,6 @@ sonic-utilities-data/debian/*
 !sonic-utilities-data/debian/copyright
 !sonic-utilities-data/debian/install
 !sonic-utilities-data/debian/rules
-*.deb
-*.buildinfo
-*.changes
+sonic-utilities-data_*.deb
+sonic-utilities-data_*.buildinfo
+sonic-utilities-data_*.changes