Pull latest changes

Makefile

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

Makefile.work

@@ -20,11 +20,10 @@
 #  *                Please note that with current Stretch build structure,
 #  *                user of KEEP_SLAVE_ON feature will have to be conscious
 #  *                about which docker to stay inside after build is done.
-#  *                - If user desires to stay inside Stretch docker, please issue
-#  *                  make KEEP_SLAVE_ON=yes stretch
 #  *                - If user desires to stay inside Jessie docker, please issue
-#  *                  (a successful "make stretch" may be needed before the following command)
-#  *                  make NOSTRETCH=1 KEEP_SLAVE_ON=yes <any jessie target>
+#  *                  make KEEP_SLAVE_ON=yes jessie
+#  *                - If user desires to stay inside Stretch docker, please issue
+#  *                  make NOJESSIE=1 KEEP_SLAVE_ON=yes <any target>
 #  * SOURCE_FOLDER: host path to be mount as /var/$(USER)/src, only effective when KEEP_SLAVE_ON=yes
 #  * SONIC_BUILD_JOBS: Specifying number of concurrent build job(s) to run
 #  * VS_PREPARE_MEM: Prepare memory in VS build (drop cache and compact).
@@ -123,7 +122,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            HTTP_PROXY=$(http_proxy) \
                            HTTPS_PROXY=$(https_proxy) \
                            SONIC_ENABLE_SYSTEM_TELEMETRY=$(ENABLE_SYSTEM_TELEMETRY) \
-                           EXTRA_STRETCH_TARGETS=$(EXTRA_STRETCH_TARGETS) \
+                           EXTRA_JESSIE_TARGETS=$(EXTRA_JESSIE_TARGETS) \
                            $(SONIC_OVERRIDE_BUILD_VARS)
 
 .PHONY: sonic-slave-build sonic-slave-bash init reset

README.md

@@ -71,9 +71,6 @@ To build SONiC installer image and docker images, run the following commands:
     # Execute make configure once to configure ASIC
     make configure PLATFORM=[ASIC_VENDOR]
 
-    # Build Debian Stretch required targets (Manual execution optional; will also be executed as part of the build)
-    BLDENV=stretch make stretch
-
     # Build SONiC image
     make all
 

build_debian.sh

@@ -160,7 +160,7 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
 pushd $FILESYSTEM_ROOT/usr/share/initramfs-tools/scripts/init-bottom && sudo patch -p1 < $OLDPWD/files/initramfs-tools/udev.patch; popd
 
 ## Install latest intel ixgbe driver
-sudo cp target/files/stretch/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/${LINUX_KERNEL_VERSION}-amd64/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
+sudo cp $files_path/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/${LINUX_KERNEL_VERSION}-amd64/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
 
 ## Install docker
 echo '[INFO] Install docker'
@@ -307,7 +307,7 @@ check filesystem root-overlay with path /
 check filesystem var-log with path /var/log
   if space usage > 90% for 5 times within 10 cycles then alert
 check system $HOST
-  if memory usage > 90% for 5 times within 10 cycles then alert
+  if memory usage > 50% for 5 times within 10 cycles then alert
   if cpu usage (user) > 90% for 5 times within 10 cycles then alert
   if cpu usage (system) > 90% for 5 times within 10 cycles then alert
 EOF