From d88f5d53d1471443f3ee5f9899177598d2dc156b Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@xilinx.com>
Date: Thu, 14 Oct 2021 11:41:47 -0700
Subject: meta-xilinx-standalone-experimental: various fixes for override
 syntax changes

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
---
 meta-xilinx-standalone-experimental/classes/esw.bbclass             | 6 +++---
 .../recipes-core/meta/meta-xilinx-setup.bb                          | 1 -
 meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb   | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass
index f95dc692..9169bbe9 100644
--- a/meta-xilinx-standalone-experimental/classes/esw.bbclass
+++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass
@@ -46,9 +46,9 @@ def get_xlnx_cmake_processor(tune, machine, d):
     cmake_processor = tune
     if tune.startswith('microblaze'):
         if (machine == 'microblaze-pmu'):
-            cmake_processor = 'pmu:microblaze'
+            cmake_processor = 'pmu_microblaze'
         elif (machine == 'microblaze-plm'):
-            cmake_processor = 'plm:microblaze'
+            cmake_processor = 'plm_microblaze'
         else:
             cmake_processor = 'microblaze'
     elif (tune in [ 'cortexr5', 'cortexr5f' ]):
@@ -65,7 +65,7 @@ XLNX_CMAKE_MACHINE = "${@get_xlnx_cmake_machine(d.getVar('SOC_FAMILY'), d)}"
 XLNX_CMAKE_PROCESSOR = "${@get_xlnx_cmake_processor(d.getVar('DEFAULTTUNE'), d.getVar('ESW_MACHINE'), d)}"
 XLNX_CMAKE_SYSTEM_NAME ?= "Generic"
 
-cmake_do_generate_toolchain_file_append() {
+cmake_do_generate_toolchain_file:append() {
     cat >> ${WORKDIR}/toolchain.cmake <<EOF
     include(CMakeForceCompiler)
     CMAKE_FORCE_C_COMPILER("${OECMAKE_C_COMPILER}" GNU)
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb b/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb
index a2e0d364..79905ed4 100644
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb
@@ -33,7 +33,6 @@ RDEPENDS = "${TOOLCHAIN_HOST_TASK}"
 
 EXCLUDE_FROM_WORLD = "1"
 
-inherit meta
 inherit populate_sdk
 inherit toolchain-scripts-base
 inherit nopackages
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
index 11e44c28..554e2636 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
@@ -4,14 +4,14 @@ ESW_COMPONENT_SRC = "/ThirdParty/sw_services/lwip211/src/"
 ESW_COMPONENT_NAME = "liblwip211.a"
 
 DEPENDS += "libxil"
-DEPENDS:append_xilinx-freertos = "freertos10-xilinx"
+DEPENDS:append:xilinx-freertos = "freertos10-xilinx"
 
 EXTRA_OECMAKE += "-Dlwip_api_mode=RAW_API"
 EXTRA_OECMAKE += "-Dlwip_dhcp_does_arp_check=ON"
 EXTRA_OECMAKE += "-Dlwip_dhcp=ON"
 EXTRA_OECMAKE += "-Dlwip_pbuf_pool_size=2048"
 EXTRA_OECMAKE += "-Dlwip_ipv6_enable=OFF"
-EXTRA_OECMAKE:append_xilinx-freertos += "-Dlwip_api_mode=SOCKET_API"
+EXTRA_OECMAKE:append:xilinx-freertos += "-Dlwip_api_mode=SOCKET_API"
 
 do_configure:prepend() {
     # This script should also not rely on relative paths and such
-- 
cgit v1.2.3-54-g00ecf