From c89d2de3dc50221c21b4d2591663f2aafe9c56df Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Sat, 7 Nov 2020 00:09:21 +0000 Subject: [PATCH 1/8] [sonic-py-swsssdk] Update submodule --- src/sonic-py-swsssdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-py-swsssdk b/src/sonic-py-swsssdk index 1ea30d2e27bf..9d9f0c60239d 160000 --- a/src/sonic-py-swsssdk +++ b/src/sonic-py-swsssdk @@ -1 +1 @@ -Subproject commit 1ea30d2e27bf4e9c9127611e72f5b3bd74025731 +Subproject commit 9d9f0c60239d9b02e7589b8cedeafcc4e60bd7c8 From 834edf2f896ef78837d20ae5586b0883b22c6640 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Sat, 7 Nov 2020 21:43:49 +0000 Subject: [PATCH 2/8] Update sonic-snmpagent and sonic-utilities submodules --- src/sonic-snmpagent | 2 +- src/sonic-utilities | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent index 6e4a796b245a..6b94ec3814c6 160000 --- a/src/sonic-snmpagent +++ b/src/sonic-snmpagent @@ -1 +1 @@ -Subproject commit 6e4a796b245a99da29f8390fe01d09a37d32ec4f +Subproject commit 6b94ec3814c69ea71577e5e8f820e177b5696fd4 diff --git a/src/sonic-utilities b/src/sonic-utilities index acfa8248d799..673f98dce19e 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit acfa8248d79970e4d0225dd08082dc8f85ad030d +Subproject commit 673f98dce19e8134abbba7905da3467e6cc68e00 From 7f514dda4873b80dd5bec77c666de9d21ec44088 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Sat, 7 Nov 2020 23:24:15 +0000 Subject: [PATCH 3/8] Add sonic-utilities build dependenvy on swsscommon --- rules/sonic-utilities.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rules/sonic-utilities.mk b/rules/sonic-utilities.mk index aef970200fb7..1b47454dd2be 100644 --- a/rules/sonic-utilities.mk +++ b/rules/sonic-utilities.mk @@ -20,4 +20,7 @@ $(SONIC_UTILITIES_PY2)_DEBS_DEPENDS = $(LIBYANG) \ $(LIBYANG_CPP) \ $(LIBYANG_PY2) \ $(LIBYANG_PY3) + $(LIBSWSSCOMMON) \ + $(PYTHON2_SWSSCOMMON) + $(PYTHON3_SWSSCOMMON) SONIC_PYTHON_WHEELS += $(SONIC_UTILITIES_PY2) From 2d9c6e705da8f91aafc3f609883301a1cf9a5d26 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Sun, 8 Nov 2020 00:10:19 +0000 Subject: [PATCH 4/8] Add missing backslashes --- rules/sonic-utilities.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/sonic-utilities.mk b/rules/sonic-utilities.mk index 1b47454dd2be..f177747e598a 100644 --- a/rules/sonic-utilities.mk +++ b/rules/sonic-utilities.mk @@ -19,8 +19,8 @@ $(SONIC_UTILITIES_PY2)_DEPENDS += $(SONIC_PY_COMMON_PY2) \ $(SONIC_UTILITIES_PY2)_DEBS_DEPENDS = $(LIBYANG) \ $(LIBYANG_CPP) \ $(LIBYANG_PY2) \ - $(LIBYANG_PY3) + $(LIBYANG_PY3) \ $(LIBSWSSCOMMON) \ - $(PYTHON2_SWSSCOMMON) + $(PYTHON2_SWSSCOMMON) \ $(PYTHON3_SWSSCOMMON) SONIC_PYTHON_WHEELS += $(SONIC_UTILITIES_PY2) From 52fbe9542edf74c7bc4630e4a19955be7571c896 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Sun, 8 Nov 2020 01:09:28 +0000 Subject: [PATCH 5/8] Fix typo --- rules/sonic-utilities.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/sonic-utilities.mk b/rules/sonic-utilities.mk index f177747e598a..2eca15328414 100644 --- a/rules/sonic-utilities.mk +++ b/rules/sonic-utilities.mk @@ -21,6 +21,6 @@ $(SONIC_UTILITIES_PY2)_DEBS_DEPENDS = $(LIBYANG) \ $(LIBYANG_PY2) \ $(LIBYANG_PY3) \ $(LIBSWSSCOMMON) \ - $(PYTHON2_SWSSCOMMON) \ + $(PYTHON_SWSSCOMMON) \ $(PYTHON3_SWSSCOMMON) SONIC_PYTHON_WHEELS += $(SONIC_UTILITIES_PY2) From 47167c27f3618a01b4ca6419f1f2baa9206502e0 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Sun, 8 Nov 2020 04:11:24 +0000 Subject: [PATCH 6/8] Add swsscommon as build dependency of asyncsnmp --- rules/asyncsnmp-py3.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/asyncsnmp-py3.mk b/rules/asyncsnmp-py3.mk index cc0af244d856..990cc4512f8c 100644 --- a/rules/asyncsnmp-py3.mk +++ b/rules/asyncsnmp-py3.mk @@ -5,4 +5,5 @@ $(ASYNCSNMP_PY3)_SRC_PATH = $(SRC_PATH)/sonic-snmpagent $(ASYNCSNMP_PY3)_PYTHON_VERSION = 3 # Depends on sonic-platform-common so it is possible to import sonic_psu $(ASYNCSNMP_PY3)_DEPENDS += $(SWSSSDK_PY3) $(SONIC_PLATFORM_COMMON_PY3) +$(ASYNCSNMP_PY3)_DEBS_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(PYTHON3_SWSSCOMMON) SONIC_PYTHON_WHEELS += $(ASYNCSNMP_PY3) From 49b1155dbe27b105a2ae86a5817384970d7e25af Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Mon, 9 Nov 2020 19:56:24 +0000 Subject: [PATCH 7/8] Update utilities further --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index 673f98dce19e..b693cf60386c 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit 673f98dce19e8134abbba7905da3467e6cc68e00 +Subproject commit b693cf60386cd394c89a9b9f258d3af55dd59b0f From f9aed585cf7e6931fa1c5c9460f86c304c5cd8e8 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Thu, 12 Nov 2020 03:05:37 +0000 Subject: [PATCH 8/8] Move sonic-snmpagent submodule backward one commit --- src/sonic-snmpagent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent index 6b94ec3814c6..57e54d956193 160000 --- a/src/sonic-snmpagent +++ b/src/sonic-snmpagent @@ -1 +1 @@ -Subproject commit 6b94ec3814c69ea71577e5e8f820e177b5696fd4 +Subproject commit 57e54d9561934b853a44185bbb401207f4503292