From 6a1103b726fdf0a0f524abf24f337e80597e87df Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Mon, 20 Sep 2021 09:39:18 +0200
Subject: [PATCH] misc: More fixes for new syntax

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
 classes/sdcard_image-sunxi.bbclass         | 4 ++--
 conf/machine/include/sunxi-mali-driver.inc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/sdcard_image-sunxi.bbclass b/classes/sdcard_image-sunxi.bbclass
index 4675716..5d694be 100644
--- a/classes/sdcard_image-sunxi.bbclass
+++ b/classes/sdcard_image-sunxi.bbclass
@@ -40,7 +40,7 @@ do_image_sunxi_sdimg[depends] += " \
 # SD card image name
 SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.sunxi-sdimg"
 
-IMAGE_CMD_sunxi-sdimg () {
+IMAGE_CMD:sunxi-sdimg () {
 
 	# Align partitions
 	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
@@ -120,7 +120,7 @@ IMAGE_CMD_sunxi-sdimg () {
 }
 
 # write uboot.itb for arm64 boards
-IMAGE_CMD_sunxi-sdimg_append_sun50i () {
+IMAGE_CMD_sunxi-sdimg:append:sun50i () {
 	if [ -e "${DEPLOY_DIR_IMAGE}/${UBOOT_BINARY}" ]
 	then
 		dd if=${DEPLOY_DIR_IMAGE}/${UBOOT_BINARY} of=${SDIMG} bs=1024 seek=40 conv=notrunc
diff --git a/conf/machine/include/sunxi-mali-driver.inc b/conf/machine/include/sunxi-mali-driver.inc
index 829f366..cb9d7e3 100644
--- a/conf/machine/include/sunxi-mali-driver.inc
+++ b/conf/machine/include/sunxi-mali-driver.inc
@@ -4,7 +4,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "sunxi-mali"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "sunxi-mali"
 PREFERRED_PROVIDER_virtual/egl ?= "sunxi-mali"
 
-PACKAGECONFIG_remove_pn-xserver-xorg = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glamor', '', d)}"
+PACKAGECONFIG:remove:pn-xserver-xorg = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glamor', '', d)}"
 
 XSERVER += "sunxi-mali \
             sunxi-mali-dev"