record components version in base os

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

build_debian.sh

@@ -467,16 +467,15 @@ fi
 
 ## Version file
 sudo mkdir -p $FILESYSTEM_ROOT/etc/sonic
-sudo tee $FILESYSTEM_ROOT/etc/sonic/sonic_version.yml > /dev/null <<EOF
-build_version: '${SONIC_IMAGE_VERSION}'
-debian_version: '$(cat $FILESYSTEM_ROOT/etc/debian_version)'
-kernel_version: '$kversion'
-asic_type: $sonic_asic_platform
-commit_id: '$(git rev-parse --short HEAD)'
-build_date: $(date -u)
-build_number: ${BUILD_NUMBER:-0}
-built_by: $USER@$BUILD_HOSTNAME
-EOF
+export build_version="${SONIC_IMAGE_VERSION}"
+export debian_version="$(cat $FILESYSTEM_ROOT/etc/debian_version)"
+export kernel_version="${kversion}"
+export asic_type="${sonic_asic_platform}"
+export commit_id="$(git rev-parse --short HEAD)"
+export build_date="$(date -u)"
+export build_number="${BUILD_NUMBER:-0}"
+export built_by="$USER@$BUILD_HOSTNAME"
+j2 files/build_templates/sonic_version.yml.j2 | sudo tee $FILESYSTEM_ROOT/etc/sonic/sonic_version.yml
 
 ## Copy over clean-up script
 sudo cp ./files/scripts/core_cleanup.py $FILESYSTEM_ROOT/usr/bin/core_cleanup.py

files/build_templates/sonic_version.yml.j2

@@ -0,0 +1,20 @@
+---
+build_version: '{{ build_version }}'
+{% if debian_version is defined -%}
+debian_version: '{{ debian_version }}'
+{% endif -%}
+{% if kernel_version is defined -%}
+kernel_version: '{{ kernel_version }}'
+{% endif -%}
+asic_type: {{ asic_type }}
+commit_id: '{{ commit_id }}'
+build_date: {{ build_date }}
+build_number: {{ build_number }}
+built_by: {{ built_by }}
+{% if components is defined -%}
+{% for component in components.split() | unique -%}
+{% set name, version = component.split('==') -%}
+{{ name }}: {{ version }}
+{% endfor -%}
+{% endif -%}
+

platform/vs/sonic-version/build_sonic_version.sh

@@ -1,8 +1,7 @@
-tee $1 > /dev/null <<EOF
-build_version: '$sonic_version'
-asic_type: $sonic_asic_platform
-commit_id: '$(git rev-parse --short HEAD)'
-build_date: $(date -u)
-build_number: ${BUILD_NUMBER:-0}
-built_by: $USER@$BUILD_HOSTNAME
-EOF
+export build_version="${sonic_version}"
+export asic_type="${sonic_asic_platform}"
+export commit_id="$(git rev-parse --short HEAD)"
+export build_date="$(date -u)"
+export build_number="${BUILD_NUMBER:-0}"
+export built_by="$USER@$BUILD_HOSTNAME"
+j2 sonic_version.yml.j2 > $1

platform/vs/sonic-version/sonic_version.yml.j2

@@ -0,0 +1 @@
+../../../files/build_templates/sonic_version.yml.j2

rules/functions

@@ -85,6 +85,8 @@ $(2)_MAIN_DEB = $(1)
 $(1)_DERIVED_DEBS += $(2)
 $(2)_URL = $($(1)_URL)
 $(2)_SRC_PATH = $($(1)_SRC_PATH)
+$(2)_NAME = $($(1)_NAME)
+$(2)_VERSION = $($(1)_VERSION)
 SONIC_DERIVED_DEBS += $(2)
 endef
 

rules/sonic-utilities.mk

@@ -1,8 +1,12 @@
 # sonic utilities package
 
-SONIC_UTILITIES_PY3 = sonic_utilities-1.2-py3-none-any.whl
+SONIC_UTILITIES_PY3_VERSION = 1.2
+SONIC_UTILITIES_PY3_NAME = sonic_utilities
+SONIC_UTILITIES_PY3 = $(SONIC_UTILITIES_PY3_NAME)-$(SONIC_UTILITIES_PY3_VERSION)-py3-none-any.whl
 $(SONIC_UTILITIES_PY3)_SRC_PATH = $(SRC_PATH)/sonic-utilities
 $(SONIC_UTILITIES_PY3)_PYTHON_VERSION = 3
+$(SONIC_UTILITIES_PY3)_NAME = $(SONIC_UTILITIES_PY3_NAME)
+$(SONIC_UTILITIES_PY3)_VERSION = $(SONIC_UTILITIES_PY3_VERSION)
 $(SONIC_UTILITIES_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \
                                   $(SWSSSDK_PY3) \
                                   $(SONIC_CONFIG_ENGINE_PY3) \

slave.mk

@@ -932,7 +932,9 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
 	export python_swss_debs+=" $(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(LIBSWSSCOMMON)) $(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(PYTHON_SWSSCOMMON)) $(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(PYTHON3_SWSSCOMMON))"
 	export sonic_utilities_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_UTILITIES_PY3))"
 	export sonic_host_services_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_HOST_SERVICES_PY3))"
-
+	export components="$(foreach component,$(notdir $^),\
+		$(shell [[ ! -z '$($(component)_VERSION)' && ! -z '$($(component)_NAME)' ]] && \
+			echo $($(component)_NAME)==$($(component)_VERSION)))"
 	$(foreach docker, $($*_DOCKERS),\
 		export docker_image="$(docker)"
 		export docker_image_name="$(basename $(docker))"