fix

files/build_templates/sonic_debian_extension.j2

@@ -750,7 +750,7 @@ sudo LANG=C DOCKER_HOST="$DOCKER_HOST" chroot $FILESYSTEM_ROOT docker tag {{imag
 # Check if manifest exists for {{imagename}} and it is a valid JSON
 sudo LANG=C DOCKER_HOST="$DOCKER_HOST" chroot $FILESYSTEM_ROOT docker inspect {{imagename}}:latest \
     | jq '.[0].Config.Labels["com.azure.sonic.manifest"]' -r > /tmp/manifest.json
-jq -e . /tmp/manifest.json || {
+[ -z "{{docker_build_path}}" ] || jq -e . /tmp/manifest.json || {
     >&2 echo "docker image {{imagename}} has no manifest or manifest is not a valid JSON"
     exit 1
 }

files/scripts/ubuntu.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+

rules/ubuntu.dep

@@ -0,0 +1,4 @@
+DEP_FILES := rules/ubuntu.dep rules/ubuntu.mk
+
+$(DOCKER_UBUNTU)_CACHE_MODE  := none
+$(DOCKER_UBUNTU)_DEP_FILES   := $(DEP_FILES)

rules/ubuntu.mk

@@ -0,0 +1,13 @@
+# docker image for load
+
+DOCKER_UBUNTU_STEM = ubuntu
+DOCKER_UBUNTU = $(DOCKER_UBUNTU_STEM).gz
+
+$(DOCKER_UBUNTU)_PACKAGE_NAME = ubuntu
+$(DOCKER_UBUNTU)_CONTAINER_NAME = ubuntu
+$(DOCKER_UBUNTU)_URL = https://sonicstoragepublic.blob.core.windows.net/public/ubuntu.gz
+$(DOCKER_UBUNTU)_RUN_OPT += --privileged -t
+$(DOCKER_UBUNTU)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
+
+DOWNLOADED_DOCKER_IMAGES += $(DOCKER_UBUNTU)
+SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_UBUNTU)

slave.mk

@@ -1299,7 +1299,9 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
 	export sonic_su_dev_signing_key="$(SECURE_UPGRADE_DEV_SIGNING_KEY)"
 	export sonic_su_signing_cert="$(SECURE_UPGRADE_SIGNING_CERT)"
 	export sonic_su_mode="$(SECURE_UPGRADE_MODE)"
+ifneq ($(SECURE_UPGRADE_PROD_SIGNING_TOOL),)
 	export sonic_su_prod_signing_tool="/sonic/scripts/$(shell basename -- $(SECURE_UPGRADE_PROD_SIGNING_TOOL))"
+endif
 	export include_system_telemetry="$(INCLUDE_SYSTEM_TELEMETRY)"
 	export include_restapi="$(INCLUDE_RESTAPI)"
 	export include_nat="$(INCLUDE_NAT)"