From e483b5752581e82fa42207d58ab33ebf51238ec3 Mon Sep 17 00:00:00 2001
From: Paul Le Guen de Kerneizon <paul.leguendekerneizon@savoirfairelinux.com>
Date: Fri, 15 Mar 2024 14:38:58 +0100
Subject: [PATCH] machine: replace occurrences of votp

`votp` is an old name that does mean anything anymore in Seapath. This
commit replaces all occurrences in the machine names.

SFL: #14299
Change-Id: I95f5d72834a303027878042af1e301d8a24fd05a
Signed-off-by: Paul Le Guen de Kerneizon <paul.leguendekerneizon@savoirfairelinux.com>
---
 conf/distro/seapath-flash.conf                            | 2 +-
 conf/distro/seapath-host-common.inc                       | 2 +-
 conf/machine/{votp-host.conf => seapath-hypervisor.conf}  | 4 ++--
 conf/machine/{votp-flash.conf => seapath-installer.conf}  | 2 +-
 ...votp-machine-common.inc => seapath-machine-common.inc} | 2 +-
 conf/machine/{votp-monitor.conf => seapath-monitor.conf}  | 4 ++--
 .../machine/{votp-no-iommu.conf => seapath-no-iommu.conf} | 6 +++---
 conf/machine/{votp-guest.conf => seapath-vm.conf}         | 4 ++--
 recipes-bsp/grub/grub-efi_%.bbappend                      | 4 ++--
 recipes-core/images/seapath-flasher-cpio.bb               | 2 +-
 recipes-core/images/seapath-flasher.bb                    | 2 +-
 recipes-core/images/seapath-guest-common.inc              | 6 +++---
 recipes-core/images/seapath-guest-host-common.inc         | 2 +-
 recipes-core/images/seapath-host-common.inc               | 8 ++++----
 recipes-core/images/seapath-monitor-common.inc            | 2 +-
 recipes-kernel/linux/linux-mainline-rt.inc                | 2 +-
 recipes-kernel/linux/linux-mainline-rt_5.15.bb            | 2 +-
 recipes-kernel/linux/linux-mainline-rt_6.0.bb             | 3 +--
 recipes-kernel/linux/linux-mainline-rt_6.1.bb             | 2 +-
 19 files changed, 30 insertions(+), 31 deletions(-)
 rename conf/machine/{votp-host.conf => seapath-hypervisor.conf} (85%)
 rename conf/machine/{votp-flash.conf => seapath-installer.conf} (93%)
 rename conf/machine/{votp-machine-common.inc => seapath-machine-common.inc} (94%)
 rename conf/machine/{votp-monitor.conf => seapath-monitor.conf} (76%)
 rename conf/machine/{votp-no-iommu.conf => seapath-no-iommu.conf} (67%)
 rename conf/machine/{votp-guest.conf => seapath-vm.conf} (78%)

diff --git a/conf/distro/seapath-flash.conf b/conf/distro/seapath-flash.conf
index 43a67d0a..3fcf0cc8 100644
--- a/conf/distro/seapath-flash.conf
+++ b/conf/distro/seapath-flash.conf
@@ -19,4 +19,4 @@ BUILDHISTORY_COMMIT = "1"
 # Enable Ansible SSH key copy
 DISTRO_FEATURES:append = " ansible"
 
-COMPATIBLE_MACHINE:pn-dpdk = "votp"
+COMPATIBLE_MACHINE:pn-dpdk = "seapath"
diff --git a/conf/distro/seapath-host-common.inc b/conf/distro/seapath-host-common.inc
index c652f32c..9bd40c09 100644
--- a/conf/distro/seapath-host-common.inc
+++ b/conf/distro/seapath-host-common.inc
@@ -7,5 +7,5 @@ require conf/distro/seapath-common.inc
 
 # Enable dpdk for openvswitch
 PACKAGECONFIG:append:pn-openvswitch = " dpdk"
-COMPATIBLE_MACHINE:pn-dpdk = "(votp)"
+COMPATIBLE_MACHINE:pn-dpdk = "(seapath)"
 REQUIERED_VERSION_dpdk = "21.11.%"
diff --git a/conf/machine/votp-host.conf b/conf/machine/seapath-hypervisor.conf
similarity index 85%
rename from conf/machine/votp-host.conf
rename to conf/machine/seapath-hypervisor.conf
index 5eb51241..b11fbe2e 100644
--- a/conf/machine/votp-host.conf
+++ b/conf/machine/seapath-hypervisor.conf
@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 #@TYPE: Machine
-#@NAME: votp-host
+#@NAME: seapath-hypervisor
 #@SOC: x86-64
 #@DESCRIPTION: Machine configuration for hypervisor compatible with SEAPATH
 
-require conf/machine/votp-machine-common.inc
+require conf/machine/seapath-machine-common.inc
 
 APPEND += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'seapath-overlay', 'init=/sbin/init.sh', '', d)} \
diff --git a/conf/machine/votp-flash.conf b/conf/machine/seapath-installer.conf
similarity index 93%
rename from conf/machine/votp-flash.conf
rename to conf/machine/seapath-installer.conf
index 48bc4540..491547eb 100644
--- a/conf/machine/votp-flash.conf
+++ b/conf/machine/seapath-installer.conf
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 #@TYPE: Machine
-#@NAME: votp-flash
+#@NAME: seapath-installer
 #@SOC: x86-64
 #@DESCRIPTION: Machine configuration for flash images
 
diff --git a/conf/machine/votp-machine-common.inc b/conf/machine/seapath-machine-common.inc
similarity index 94%
rename from conf/machine/votp-machine-common.inc
rename to conf/machine/seapath-machine-common.inc
index 3ce8e020..f0d42a45 100644
--- a/conf/machine/votp-machine-common.inc
+++ b/conf/machine/seapath-machine-common.inc
@@ -2,7 +2,7 @@
 # Copyright (C) 2023 Savoir-faire Linux, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-MACHINEOVERRIDES =. "votp:"
+MACHINEOVERRIDES =. "seapath:"
 
 require conf/machine/intel-corei7-64.conf
 PREFERRED_PROVIDER_virtual/kernel = "linux-mainline-rt"
diff --git a/conf/machine/votp-monitor.conf b/conf/machine/seapath-monitor.conf
similarity index 76%
rename from conf/machine/votp-monitor.conf
rename to conf/machine/seapath-monitor.conf
index d8bf691a..7432b82f 100644
--- a/conf/machine/votp-monitor.conf
+++ b/conf/machine/seapath-monitor.conf
@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 #@TYPE: Machine
-#@NAME: votp-monitor
+#@NAME: seapath-monitor
 #@SOC: x86-64
 #@DESCRIPTION: Machine configuration for monitor machines compatible with SEAPATH
 
-require conf/machine/votp-machine-common.inc
+require conf/machine/seapath-machine-common.inc
 APPEND += "init=/sbin/init.sh"
diff --git a/conf/machine/votp-no-iommu.conf b/conf/machine/seapath-no-iommu.conf
similarity index 67%
rename from conf/machine/votp-no-iommu.conf
rename to conf/machine/seapath-no-iommu.conf
index d45d3136..73813342 100644
--- a/conf/machine/votp-no-iommu.conf
+++ b/conf/machine/seapath-no-iommu.conf
@@ -2,10 +2,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
 #@TYPE: Machine
-#@NAME: votp-no-iommu
+#@NAME: seapath-no-iommu
 #@SOC: x86-64
 #@DESCRIPTION: Machine configuration based on x86-64 processor with no IOMMU support
 
-MACHINEOVERRIDES =. "votp-host:"
-require conf/machine/votp-machine-common.inc
+MACHINEOVERRIDES =. "seapath-hypervisor:"
+require conf/machine/seapath-machine-common.inc
 APPEND += "init=/sbin/init.sh"
diff --git a/conf/machine/votp-guest.conf b/conf/machine/seapath-vm.conf
similarity index 78%
rename from conf/machine/votp-guest.conf
rename to conf/machine/seapath-vm.conf
index 0a606c83..ce3985a6 100644
--- a/conf/machine/votp-guest.conf
+++ b/conf/machine/seapath-vm.conf
@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 #@TYPE: Machine
-#@NAME: votp-guest
+#@NAME: seapath-vm
 #@SOC: x86-64
 #@DESCRIPTION: Machine configuration for virtual machines compatible with SEAPATH
 
-require conf/machine/votp-machine-common.inc
+require conf/machine/seapath-machine-common.inc
 MACHINE_FEATURES:append = "seapath-guest"
diff --git a/recipes-bsp/grub/grub-efi_%.bbappend b/recipes-bsp/grub/grub-efi_%.bbappend
index f041f5a6..c808da43 100644
--- a/recipes-bsp/grub/grub-efi_%.bbappend
+++ b/recipes-bsp/grub/grub-efi_%.bbappend
@@ -38,7 +38,7 @@ do_compile:append:class-target() {
     cat "${WORKDIR}/grub-efi.cfg.in" >> "${B}/grub-efi.cfg"
 }
 
-do_install:prepend:class-target:votp-host() {
+do_install:prepend:class-target:seapath-hypervisor() {
     extra_append=""
     if [ -n "${SEAPATH_RT_CORES}" ] ; then
         extra_append="isolcpus=${SEAPATH_RT_CORES} nohz_full=${SEAPATH_RT_CORES} rcu_nocbs=${SEAPATH_RT_CORES}"
@@ -72,4 +72,4 @@ FILES:${PN}:append = " ${EFI_FILES_PATH}"
 
 GRUB_BUILDIN += " password_pbkdf2 probe regexp chain"
 
-COMPATIBLE_MACHINE_${PN}= "votp"
+COMPATIBLE_MACHINE_${PN}= "seapath"
diff --git a/recipes-core/images/seapath-flasher-cpio.bb b/recipes-core/images/seapath-flasher-cpio.bb
index 944d8dfb..472fb8df 100644
--- a/recipes-core/images/seapath-flasher-cpio.bb
+++ b/recipes-core/images/seapath-flasher-cpio.bb
@@ -41,7 +41,7 @@ EXTRA_IMAGE_FEATURES = ""
 USERS_SSH_ANSIBLE = "root"
 
 inherit ansible-ssh
-COMPATIBLE_MACHINE = "votp-flash"
+COMPATIBLE_MACHINE = "seapath-installer"
 
 # 256MB
 INITRAMFS_MAXSIZE = "262144"
diff --git a/recipes-core/images/seapath-flasher.bb b/recipes-core/images/seapath-flasher.bb
index bb0d53b5..57a417af 100644
--- a/recipes-core/images/seapath-flasher.bb
+++ b/recipes-core/images/seapath-flasher.bb
@@ -26,7 +26,7 @@ EXCLUDE_FROM_WORLD = "1"
 
 EXTRA_IMAGE_FEATURES = ""
 
-COMPATIBLE_MACHINE = "votp-flash"
+COMPATIBLE_MACHINE = "seapath-installer"
 
 WKS_FILE = "flasher.wks.in"
 
diff --git a/recipes-core/images/seapath-guest-common.inc b/recipes-core/images/seapath-guest-common.inc
index 619ced8c..4fcab92b 100644
--- a/recipes-core/images/seapath-guest-common.inc
+++ b/recipes-core/images/seapath-guest-common.inc
@@ -24,10 +24,10 @@ IMAGE_INSTALL += " docker-ce docker-ce-contrib python3-docker-compose"
 IMAGE_FSTYPES = "wic.qcow2 wic.vmdk"
 WKS_FILE = "mkefidisk-guest.wks.in"
 
-# Guest images are compatible with votp-vm only
+# Guest images are compatible with seapath-vm only
 # GRUB static configuration for guest machines
-# depends on votp-guest
-COMPATIBLE_MACHINE = "votp-guest"
+# depends on seapath-vm
+COMPATIBLE_MACHINE = "seapath-vm"
 
 # Remove users that do not exist in
 # guest images
diff --git a/recipes-core/images/seapath-guest-host-common.inc b/recipes-core/images/seapath-guest-host-common.inc
index 0f1d8214..f5d03bdc 100644
--- a/recipes-core/images/seapath-guest-host-common.inc
+++ b/recipes-core/images/seapath-guest-host-common.inc
@@ -11,4 +11,4 @@ IMAGE_INSTALL:append = " \
 IMAGE_FSTYPES = "wic.qcow2 wic.vmdk"
 WKS_FILE = "mkbiosdisk.wks.in"
 
-COMPATIBLE_MACHINE = "votp-host"
+COMPATIBLE_MACHINE = "seapath-hypervisor"
diff --git a/recipes-core/images/seapath-host-common.inc b/recipes-core/images/seapath-host-common.inc
index 914537ec..fa831b47 100644
--- a/recipes-core/images/seapath-host-common.inc
+++ b/recipes-core/images/seapath-host-common.inc
@@ -35,12 +35,12 @@ IMAGE_INSTALL:append = " \
 "
 
 IMAGE_INSTALL:append = " cukinia-tests-hypervisor-iommu"
-IMAGE_INSTALL:remove_votp-no-iommu = "cukinia-tests-hypervisor-iommu"
+IMAGE_INSTALL:remove_seapath-no-iommu = "cukinia-tests-hypervisor-iommu"
 
-# Host images are compatible with votp-host only
+# Host images are compatible with seapath-hypervisor only
 # GRUB static configuration for host machines
-# depends on votp-host
-COMPATIBLE_MACHINE = "votp-host"
+# depends on seapath-hypervisor
+COMPATIBLE_MACHINE = "seapath-hypervisor"
 
 def get_seapath_kernel_parameters(d):
     kernel_parameters = ""
diff --git a/recipes-core/images/seapath-monitor-common.inc b/recipes-core/images/seapath-monitor-common.inc
index 5e095cec..2dfb9c45 100644
--- a/recipes-core/images/seapath-monitor-common.inc
+++ b/recipes-core/images/seapath-monitor-common.inc
@@ -12,7 +12,7 @@ IMAGE_INSTALL:append = " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'seapath-readonly', 'system-config-ro', '', d)} \
 "
 
-COMPATIBLE_MACHINE = "votp-monitor"
+COMPATIBLE_MACHINE = "seapath-monitor"
 
 def get_seapath_kernel_parameters(d):
     disable_ipv6 = d.getVar("SEAPATH_DISABLE_IPV6", "")
diff --git a/recipes-kernel/linux/linux-mainline-rt.inc b/recipes-kernel/linux/linux-mainline-rt.inc
index 55bdfc81..d6aed0d5 100644
--- a/recipes-kernel/linux/linux-mainline-rt.inc
+++ b/recipes-kernel/linux/linux-mainline-rt.inc
@@ -38,7 +38,7 @@ S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = " HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}""
 
-COMPATIBLE_MACHINE = "(votp|votp-no-iommu)"
+COMPATIBLE_MACHINE = "(seapath|seapath-no-iommu)"
 
 do_deploy:append() {
    install -m 0644 .config $deployDir/config_kernel
diff --git a/recipes-kernel/linux/linux-mainline-rt_5.15.bb b/recipes-kernel/linux/linux-mainline-rt_5.15.bb
index b6f74d60..afd7a541 100644
--- a/recipes-kernel/linux/linux-mainline-rt_5.15.bb
+++ b/recipes-kernel/linux/linux-mainline-rt_5.15.bb
@@ -21,7 +21,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git;
         file://sched.cfg \
 "
 
-SRC_URI:append_votp-no-iommu = " \
+SRC_URI:append_seapath-no-iommu = " \
         file://no-iommu.cfg \
 "
 
diff --git a/recipes-kernel/linux/linux-mainline-rt_6.0.bb b/recipes-kernel/linux/linux-mainline-rt_6.0.bb
index 25e6357c..dac064b3 100644
--- a/recipes-kernel/linux/linux-mainline-rt_6.0.bb
+++ b/recipes-kernel/linux/linux-mainline-rt_6.0.bb
@@ -21,7 +21,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git;
         file://sched.cfg \
 "
 
-SRC_URI:append_votp-no-iommu = " \
+SRC_URI:append_seapath-no-iommu = " \
         file://no-iommu.cfg \
 "
 
@@ -29,4 +29,3 @@ SRC_URI:append_votp-no-iommu = " \
 # support (like LTTng or perf).
 #SRC_URI:append = " file://traces.cfg"
 
-
diff --git a/recipes-kernel/linux/linux-mainline-rt_6.1.bb b/recipes-kernel/linux/linux-mainline-rt_6.1.bb
index 5bbfbb1b..63b16b78 100644
--- a/recipes-kernel/linux/linux-mainline-rt_6.1.bb
+++ b/recipes-kernel/linux/linux-mainline-rt_6.1.bb
@@ -22,7 +22,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git;
         file://drm.cfg \
 "
 
-SRC_URI:append_votp-no-iommu = " \
+SRC_URI:append_seapath-no-iommu = " \
         file://no-iommu.cfg \
 "