From e8ce1f6342da17b4f26b2b6954012328123662cd Mon Sep 17 00:00:00 2001
From: Renuka Manavalan <remanava@microsoft.com>
Date: Wed, 14 Jun 2023 23:29:16 +0000
Subject: [PATCH] Built
 target/debs/bullseye/sonic-device-health_1.0.0-0_amd64.deb

---
 rules/device-health.mk             | 8 ++++----
 sonic-slave-bullseye/Dockerfile.j2 | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/rules/device-health.mk b/rules/device-health.mk
index 94d49470b3df..e3bf9158083b 100644
--- a/rules/device-health.mk
+++ b/rules/device-health.mk
@@ -1,17 +1,17 @@
 # SONiC device-health package
 
 SONIC_DEVICE_HEALTH_VERSION = 1.0.0-0
-SONIC_DEVICE_HEALTH_PKG_NAME = device_health
+SONIC_DEVICE_HEALTH_PKG_NAME = device-health
 
 SONIC_DEVICE_HEALTH = sonic-$(SONIC_DEVICE_HEALTH_PKG_NAME)_$(SONIC_DEVICE_HEALTH_VERSION)_$(CONFIGURED_ARCH).deb
 $(SONIC_DEVICE_HEALTH)_SRC_PATH = $(SRC_PATH)/sonic-device-health
 $(SONIC_DEVICE_HEALTH)_DEPENDS  = $(LIBSWSSCOMMON_DEV) $(LIBSWSSCOMMON) 
 
-SONIC_DEVICE_HEALTH_DBG = sonic-$(SONIC_DEVICE_HEALTH_PKG_NAME)-dbgsym_$(SONIC_DEVICE_HEALTH_VERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(SONIC_DEVICE_HEALTH),$(SONIC_DEVICE_HEALTH_DBG)))
-
 SONIC_DPKG_DEBS += $(SONIC_DEVICE_HEALTH)
 
+# SONIC_DEVICE_HEALTH_DBG = sonic-$(SONIC_DEVICE_HEALTH_PKG_NAME)-dbgsym_$(SONIC_DEVICE_HEALTH_VERSION)_$(CONFIGURED_ARCH).deb
+# $(eval $(call add_derived_package,$(SONIC_DEVICE_HEALTH),$(SONIC_DEVICE_HEALTH_DBG)))
+
 # The .c, .cpp, .h & .hpp files under src/{$DBG_SRC_ARCHIVE list}
 # are archived into debug one image to facilitate debugging.
 #
diff --git a/sonic-slave-bullseye/Dockerfile.j2 b/sonic-slave-bullseye/Dockerfile.j2
index 89b1240bb1b4..bff8930a94f9 100644
--- a/sonic-slave-bullseye/Dockerfile.j2
+++ b/sonic-slave-bullseye/Dockerfile.j2
@@ -114,6 +114,7 @@ RUN apt-get update && apt-get install -y \
         libzmq5 \
         libzmq3-dev \
         uuid-dev \
+        uuid-runtime \
         jq \
         cron \
 # For quagga build
@@ -472,6 +473,11 @@ RUN wget -O golang-go.deb 'https://sonicstorage.blob.core.windows.net/public/fip
  && rm golang-go.deb golang-src.deb
 {%- endif %}
 
+RUN wget -O golang-go.tar.gz https://go.dev/dl/go1.20.3.linux-amd64.tar.gz
+RUN mkdir -p /usr/local/go1.20.3
+RUN tar -C /usr/local/go1.20.3 -xzf golang-go.tar.gz
+RUN rm -f golang-go.tar.gz
+
 RUN pip3 install --upgrade pip
 RUN apt-get purge -y python3-pip python3-yaml