Add switch silicon vendor string to the image discovery default paths

During image discovery, ONIE looks for installer names in the
following order:

1.  onie-installer-<cpu_arch>-<hw_vendor>_<machine>-r<machine_revision>
2.  onie-installer-<cpu_arch>-<hw_vendor>_<machine>
3.  onie-installer-<hw_vendor>_<machine>
4.  onie-installer-<cpu_arch>
5.  onie-installer

With the advent of ONIE enabled systems supporting multiple switch
silicon vendors, step 4 has become ambiguous.

This patch adds an additional step to the ONIE waterfall that includes
the switch silicon vendor.  In the above waterfall this new step would
be between steps 3 and 4.  The new step looks like:

  onie-installer-<cpu_arch>-<switch_silicon_vendor>

Before the change the kvm_x86_64 machine waterfall discovery looks
like this:

<cpu_arch>            = x86_64
<hw_vendor>_<machine> = kvm_x86_64

Info: Fetching http://10.0.2.2/onie-installer-x86_64-kvm_x86_64-r0 ...
Info: Fetching http://10.0.2.2/onie-installer-x86_64-kvm_x86_64 ...
Info: Fetching http://10.0.2.2/onie-installer-kvm_x86_64 ...
Info: Fetching http://10.0.2.2/onie-installer-x86_64 ...
Info: Fetching http://10.0.2.2/onie-installer ...

After the changing, using a completely fictitious silicon vendor, the
waterfall looks like:

<switch_silicon_vendor> = qemu

Info: Fetching http://10.0.2.2/onie-installer-x86_64-kvm_x86_64-r0 ...
Info: Fetching http://10.0.2.2/onie-installer-x86_64-kvm_x86_64 ...
Info: Fetching http://10.0.2.2/onie-installer-kvm_x86_64 ...
Info: Fetching http://10.0.2.2/onie-installer-x86_64-qemu ...
Info: Fetching http://10.0.2.2/onie-installer-x86_64 ...
Info: Fetching http://10.0.2.2/onie-installer ...

Technically the same information is contained in step #3
"onie-installer-<hw_vendor>_<machine>", however the new file name is
more generic and will be easier for customers to maintain when using
multiple platforms.

Imagine the case of a customer who has multiple x86 hardware platforms,
from different hardware vendors, using different switch silicon.  Also
imagine NOS installers that target a specific switch silicon.

The customer could maintain NOS installers named as in step #2 and be
OK, however, that is a lot of files to manage.

Using the new step "<cpu_arch>-<switch_silicon_vendor>" the end
customer could target all of the x86 platforms from a particular
silicon vendor with a single NOS image.

Signed-off-by: Curt Brune <[email protected]>

Author: Curt Brune

build-config/Makefile

@@ -181,6 +181,9 @@ ifneq ($(filter-out gpt msdos, $(PARTITION_TYPE)),)
   $(error Supported partition types: gpt, msdos)
 endif
 
+# Switch ASIC vendor, should be set in machine.make
+SWITCH_ASIC_VENDOR ?= unknown
+
 TREE_STAMP  = $(STAMPDIR)/tree
 tree-stamp: $(TREE_STAMP)
 $(TREE_STAMP): $(PROJECT_STAMP)

build-config/make/images.make

@@ -252,6 +252,7 @@ $(SYSROOT_COMPLETE_STAMP): $(SYSROOT_CHECK_STAMP)
 	$(Q) echo "onie_partition_type=$(PARTITION_TYPE)" >> $(MACHINE_CONF)
 	$(Q) echo "onie_kernel_version=$(LINUX_RELEASE)" >> $(MACHINE_CONF)
 	$(Q) echo "onie_firmware=$(FIRMWARE_TYPE)" >> $(MACHINE_CONF)
+	$(Q) echo "onie_switch_asic=$(SWITCH_ASIC_VENDOR)" >> $(MACHINE_CONF)
 	$(Q) cp $(LSB_RELEASE_FILE) $(SYSROOTDIR)/etc/lsb-release
 	$(Q) cp $(OS_RELEASE_FILE) $(SYSROOTDIR)/etc/os-release
 	$(Q) cp $(MACHINE_CONF) $(SYSROOTDIR)/etc/machine.conf

machine/kvm_x86_64/machine.make

@@ -18,6 +18,12 @@ else
   $(error Unknown VENDOR_REV)
 endif
 
+# The SWITCH_ASIC_VENDOR is used to further differentiate the platform
+# in the ONIE waterfall.  This string should be the stock ticker
+# symbol of the ASIC vendor, in lower case.  The value in this example
+# here is completely fictitious.
+SWITCH_ASIC_VENDOR = qemu
+
 # The VENDOR_VERSION string is appended to the overal ONIE version
 # string.  HW vendors can use this to appended their own versioning
 # information to the base ONIE version string.

rootconf/default/lib/onie/functions

@@ -31,6 +31,7 @@ onie_default_filenames="\
 $onie_default_filename
 ${filename_prefix}-${onie_arch}-${onie_machine}
 ${filename_prefix}-${onie_machine}
+${filename_prefix}-${onie_arch}-${onie_switch_asic}
 ${filename_prefix}-${onie_arch}
 ${filename_prefix}
 "