From d6d7cb7006685df57bd67489fc9c736110cbae7b Mon Sep 17 00:00:00 2001
From: Myron Sosyak <49795530+msosyak@users.noreply.github.com>
Date: Thu, 24 Jun 2021 09:59:40 +0300
Subject: [PATCH] Fix build with INSTALL_DEBUG_TOOLS=y (#7940)

Why I did it
To Fix SONiC build with INSTALL_DEBUG_TOOLS=y

How I did it
Fixed generate_manifest function to use version prefix in file names

How to verify it
Build SONiC with INSTALL_DEBUG_TOOLS=y
---
 rules/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/functions b/rules/functions
index 705cb654e7..84f548218a 100644
--- a/rules/functions
+++ b/rules/functions
@@ -192,7 +192,7 @@ define generate_manifest
     $(eval export tmpfs=$($(1).gz_CONTAINER_TMPFS))
     $(eval export config_cli_plugin=$($(1).gz_CLI_CONFIG_PLUGIN))
     $(eval export show_cli_plugin=$($(1).gz_CLI_SHOW_PLUGIN))
-    j2 $($*.gz_PATH)/Dockerfile.j2 > $($(1).gz_PATH)/Dockerfile
+    j2 $($*.gz_PATH)/Dockerfile$(2).j2 > $($(1).gz_PATH)/Dockerfile$(2)
     j2 --customize scripts/j2cli/json_filter.py files/build_templates/manifest.json.j2 > $($(1).gz_PATH)/manifest.common.json
     if [ -f $($*.gz_PATH)/manifest.part.json.j2 ]; then
         j2 --customize scripts/j2cli/json_filter.py $($(1).gz_PATH)/manifest.part.json.j2 > $($(1).gz_PATH)/manifest.part.json