From 725f09b29e3eb26749f3cd7fb630ca29b2cdc0c1 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 5 Aug 2020 07:25:00 +0000 Subject: [PATCH 1/6] [sonic-platform-common][sonic-platform-daemons] Update submodules --- src/sonic-platform-common | 2 +- src/sonic-platform-daemons | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sonic-platform-common b/src/sonic-platform-common index be1cc2475e65..f8bfbc95ac0a 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit be1cc2475e65b764f7aab44785a779cc3d011ee9 +Subproject commit f8bfbc95ac0a528a88d00b405306233a15b0740e diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons index 49d145cdbc63..ec2c3bc4bae0 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 49d145cdbc63a3c9fd36fa413a0a23ff85aeaf5b +Subproject commit ec2c3bc4bae0dafbc24da051336b8df27d2cee62 From 496bc9a5b6c4e523fc1743bc95a5f30103d70be6 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 5 Aug 2020 08:07:06 +0000 Subject: [PATCH 2/6] Dsiable building Python 3 sonic-platform-common package for now --- rules/sonic-platform-common.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/sonic-platform-common.mk b/rules/sonic-platform-common.mk index c7ab75d9f875..aa6ec39fbb26 100644 --- a/rules/sonic-platform-common.mk +++ b/rules/sonic-platform-common.mk @@ -10,8 +10,10 @@ SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2) SONIC_PLATFORM_COMMON_PY3 = sonic_platform_common-1.0-py3-none-any.whl $(SONIC_PLATFORM_COMMON_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-common $(SONIC_PLATFORM_COMMON_PY3)_PYTHON_VERSION = 3 -$(SONIC_PLATFORM_COMMON_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) +$(SONIC_PLATFORM_COMMON_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) $(SONIC_CONFIG_ENGINE) # Synthetic dependency just to avoid race condition $(SONIC_PLATFORM_COMMON_PY3)_DEPENDS += $(SONIC_PLATFORM_COMMON_PY2) $(SONIC_PLATFORM_COMMON_PY3)_TEST = n -SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3) +# Disable building Python 3 package for now, becuase it currently depends on sonic-config-engine, +# and we're not yet building a Python 3 package for sonic-config-engine +#SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3) From d91ef16ca703c94f1f30da4da0b9cfc9afdd0d37 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 5 Aug 2020 08:17:22 +0000 Subject: [PATCH 3/6] Revert "Dsiable building Python 3 sonic-platform-common package for now" This reverts commit 496bc9a5b6c4e523fc1743bc95a5f30103d70be6. --- rules/sonic-platform-common.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rules/sonic-platform-common.mk b/rules/sonic-platform-common.mk index aa6ec39fbb26..c7ab75d9f875 100644 --- a/rules/sonic-platform-common.mk +++ b/rules/sonic-platform-common.mk @@ -10,10 +10,8 @@ SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2) SONIC_PLATFORM_COMMON_PY3 = sonic_platform_common-1.0-py3-none-any.whl $(SONIC_PLATFORM_COMMON_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-common $(SONIC_PLATFORM_COMMON_PY3)_PYTHON_VERSION = 3 -$(SONIC_PLATFORM_COMMON_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) $(SONIC_CONFIG_ENGINE) +$(SONIC_PLATFORM_COMMON_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) # Synthetic dependency just to avoid race condition $(SONIC_PLATFORM_COMMON_PY3)_DEPENDS += $(SONIC_PLATFORM_COMMON_PY2) $(SONIC_PLATFORM_COMMON_PY3)_TEST = n -# Disable building Python 3 package for now, becuase it currently depends on sonic-config-engine, -# and we're not yet building a Python 3 package for sonic-config-engine -#SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3) +SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3) From dca18727096ed4b45f76d8a0a21ff0a6ab7a642e Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 5 Aug 2020 08:17:55 +0000 Subject: [PATCH 4/6] Update sonic-platform-common further --- src/sonic-platform-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-platform-common b/src/sonic-platform-common index f8bfbc95ac0a..f3f3573280a1 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit f8bfbc95ac0a528a88d00b405306233a15b0740e +Subproject commit f3f3573280a1ce8e5b5485dc0c64e3b61effd7a6 From c4096058da7c1b1d6dc4eb66a7a00f4a8abbed91 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 5 Aug 2020 08:56:57 +0000 Subject: [PATCH 5/6] Update sonic-platform-daemons further --- src/sonic-platform-daemons | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons index ec2c3bc4bae0..61c09186f1bb 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit ec2c3bc4bae0dafbc24da051336b8df27d2cee62 +Subproject commit 61c09186f1bb8aeab07203c81ef1975a83889aa7 From f2715f7ded25631b5958b835077ea0c043846586 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Thu, 6 Aug 2020 03:25:26 +0000 Subject: [PATCH 6/6] Update sonic-platform-daemons further --- src/sonic-platform-daemons | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons index 61c09186f1bb..8e0704e7245e 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 61c09186f1bb8aeab07203c81ef1975a83889aa7 +Subproject commit 8e0704e7245e1a46d5df9eecc2e18232f30da704