From 9826f87cb466a85cba736529831175437dcc621a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 25 Jul 2021 22:29:23 +0100 Subject: meta-poky/meta-yocto-bsp: Convert to new override syntax This converts the two layers to the new override syntax. This was done using /scripts/contrib/convert-overrides.py with no manual fixes. (From meta-yocto rev: 387eab70f343966267c2a68746aea1bbb8525191) Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 4 ++-- meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-yocto-bsp/conf') diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 04cbd3b5b7..65c79fd34d 100644 --- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -15,9 +15,9 @@ DEFAULTTUNE ?= "cortexa8hf-neon" include conf/machine/include/tune-cortexa8.inc IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" -EXTRA_IMAGECMD_jffs2 = "-lnp " +EXTRA_IMAGECMD:jffs2 = "-lnp " WKS_FILE ?= "beaglebone-yocto.wks" -IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" +IMAGE_INSTALL:append = " kernel-devicetree kernel-image-zimage" do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index 1de069011d..59d96d1417 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -18,7 +18,7 @@ MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" GLIBC_ADDONS = "nptl" -EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" +EXTRA_OECONF:append:pn-matchbox-panel-2 = " --with-battery=acpi" IMAGE_FSTYPES += "wic wic.bmap" WKS_FILE ?= "genericx86.wks.in" -- cgit v1.2.3-54-g00ecf