Merge pull request #6 from Azure/master

Update from Azure

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,21 +1,34 @@
 <!--
-Please make sure you've read and understood our contributing guidelines;
+Please make sure you've read and understood our contributing guidelines:
 https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
 
 ** Make sure all your commits include a signature generated with `git commit -s` **
 
 If this is a bug fix, make sure your description includes "fixes #xxxx", or
-"closes #xxxx"
+"closes #xxxx" or "resolves #xxxx"
 
 Please provide the following information:
 -->
 
-**- What I did**
+**- Why I did it**
 
 **- How I did it**
 
 **- How to verify it**
 
+**- Which release branch to backport (provide reason below if selected)**
+
+<!--
+- Note we only backport fixes to a release branch, *not* features!
+- Please also provide a reason for the backporting below.
+- e.g.
+- [x] 202006
+-->
+
+- [ ] 201811
+- [ ] 201911
+- [ ] 202006
+
 **- Description for the changelog**
 <!--
 Write a short (one line) summary that describes the changes in this

.gitignore

@@ -20,94 +20,6 @@ target/
 *dbg.j2
 *.img
 
-# Subdirectories in src
-src/bash/*
-!src/bash/Makefile
-src/dhcpmon/debian/*
-!src/dhcpmon/debian/changelog 
-!src/dhcpmon/debian/compat 
-!src/dhcpmon/debian/control
-!src/dhcpmon/debian/rules 
-src/ixgbe/*
-!src/ixgbe/Makefile
-src/isc-dhcp/*
-!src/isc-dhcp/Makefile
-!src/isc-dhcp/patch
-src/socat/*
-!src/socat/Makefile
-!src/socat/*.patch
-src/tacacs/*
-src/tacacs/nsm/*
-src/tacacs/pam/*
-!src/tacacs/nsm/Makefile
-!src/tacacs/nsm/*.patch
-!src/tacacs/pam/Makefile
-!src/tacacs/pam/*.patch
-src/hiredis/*
-!src/hiredis/Makefile
-src/igb/*
-!src/igb/Makefile
-src/initramfs-tools/*
-!src/initramfs-tools/Makefile
-src/iproute2/*
-!src/iproute2/Makefile
-src/isc-dhcp/*
-!src/isc-dhcp/Makefile
-!src/isc-dhcp/patch/
-src/libnl3/*
-!src/libnl3/debian
-src/libnl3/debian/libnl-*/
-!src/libnl3/Makefile
-src/libteam/*
-!src/libteam/Makefile
-src/libyang/*
-!src/libyang/Makefile
-src/lldpd/*
-!src/lldpd/Makefile
-!src/lldpd/patch/
-src/lm-sensors/*
-!src/lm-sensors/Makefile
-src/monit/*
-!src/monit/Makefile
-!src/monit/patch/
-src/mpdecimal/*
-!src/mpdecimal/Makefile
-src/python-click/*
-!src/python-click/Makefile
-src/python3/*
-!src/python3/Makefile
-src/radvd/*
-!src/radvd/Makefile
-!src/radvd/patch/
-src/redis/*
-!src/redis/Makefile
-src/smartmontools/*
-!src/smartmontools/Makefile
-src/snmpd/*
-!src/snmpd/Makefile
-src/sonic-device-data/src/device/
-src/sonic-device-data/src/debian/
-src/supervisor/*
-!src/supervisor/Makefile
-!src/supervisor/patch/
-src/swig/*
-!src/swig/Makefile
-src/systemd-sonic-generator/systemd-sonic-generator
-src/systemd-sonic-generator/debian/*
-!src/systemd-sonic-generator/debian/changelog
-!src/systemd-sonic-generator/debian/compat
-!src/systemd-sonic-generator/debian/control
-!src/systemd-sonic-generator/debian/rules
-src/telemetry/debian/*
-!src/telemetry/debian/changelog
-!src/telemetry/debian/compat
-!src/telemetry/debian/control
-!src/telemetry/debian/rules
-!src/telemetry/debian/telemetry.init.d
-src/thrift/*
-!src/thrift/patch/
-!src/thrift/Makefile
-
 # Autogenerated Dockerfiles
 sonic-slave*/Dockerfile
 dockers/*/Dockerfile
@@ -120,11 +32,16 @@ installer/x86_64/platforms/
 src/sonic-config-engine/**/*.pyc
 src/sonic-config-engine/build
 src/sonic-config-engine/sonic_config_engine.egg-info
-src/sonic-daemon-base/**/*.pyc
-src/sonic-daemon-base/build
-src/sonic-daemon-base/sonic_daemon_base.egg-info
+
+src/sonic-py-common/**/*.pyc
+src/sonic-py-common/.eggs/
+src/sonic-py-common/build
+src/sonic-py-common/dist
+src/sonic-py-common/sonic_py_common.egg-info
 
 # Misc. files
+asic_config_checksum
+files/Aboot/boot0
 files/initramfs-tools/arista-convertfs
 files/initramfs-tools/union-mount
 
@@ -141,3 +58,16 @@ src/**/debian/stamp-autotools-files
 
 # .o files
 src/**/*.o
+
+# platform
+platform/**/*.egg-info
+platform/**/*-none-any.whl
+platform/**/.pybuild
+platform/**/debian/*
+platform/**/build
+platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/ipmihelper.py
+platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_ich.c
+platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_s6100_lpc.c
+platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_ich.c
+platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_mailbox.c
+platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/ipmihelper.py

.gitmodules

@@ -82,3 +82,6 @@
  path = src/sonic-restapi
  url = https://github.com/Azure/sonic-restapi.git
  branch = master
+[submodule "src/sonic-mgmt-common"]
+ path = src/sonic-mgmt-common
+ url = https://github.com/Azure/sonic-mgmt-common.git

Makefile

@@ -1,23 +1,36 @@
 # SONiC make file
 
 NOJESSIE ?= 0
+NOSTRETCH ?= 0
 
 %::
  @echo "+++ --- Making $@ --- +++"
 ifeq ($(NOJESSIE), 0)
- EXTRA_JESSIE_TARGETS=$(notdir $@) make -f Makefile.work jessie
+ EXTRA_DOCKER_TARGETS=$(notdir $@) make -f Makefile.work jessie
 endif
- BLDENV=stretch make -f Makefile.work $@
+ifeq ($(NOSTRETCH), 0)
+ EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch make -f Makefile.work stretch
+endif
+ BLDENV=buster make -f Makefile.work $@
 
 jessie:
  @echo "+++ Making $@ +++"
 ifeq ($(NOJESSIE), 0)
  make -f Makefile.work jessie
 endif
 
+stretch:
+ @echo "+++ Making $@ +++"
+ifeq ($(NOSTRETCH), 0)
+ make -f Makefile.work stretch
+endif
+
 clean reset init configure showtag sonic-slave-build sonic-slave-bash :
  @echo "+++ Making $@ +++"
 ifeq ($(NOJESSIE), 0)
  make -f Makefile.work $@
 endif
+ifeq ($(NOSTRETCH), 0)
  BLDENV=stretch make -f Makefile.work $@
+endif
+ BLDENV=buster make -f Makefile.work $@