Sync to master

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,60 @@
+<!--
+If you are reporting a new issue, make sure that we do not have any duplicates
+already open. You can ensure this by searching the issue list for this
+repository. If there is a duplicate, please close your issue and add a comment
+to the existing issue instead.
+
+If you suspect your issue is a bug, please edit your issue description to
+include the BUG REPORT INFORMATION shown below. If you fail to provide this
+information within 7 days, we cannot debug your issue and will close it. We
+will, however, reopen it if you later provide the information.
+
+For more information about reporting issues, see
+https://github.com/Azure/SONiC/wiki#report-issues
+
+---------------------------------------------------
+GENERAL SUPPORT INFORMATION
+---------------------------------------------------
+
+The GitHub issue tracker is for bug reports and feature requests.
+General support can be found at the following locations:
+
+- SONiC Support Forums - https://groups.google.com/forum/#!forum/sonicproject
+
+---------------------------------------------------
+BUG REPORT INFORMATION
+---------------------------------------------------
+Use the commands below to provide key information from your environment:
+You do NOT have to include this information if this is a FEATURE REQUEST
+-->
+
+**Description**
+
+<!--
+Briefly describe the problem you are having in a few paragraphs.
+-->
+
+**Steps to reproduce the issue:**
+1.
+2.
+3.
+
+**Describe the results you received:**
+
+
+**Describe the results you expected:**
+
+
+**Additional information you deem important (e.g. issue happens only occasionally):**
+
+ **Output of `show version`:**
+
+ ```
+ (paste your output here)
+ ```
+
+ **Attach debug file `sudo generate_dump`:**
+
+ ```
+ (paste your output here)
+ ```

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,26 @@
+<!--
+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"
+
+Please provide the following information:
+-->
+
+**- What I did**
+
+**- How I did it**
+
+**- How to verify it**
+
+**- Description for the changelog**
+<!--
+Write a short (one line) summary that describes the changes in this
+pull request for inclusion in the changelog:
+-->
+
+
+**- A picture of a cute animal (not mandatory but encouraged)**

.gitmodules

@@ -44,6 +44,7 @@
 [submodule "src/sonic-utilities"]
  path = src/sonic-utilities
  url = https://github.com/Azure/sonic-utilities
+ branch = v1.0.3
 [submodule "platform/broadcom/sonic-platform-modules-s6000"]
  path = platform/broadcom/sonic-platform-modules-s6000
  url = https://github.com/Azure/sonic-platform-modules-s6000
@@ -56,10 +57,6 @@
 [submodule "platform/broadcom/sonic-platform-modules-ingrasys"]
  path = platform/broadcom/sonic-platform-modules-ingrasys
  url = https://github.com/Ingrasys-sonic/sonic-platform-modules-ingrasys
-[submodule "src/SAI"]
- path = src/SAI
- url = https://github.com/opencomputeproject/SAI
- branch = v0.9.4
 [submodule "src/sonic-platform-daemons"]
  path = src/sonic-platform-daemons
  url = https://github.com/Azure/sonic-platform-daemons

Makefile

@@ -1,5 +1,18 @@
 ###############################################################################
 ## Wrapper for starting make inside sonic-slave container
+#
+# Supported parameters:
+#
+# * PLATFORM: Specific platform we wish to build images for.
+# * BUILD_NUMBER: Desired version-number to pass to the building-system.
+# * ENABLE_DHCP_GRAPH_SERVICE: Enables get-graph service to fetch minigraph files
+# through http.
+# * SHUTDOWN_BGP_ON_START: Sets admin-down state for all bgp peerings after restart.
+# * SONIC_ENABLE_SYNCD_RPC: Enables rpc-based syncd builds.
+# * USERNAME: Desired username -- default at rules/config
+# * PASSWORD: Desired password -- default at rules/config
+# * KEEP_SLAVE_ON: Keeps slave container up after building-process concludes.
+#
 ###############################################################################
 
 SHELL = /bin/bash
@@ -13,7 +26,7 @@ $(shell rm -f .screen)
 MAKEFLAGS += -B
 
 SLAVE_BASE_TAG = $(shell shasum sonic-slave/Dockerfile | awk '{print substr($$1,0,11);}')
-SLAVE_TAG = $(shell shasum sonic-slave/Dockerfile.user | awk '{print substr($$1,0,11);}')
+SLAVE_TAG = $(shell cat sonic-slave/Dockerfile.user sonic-slave/Dockerfile | shasum | awk '{print substr($$1,0,11);}')
 SLAVE_BASE_IMAGE = sonic-slave-base
 SLAVE_IMAGE = sonic-slave-$(USER)
 
@@ -37,6 +50,16 @@ DOCKER_BUILD = docker build --no-cache \
  sonic-slave && \
  docker tag $(SLAVE_IMAGE):latest $(SLAVE_IMAGE):$(SLAVE_TAG)
 
+SONIC_BUILD_INSTRUCTION := make \
+ -f slave.mk \
+ PLATFORM=$(PLATFORM) \
+ BUILD_NUMBER=$(BUILD_NUMBER) \
+ ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
+ SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
+ SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
+ PASSWORD=$(PASSWORD) \
+ USERNAME=$(USERNAME)
+
 .PHONY: sonic-slave-build sonic-slave-bash
 
 .DEFAULT_GOAL := all
@@ -48,16 +71,11 @@ DOCKER_BUILD = docker build --no-cache \
  @docker inspect --type image $(SLAVE_IMAGE):$(SLAVE_TAG) &> /dev/null || \
  { echo Image $(SLAVE_IMAGE):$(SLAVE_TAG) not found. Building... ; \
  $(DOCKER_BUILD) ; }
- @$(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) make \
- -f slave.mk \
- PLATFORM=$(PLATFORM) \
- BUILD_NUMBER=$(BUILD_NUMBER) \
- ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
- SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
- SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
- PASSWORD=$(PASSWORD) \
- USERNAME=$(USERNAME) \
- $@
+ifeq "$(KEEP_SLAVE_ON)" "yes"
+ @$(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) bash -c "$(SONIC_BUILD_INSTRUCTION) $@; /bin/bash"
+else
+ @$(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) $(SONIC_BUILD_INSTRUCTION) $@
+endif
 
 sonic-slave-build :
  $(DOCKER_BASE_BUILD)

build_debian.sh

@@ -63,6 +63,7 @@ if [[ -d $FILESYSTEM_ROOT ]]; then
 fi
 mkdir -p $FILESYSTEM_ROOT
 mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR
+mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-grub
 touch $FILESYSTEM_ROOT/$PLATFORM_DIR/firsttime
 
 ## Build a basic Debian system by debootstrap
@@ -132,6 +133,8 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/arista-
 ## 2. Bind-mount docker working directory (docker aufs cannot work over aufs rootfs)
 sudo cp files/initramfs-tools/union-mount $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/union-mount
 sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/union-mount
+sudo cp files/initramfs-tools/varlog $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/varlog
+sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/varlog
 sudo cp files/initramfs-tools/union-fsck $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
 sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
 sudo chroot $FILESYSTEM_ROOT update-initramfs -u
@@ -203,7 +206,13 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
  curl \
  kexec-tools \
  less \
- unzip
+ unzip \
+ gdisk
+
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \
+ grub-pc-bin
+
+sudo mv $FILESYSTEM_ROOT/grub-pc-bin*.deb $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-grub
 
 ## Disable kexec supported reboot which was installed by default
 sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/kexec
@@ -239,10 +248,11 @@ EOF
 ## Config sysctl
 sudo mkdir -p $FILESYSTEM_ROOT/var/core
 sudo augtool --autosave "
-set /files/etc/sysctl.conf/kernel.core_pattern '|/usr/bin/coredump-compress %e %p'
+set /files/etc/sysctl.conf/kernel.core_pattern '|/usr/bin/coredump-compress %e %t %p'
 
 set /files/etc/sysctl.conf/kernel.softlockup_panic 1
 set /files/etc/sysctl.conf/kernel.panic 10
+set /files/etc/sysctl.conf/fs.suid_dumpable 2
 
 set /files/etc/sysctl.conf/net.ipv4.conf.default.forwarding 1
 set /files/etc/sysctl.conf/net.ipv4.conf.all.forwarding 1
@@ -312,6 +322,14 @@ if [ -f sonic_debian_extension.sh ]; then
  ./sonic_debian_extension.sh $FILESYSTEM_ROOT $PLATFORM_DIR
 fi
 
+## Organization specific extensions such as Configuration & Scripts for features like AAA, ZTP...
+if [ "${enable_organization_extensions}" = "y" ]; then
+ if [ -f files/build_templates/organization_extensions.sh ]; then
+ sudo chmod 755 files/build_templates/organization_extensions.sh 
+ ./files/build_templates/organization_extensions.sh -f $FILESYSTEM_ROOT -h $HOSTNAME
+ fi
+fi
+
 ## Clean up apt
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get autoremove
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get autoclean

build_image.sh

@@ -25,10 +25,6 @@ generate_onie_installer_image()
  cp ./device/$VENDOR/$PLATFORM/installer.conf ./installer/x86_64/platforms/$PLATFORM
  fi
 
- if [ "$IMAGE_TYPE" = "raw" ] && [ -f ./device/$VENDOR/$PLATFORM/nos_to_sonic_grub.cfg ]; then
- sed -i -e "s/%%IMAGE_VERSION%%/$IMAGE_VERSION/g" ./device/$VENDOR/$PLATFORM/nos_to_sonic_grub.cfg
- echo "IMAGE_VERSION is $IMAGE_VERSION"
- fi
  done
  done