matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support to add SONiC OS Version in device info (#14601) (#14623)

Browse Source 
Why I did it
Cherry-pick #14601, for code conflict.
Support to add SONiC OS Version in device info.
It will be used to display the version info in the SONiC command "show version". The version is used to do the FIPS certification. We do not do the FIPS certification on a specific release, but on the SONiC OS Version.

SONiC Software Version: SONiC.master-13812.218661-7d94c0c28
SONiC OS Version: 11
Distribution: Debian 11.6
Kernel: 5.10.0-18-2-amd64
Work item tracking
Microsoft ADO (number only): 17894593
How I did it
How to verify it
This commit is contained in:
xumia 2023-04-13 19:28:03 +08:00 committed by GitHub
parent 81ebbf143a
commit 5dbf512cda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.work
View File

@ -513,6 +513,7 @@ SONIC_BUILD_INSTRUCTION := $(MAKE) \
MIRROR_URLS=$(MIRROR_URLS) \ MIRROR_URLS=$(MIRROR_URLS) \
MIRROR_SECURITY_URLS=$(MIRROR_SECURITY_URLS) \ MIRROR_SECURITY_URLS=$(MIRROR_SECURITY_URLS) \
MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \ MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \
SONIC_OS_VERSION=$(SONIC_OS_VERSION) \
$(SONIC_OVERRIDE_BUILD_VARS) $(SONIC_OVERRIDE_BUILD_VARS)
.PHONY: sonic-slave-build sonic-slave-bash init reset .PHONY: sonic-slave-build sonic-slave-bash init reset

1
build_debian.sh
View File

@ -573,6 +573,7 @@ export release="$(if [ -f $FILESYSTEM_ROOT/etc/sonic/sonic_release ]; then cat $
export build_date="$(date -u)" export build_date="$(date -u)"
export build_number="${BUILD_NUMBER:-0}" export build_number="${BUILD_NUMBER:-0}"
export built_by="$USER@$BUILD_HOSTNAME" export built_by="$USER@$BUILD_HOSTNAME"
export sonic_os_version="${SONIC_OS_VERSION}"
j2 files/build_templates/sonic_version.yml.j2 | sudo tee $FILESYSTEM_ROOT/etc/sonic/sonic_version.yml j2 files/build_templates/sonic_version.yml.j2 | sudo tee $FILESYSTEM_ROOT/etc/sonic/sonic_version.yml
## Copy over clean-up script ## Copy over clean-up script

1
files/build_templates/sonic_version.yml.j2
View File

@ -29,3 +29,4 @@ built_by: {{ built_by }}
{% if ENABLE_ASAN == "y" -%} {% if ENABLE_ASAN == "y" -%}
asan: 'yes' asan: 'yes'
{% endif -%} {% endif -%}
sonic_os_version: {{ sonic_os_version }}

2
platform/vs/sonic-version.mk
View File

@ -2,9 +2,11 @@
sonic_version=$(SONIC_GET_VERSION) sonic_version=$(SONIC_GET_VERSION)
sonic_asic_platform=$(CONFIGURED_PLATFORM) sonic_asic_platform=$(CONFIGURED_PLATFORM)
sonic_os_version=$(SONIC_OS_VERSION)
export sonic_version export sonic_version
export sonic_asic_platform export sonic_asic_platform
export sonic_os_version
SONIC_VERSION = sonic_version.yml SONIC_VERSION = sonic_version.yml
$(SONIC_VERSION)_SRC_PATH = $(PLATFORM_PATH)/sonic-version $(SONIC_VERSION)_SRC_PATH = $(PLATFORM_PATH)/sonic-version

3
rules/config
View File

@ -269,3 +269,6 @@ ENABLE_FIPS ?= n
# SONIC_SLAVE_DOCKER_DRIVER - set the sonic slave docker storage driver # SONIC_SLAVE_DOCKER_DRIVER - set the sonic slave docker storage driver
SONIC_SLAVE_DOCKER_DRIVER ?= vfs SONIC_SLAVE_DOCKER_DRIVER ?= vfs
# SONIC_OS_VERSION - sonic os version
SONIC_OS_VERSION ?= 11

1
slave.mk
View File

@ -87,6 +87,7 @@ export CROSS_BUILD_ENVIRON
export BLDENV export BLDENV
export BUILD_WORKDIR export BUILD_WORKDIR
export MIRROR_SNAPSHOT export MIRROR_SNAPSHOT
export SONIC_OS_VERSION
############################################################################### ###############################################################################
## Utility rules ## Utility rules