Merge branch 'master' into lldp_bkwm

.github/workflows/semgrep.yml

@@ -19,4 +19,8 @@ jobs:
       - uses: actions/checkout@v3
       - run: semgrep ci
         env:
-           SEMGREP_RULES: p/default
+           SEMGREP_RULES: |
+             p/default
+             r/python.lang.security.audit.dangerous-system-call-audit.dangerous-system-call-audit
+             r/c.lang.security.insecure-use-strcat-fn.insecure-use-strcat-fn
+             r/c.lang.security.insecure-use-string-copy-fn.insecure-use-string-copy-fn

.gitignore

@@ -12,6 +12,7 @@ fsroot/
 fs.*
 target/
 *.deb
+*.udeb
 *.changes
 *.buildinfo
 *.tar
@@ -28,8 +29,13 @@ sonic-slave*/*.log
 # Autogenerated Dockerfiles
 sonic-slave*/Dockerfile
 sonic-slave*/Dockerfile.user
+sonic-slave*/Dockerfile.cleanup
 dockers/*/Dockerfile
+dockers/*/Dockerfile.cleanup
+dockers/*/Dockerfile-dbg.cleanup
 platform/*/docker-*/Dockerfile
+platform/*/docker-*/Dockerfile.cleanup
+platform/*/docker-*/Dockerfile-dbg.cleanup
 
 # Autogenerated manifest files
 dockers/*/*manifest*

Makefile.cache

@@ -295,10 +295,12 @@ define SAVE_INTO_CACHE
 		echo "Target $(1) dependencies are modifed - global save cache skipped" >> $($(1)_DST_PATH)/$(1).log
 		$(eval $(1)_CACHE_DIR := $(SONIC_DPKG_LOCAL_CACHE_DIR))
 	 )
-	$($(1)_CACHE_USER) tar -C $($(1)_BASE_PATH) -mczvf $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) $(2) $(addprefix $($(1)_DST_PATH)/,$($(1)_DERIVED_DEBS) $($(1)_EXTRA_DEBS) )  \
+	cp $($(1)_DST_PATH)/$(1).log $($(1)_DST_PATH)/$(1).cached.log
+	$($(1)_CACHE_USER) tar -C $($(1)_BASE_PATH) -mczvf $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) $(2) $(addprefix $($(1)_DST_PATH)/,$($(1)_DERIVED_DEBS) $($(1)_EXTRA_DEBS) $(1).cached.log)  \
 		1>>$($(1)_DST_PATH)/$(1).log
 	sudo chmod 777 $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE)
-
+	rm -f $($(1)_DST_PATH)/$(1).cached.log
+
 	echo "File $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) saved in cache " >> $($(1)_DST_PATH)/$(1).log
 	echo "[ CACHE::SAVED ] $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE)" >> $($(1)_DST_PATH)/$(1).log
 

build_debian.sh

@@ -393,8 +393,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     python-is-python3       \
     cron                    \
     libprotobuf32           \
-    libgrpc++1              \
     libgrpc29               \
+    libgrpc++1.51           \
     haveged                 \
     fdisk                   \
     gpg                     \

device/arista/x86_64-arista_7800_sup/Arista-7804R3-FM/fabric_monitor_config.json

@@ -3,6 +3,7 @@
       "monErrThreshCrcCells": 1,
       "monErrThreshRxCells": 61035156,
       "monPollThreshRecovery": 8,
-      "monPollThreshIsolation": 1
+      "monPollThreshIsolation": 1,
+      "monCapacityThreshWarn": 10
    }
 }