honister: Fix override syntax HYP-27440

The recipe override syntax has changed with Yocto 3.4 honister.

Signed-off-by: Mario Schuknecht <[email protected]>

conf/machine/himx0294.conf

@@ -7,6 +7,7 @@ MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:"
 
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa9.inc
+include conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
 # To be able to use NXP BSP only recipes. See meta-freescale/classes/use-imx-headers.bbclass
 IMX_DEFAULT_BSP = "nxp"

recipes-bsp/healthy/healthy.bb

@@ -7,19 +7,19 @@ LIC_FILES_CHKSUM = " file://../COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 "
 # do not generate rc-links
 inherit systemd allarch
 
-RDEPENDS_${PN} = " bootconfig "
+RDEPENDS:${PN} = " bootconfig "
 
 PR = "r6"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI = " file://healthy.service \
 	    file://COPYING "
 
 # systemd
 PACKAGES = " ${PN} "
 
-FILES_${PN} = "${base_libdir}/systemd"
+FILES:${PN} = "${base_libdir}/systemd"
 
 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE = "healthy.service"

recipes-bsp/imx-test/imx-test_git.bbappend

@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append = " file://0001-test-Makefile-Add-include-path-to-CC-command.patch "
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append = " file://0001-test-Makefile-Add-include-path-to-CC-command.patch "

recipes-bsp/imx-vpu/imx-vpu_%.bbappend

@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append = " file://0001-HYP-13714-increase-vpu-instances-from-32-to-64.patch "
+SRC_URI:append = " file://0001-HYP-13714-increase-vpu-instances-from-32-to-64.patch "

recipes-bsp/u-boot/libubootenv_%.bbappend

@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-2021.01:${THISDIR}/libubootenv:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-2021.01:${THISDIR}/libubootenv:"
 
-SRC_URI_append_himx0294 = " \
+SRC_URI:append:himx0294 = " \
 	file://fw_env.config \
 	file://fw_env-ipcam.config \
 	file://0001-Add-libz-as-libuboot-dependency.patch \
 "
 
-do_install_append_himx0294 () {
+do_install:append:himx0294 () {
 	install -d ${D}/etc
 	install -m 755 ${WORKDIR}/fw_env.config ${D}/etc/fw_env.config
 	install -m 755 ${WORKDIR}/fw_env-ipcam.config ${D}/etc/fw_env-ipcam.config

recipes-bsp/u-boot/u-boot_2021.01.bbappend

@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-${PV}:${THISDIR}/u-boot:${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-${PV}:${THISDIR}/u-boot:${THISDIR}/files:"
 
-SRC_URI_append_himx0294 = " \
+SRC_URI:append:himx0294 = " \
 	file://0001-himx0294-Add-Kconfig.patch \
 	file://0001-himx-impec-revision-detection-pin.patch \
 	file://himx0294.c \
@@ -28,7 +28,7 @@ SRC_URI_append_himx0294 = " \
 	file://imximage-1GiB.cfg \
 "
 
-do_configure_prepend() {
+do_configure:prepend() {
 	mkdir -p ${S}/board/freescale/himx0294
 	cp ${WORKDIR}/himx0294.c ${S}/board/freescale/himx0294/
 	cp ${WORKDIR}/Makefile ${S}/board/freescale/himx0294/

recipes-connectivity/avahi/avahi_%.bbappend

@@ -1,3 +1,3 @@
 # look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 

recipes-connectivity/openssh/openssh_8.5p1.bbappend

@@ -12,5 +12,5 @@
 # ------------------------------------------------------------------------------------------
 # As workaround this sshd_config disables PermitEmptyPasswords
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/openssh:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/openssh:"
 

recipes-connectivity/samba/samba_%.bbappend

@@ -2,30 +2,30 @@
 
 inherit systemd
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append = " file://samba.service \
+SRC_URI:append = " file://samba.service \
                    file://netbios.service "
 
 # systemd
 PACKAGES =+ "${PN}-systemd"
 
-FILES_${PN}-systemd += " ${base_libdir}/systemd "
+FILES:${PN}-systemd += " ${base_libdir}/systemd "
 
-FILES_${PN} += " /usr/lib/pdb \
+FILES:${PN} += " /usr/lib/pdb \
 		 /usr/lib/gpext \
 		 /usr/lib/rpc \
 		 /usr/lib/idmap \
 		 /usr/lib/nss_info \
 		 /usr/lib/perfcount "
 
-RDEPENDS_${PN}-systemd += "${PN}"
+RDEPENDS:${PN}-systemd += "${PN}"
 
 SYSTEMD_PACKAGES = "${PN}-systemd"
 
 SYSTEMD_SERVICE = "samba.service netbios.service "
 
-do_install_append () {
+do_install:append () {
   install -d ${D}${base_libdir}/systemd/system
 
   install -m 0644 ${WORKDIR}/samba.service ${D}${base_libdir}/systemd/system/

recipes-core/base-files/base-files_3.0.14.bbappend

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 # Original: volatiles = "cache run log lock tmp"
 # We don't any of those in volatiles, so:

recipes-core/busybox/busybox_%.bbappend

@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
 	       file://0001-trace-error-but-don-t-die-HYP-20553.patch \
 "
 
-pkg_postinst_${PN}_append () {
+pkg_postinst:${PN}:append () {
 # update-alternatives has an error code if e.g. no symlink is found.
 # update-alternatives: Error: not linking /sbin/mke2fs to /bin/busybox.nosuid since /sbin/mke2fs exists and is not a link
 # This means that all subsequent update-alternative calls are not executed.

recipes-core/ifupdown/ifupdown_%.bbappend

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI += " \
 	file://background.patch \

recipes-core/init-ifupdown/init-ifupdown_%.bbappend

@@ -1,19 +1,19 @@
 # look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " file://99-ifupdown.conf \
              file://ethconfig \
 "
 
-do_install_append() {
+do_install:append() {
 	# install sysctl configurations
 	install -d ${D}${sysconfdir}/sysctl.d
 	install -m 0644 ${S}/99-ifupdown.conf ${D}${sysconfdir}/sysctl.d
 	install -d ${D}${sysconfdir}/network/if-up.d
 	install -m 0755 ${S}/ethconfig ${D}${sysconfdir}/network/if-up.d
 }
 
-pkg_postinst_ontarget_${PN}() {
+pkg_postinst_ontarget:${PN}() {
 	update-rc.d networking defaults
 }
 

recipes-core/systemd/systemd-compat-units.bbappend

@@ -1 +1 @@
-SYSTEMD_DISABLED_SYSV_SERVICES_remove = "networking"
+SYSTEMD_DISABLED_SYSV_SERVICES:remove = "networking"

recipes-core/systemd/systemd-conf_%.bbappend

@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 

recipes-core/systemd/systemd_%.bbappend

@@ -1,30 +1,30 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PACKAGECONFIG_remove = "networkd"
+PACKAGECONFIG:remove = "networkd"
 
 # Enable kmod package configuration
 # A recipe append from meta-angstrom removes kmod configuration.
 # The builtin kmod is mandatory. Otherwise kernel modules are not
 # loaded and it comes to error message:
 # Invalid rule /lib/udev/rules.d/80-drivers.rules:5: RUN{builtin}: 'kmod load $env{MODALIAS}' unknown
-PACKAGECONFIG_append = " kmod "
+PACKAGECONFIG:append = " kmod "
 
-SRC_URI_append = " \
+SRC_URI:append = " \
                file://0001-systemd-automatically-start-networking.service-HYP-1.patch \
                file://0001-udev-wait-for-ldconfig.service-and-opkg-configure.se.patch \
                file://systemd-udev-service-remove-MountFlags.patch \
 "
 
-SRC_URI_append_himx0294 = " \
+SRC_URI:append:himx0294 = " \
 	       file://0001-systemd-halt.service-always-poweroff-on-halt.patch \
 	       file://0001-systemd-reboot.service-always-poweroff-on-reboot.patch \
 "
 
-SRC_URI_append_hinat = " \
+SRC_URI:append:hinat = " \
 	       file://0001-systemd-halt.service-always-poweroff-on-halt.patch \
 	       file://0001-systemd-reboot.service-always-poweroff-on-reboot.patch \
 "
-SRC_URI_append_himx0438 = " \
+SRC_URI:append:himx0438 = " \
 	       file://0001-systemd-halt.service-always-reboot-on-halt.patch \
 "
 

recipes-core/udev/udev-extraconf_%.bbappend

@@ -1,8 +1,8 @@
-RDEPENDS_${PN} += " coreutils "
+RDEPENDS:${PN} += " coreutils "
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
 	       file://0001-Hipos-use-allow-hotplug-HYP-13876.patch \
 "
 

recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend

@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append = " file://0001-mke2fs.conf-define-a-short-proceed_delay-of-1-sec-HY.patch \
+SRC_URI:append = " file://0001-mke2fs.conf-define-a-short-proceed_delay-of-1-sec-HY.patch \
 	file://0001-ext4-64bit-feature-not-activated-by-default.patch \
 "

recipes-devtools/mmc-utils/mmc-utils_%.bbappend

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append = " file://options-ssr-read-and-cmd56.patch "
+SRC_URI:append = " file://options-ssr-read-and-cmd56.patch "
 

recipes-devtools/mtd/mtd-utils_%.bbappend

@@ -2,11 +2,11 @@
 # MTD dev package
 #
 
-FILES_${PN}-staticdev += "          \
+FILES:${PN}-staticdev += "          \
     ${includedir}/mtd/libmtd.h      \
 "
 
-do_install_append() {
+do_install:append() {
     # MTD dev package:
     # install libmtd and its headers
 

recipes-extended/procps/procps_%.bbappend

@@ -1,5 +1,5 @@
 
-do_install_append() {
+do_install:append() {
     TEMP_DATA=$(cat ${D}${sysconfdir}/sysctl.conf | grep -v "kernel.panic");echo "$TEMP_DATA
 kernel.panic=30">${D}${sysconfdir}/sysctl.conf
     TEMP_DATA=$(cat ${D}${sysconfdir}/sysctl.conf | grep -v "kernel.panic_on_oops");echo "$TEMP_DATA

recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.0-aarch64.bbap

@@ -1,2 +1,2 @@
 
-REQUIRED_DISTRO_FEATURES_remove_mx8 = "wayland"
+REQUIRED_DISTRO_FEATURES:remove:mx8 = "wayland"

recipes-hipos/hip-board/hip-board_git.bb

@@ -2,7 +2,7 @@ DESCRIPTION = "Obtain HydraIP board util"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = " file://../COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 "
-RDEPENDS_${PN} = "bash hip-machinfo mtd-utils"
+RDEPENDS:${PN} = "bash hip-machinfo mtd-utils"
 
 PR = "r1"
 

recipes-hipos/hip-machinfo/hip-machinfo_git.bb

@@ -2,7 +2,7 @@ DESCRIPTION = "Obtain HydraIP machine/submachine type"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = " file://../COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 "
-RDEPENDS_${PN} = "bash"
+RDEPENDS:${PN} = "bash"
 
 PR = "r1"
 

recipes-hipos/hipos-device-info/hipos-device-info.bb

@@ -5,19 +5,19 @@ LIC_FILES_CHKSUM = " file://../COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 "
 
 inherit systemd allarch
 
-RDEPENDS_${PN} = "libdrbcc bash hip-machinfo hip-board"
+RDEPENDS:${PN} = "libdrbcc bash hip-machinfo hip-board"
 
 PR = "r23"
 
 SRC_URI = " file://hipos-device-info.service  \
             file://hipos-device-info.sh \
 	    file://COPYING "
 
-FILES_${PN} = "${base_libdir}/systemd \
+FILES:${PN} = "${base_libdir}/systemd \
                ${sysconfdir}/hipos/hipos-device-info.sh \
 		"
 
-SYSTEMD_SERVICE_${PN} = "hipos-device-info.service"
+SYSTEMD_SERVICE:${PN} = "hipos-device-info.service"
 
 do_install () {
   install -d ${D}${base_libdir}/systemd/system

recipes-hipos/hipos-lte-gps/hipos-lte-gps.bb

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " file://../COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 "
 
 inherit systemd allarch
 
-RDEPENDS_${PN} = " bash gpsd "
+RDEPENDS:${PN} = " bash gpsd "
 
 PR = "r13"
 
@@ -18,13 +18,13 @@ SRC_URI = " \
         file://hipos-gps-on.sh \
 	    file://COPYING "
 
-FILES_${PN} = "${base_libdir}/systemd \
+FILES:${PN} = "${base_libdir}/systemd \
                ${sysconfdir}/hipos/hipos-lte-gps.sh \
                ${sysconfdir}/hipos/hipos-gps-on.sh \
 	       ${sysconfdir}/udev/rules.d/99-modem.rules \
 	       ${sysconfdir}/udev/rules.d/99-gps.rules "
 
-SYSTEMD_SERVICE_${PN} = "hipos-lte-gps.service modem-at.service"
+SYSTEMD_SERVICE:${PN} = "hipos-lte-gps.service modem-at.service"
 
 do_install () {
   install -d ${D}${base_libdir}/systemd/system

recipes-hipos/hipos-net-check/hipos-net-check.bb

@@ -5,19 +5,19 @@ LIC_FILES_CHKSUM = " file://../COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 "
 
 inherit systemd allarch
 
-RDEPENDS_${PN} = "python3"
+RDEPENDS:${PN} = "python3"
 
 PR = "r1"
 
 SRC_URI = " file://hipos-net-check.service  \
             file://hipos-net-check.py \
 	          file://COPYING "
 
-FILES_${PN} = "${base_libdir}/systemd \
+FILES:${PN} = "${base_libdir}/systemd \
                ${sysconfdir}/hipos/hipos-net-check.py \
 		"
 
-SYSTEMD_SERVICE_${PN} = "hipos-net-check.service"
+SYSTEMD_SERVICE:${PN} = "hipos-net-check.service"
 
 do_install () {
   install -d ${D}${base_libdir}/systemd/system

recipes-hipos/hipos-network-setup/hipos-network-setup.bb

@@ -5,19 +5,19 @@ LIC_FILES_CHKSUM = " file://../COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 "
 
 inherit systemd allarch
 
-RDEPENDS_${PN} = " ethtool bash hip-machinfo "
+RDEPENDS:${PN} = " ethtool bash hip-machinfo "
 
 PR = "r26"
 
 SRC_URI = " file://hipos-network-setup.service  \
             file://hipos-network-setup.sh \
 	    file://COPYING "
 
-FILES_${PN} = "${base_libdir}/systemd \
+FILES:${PN} = "${base_libdir}/systemd \
                ${sysconfdir}/hipos/hipos-network-setup.sh \
 		"
 
-SYSTEMD_SERVICE_${PN} = "hipos-network-setup.service"
+SYSTEMD_SERVICE:${PN} = "hipos-network-setup.service"
 
 do_install () {
   install -d ${D}${base_libdir}/systemd/system