Prepending new definitions should be preferred to assignment, as it is simpler and more conducive to defining new machine configurations that reuse these configurations. --- conf/machine/raspberrypi-cm.conf | 2 +- conf/machine/raspberrypi0-2w-64.conf | 4 ++-- conf/machine/raspberrypi0-2w.conf | 4 ++-- conf/machine/raspberrypi0.conf | 2 +- conf/machine/raspberrypi3-64.conf | 2 +- conf/machine/raspberrypi4-64.conf | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/conf/machine/raspberrypi-cm.conf b/conf/machine/raspberrypi-cm.conf index f9371df..365d030 100644 --- a/conf/machine/raspberrypi-cm.conf +++ b/conf/machine/raspberrypi-cm.conf @@ -2,7 +2,7 @@ #@NAME: RaspberryPi Compute Module (CM1) #@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module (CM1) -MACHINEOVERRIDES = "raspberrypi:${MACHINE}" +MACHINEOVERRIDES =. "raspberrypi:" include conf/machine/raspberrypi.conf ARMSTUB ?= "armstub.bin" diff --git a/conf/machine/raspberrypi0-2w-64.conf b/conf/machine/raspberrypi0-2w-64.conf index 8e4729a..0264107 100644 --- a/conf/machine/raspberrypi0-2w-64.conf +++ b/conf/machine/raspberrypi0-2w-64.conf @@ -2,9 +2,9 @@ #@NAME: RaspberryPi0 2 Wifi Development Board #@DESCRIPTION: Machine configuration for the RaspberryPi0 2 Wifi in 64 bits mode -include conf/machine/raspberrypi3-64.conf +MACHINEOVERRIDES =. "raspberrypi3-64:" -MACHINEOVERRIDES := "${@'${MACHINEOVERRIDES}'.replace(':${MACHINE}',':raspberrypi3-64:${MACHINE}')}" +include conf/machine/raspberrypi3-64.conf MACHINE_EXTRA_RRECOMMENDS += "\ linux-firmware-rpidistro-bcm43436 \ diff --git a/conf/machine/raspberrypi0-2w.conf b/conf/machine/raspberrypi0-2w.conf index c360d90..cc11b9d 100644 --- a/conf/machine/raspberrypi0-2w.conf +++ b/conf/machine/raspberrypi0-2w.conf @@ -2,9 +2,9 @@ #@NAME: RaspberryPi0 2 Wifi Development Board #@DESCRIPTION: Machine configuration for the RaspberryPi0 2 Wifi in 32 bits mode -include conf/machine/raspberrypi3.conf +MACHINEOVERRIDES =. "raspberrypi3:" -MACHINEOVERRIDES := "${@'${MACHINEOVERRIDES}'.replace(':${MACHINE}',':raspberrypi3:${MACHINE}')}" +include conf/machine/raspberrypi3.conf MACHINE_EXTRA_RRECOMMENDS += "\ linux-firmware-rpidistro-bcm43436 \ diff --git a/conf/machine/raspberrypi0.conf b/conf/machine/raspberrypi0.conf index 80297b5..597918a 100644 --- a/conf/machine/raspberrypi0.conf +++ b/conf/machine/raspberrypi0.conf @@ -2,7 +2,7 @@ #@NAME: RaspberryPi Zero Development Board #@DESCRIPTION: Machine configuration for the RaspberryPi Zero board (https://www.raspberrypi.org/blog/raspberry-pi-zero) -MACHINEOVERRIDES = "raspberrypi:${MACHINE}" +MACHINEOVERRIDES =. "raspberrypi:" include conf/machine/raspberrypi.conf SERIAL_CONSOLES ?= "115200;ttyAMA0" diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf index 95475f3..ff22f48 100644 --- a/conf/machine/raspberrypi3-64.conf +++ b/conf/machine/raspberrypi3-64.conf @@ -2,7 +2,7 @@ #@NAME: RaspberryPi 3 Development Board #@DESCRIPTION: Machine configuration for the RaspberryPi 3 in 64 bits mode -MACHINEOVERRIDES = "raspberrypi3:${MACHINE}" +MACHINEOVERRIDES =. "raspberrypi3:" MACHINE_EXTRA_RRECOMMENDS += "\ linux-firmware-rpidistro-bcm43430 \ diff --git a/conf/machine/raspberrypi4-64.conf b/conf/machine/raspberrypi4-64.conf index 0cf7d51..a6e2073 100644 --- a/conf/machine/raspberrypi4-64.conf +++ b/conf/machine/raspberrypi4-64.conf @@ -2,7 +2,7 @@ #@NAME: RaspberryPi 4 Development Board (64bit) #@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 64 bits mode -MACHINEOVERRIDES = "raspberrypi4:${MACHINE}" +MACHINEOVERRIDES =. "raspberrypi4:" MACHINE_FEATURES += "pci" MACHINE_EXTRA_RRECOMMENDS += "\ -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#59607): https://lists.yoctoproject.org/g/yocto/message/59607 Mute This Topic: https://lists.yoctoproject.org/mt/98050530/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-