From d6ffd0afc49001b384e567ea2b9e5124dc26fda8 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Mon, 1 Mar 2021 23:53:14 -0500 Subject: [PATCH] COMPATIBLE_MACHINE cleanup The COMPATIBLE_MACHINE strings were getting unwieldy, so switch to the MACHINEOVERRIDE notation so they're neater. Signed-off-by: Trevor Woerner --- recipes-kernel/linux/linux-stable-bleeding_5.11.bb | 2 +- recipes-kernel/linux/linux-yocto-dev.bbappend | 9 ++++++++- recipes-kernel/linux/linux-yocto-rt_%.bbappend | 9 ++++++++- recipes-kernel/linux/linux-yocto-tiny_%.bbappend | 9 ++++++++- recipes-kernel/linux/linux-yocto_%.bbappend | 10 ++++++++-- 5 files changed, 33 insertions(+), 6 deletions(-) diff --git a/recipes-kernel/linux/linux-stable-bleeding_5.11.bb b/recipes-kernel/linux/linux-stable-bleeding_5.11.bb index dce537d..508ddae 100644 --- a/recipes-kernel/linux/linux-stable-bleeding_5.11.bb +++ b/recipes-kernel/linux/linux-stable-bleeding_5.11.bb @@ -15,4 +15,4 @@ LINUX_VERSION = "5.11" LINUX_VERSION_EXTENSION = "" PV = "${LINUX_VERSION}" -COMPATIBLE_MACHINE = "(rock-pi-e)" +COMPATIBLE_MACHINE_rock-pi-e = "rock-pi-e" diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend index a85b85e..e5ea197 100644 --- a/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1 +1,8 @@ -COMPATIBLE_MACHINE .= "|firefly-rk3288|marsboard-rk3066|radxarock|rock-pi-4|rock2-square|tinker-board-s|tinker-board|vyasa-rk3288|rock-pi-e" +COMPATIBLE_MACHINE_marsboard-rk3066 = "marsboard-rk3066" +COMPATIBLE_MACHINE_rock2-square = "rock2-square" +COMPATIBLE_MACHINE_radxarock = "radxarock" +COMPATIBLE_MACHINE_firefly-rk3288 = "firefly-rk3288" +COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288" +COMPATIBLE_MACHINE_tinker-board = "tinker-board" +COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s" +COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4" diff --git a/recipes-kernel/linux/linux-yocto-rt_%.bbappend b/recipes-kernel/linux/linux-yocto-rt_%.bbappend index 2f498d9..e5ea197 100644 --- a/recipes-kernel/linux/linux-yocto-rt_%.bbappend +++ b/recipes-kernel/linux/linux-yocto-rt_%.bbappend @@ -1 +1,8 @@ -COMPATIBLE_MACHINE .= "|firefly-rk3288|marsboard-rk3066|radxarock|rock-pi-4|rock2-square|tinker-board-s|tinker-board|vyasa-rk3288" +COMPATIBLE_MACHINE_marsboard-rk3066 = "marsboard-rk3066" +COMPATIBLE_MACHINE_rock2-square = "rock2-square" +COMPATIBLE_MACHINE_radxarock = "radxarock" +COMPATIBLE_MACHINE_firefly-rk3288 = "firefly-rk3288" +COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288" +COMPATIBLE_MACHINE_tinker-board = "tinker-board" +COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s" +COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4" diff --git a/recipes-kernel/linux/linux-yocto-tiny_%.bbappend b/recipes-kernel/linux/linux-yocto-tiny_%.bbappend index 2f498d9..e5ea197 100644 --- a/recipes-kernel/linux/linux-yocto-tiny_%.bbappend +++ b/recipes-kernel/linux/linux-yocto-tiny_%.bbappend @@ -1 +1,8 @@ -COMPATIBLE_MACHINE .= "|firefly-rk3288|marsboard-rk3066|radxarock|rock-pi-4|rock2-square|tinker-board-s|tinker-board|vyasa-rk3288" +COMPATIBLE_MACHINE_marsboard-rk3066 = "marsboard-rk3066" +COMPATIBLE_MACHINE_rock2-square = "rock2-square" +COMPATIBLE_MACHINE_radxarock = "radxarock" +COMPATIBLE_MACHINE_firefly-rk3288 = "firefly-rk3288" +COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288" +COMPATIBLE_MACHINE_tinker-board = "tinker-board" +COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s" +COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4" diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend index 97b8cda..e5ea197 100644 --- a/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/recipes-kernel/linux/linux-yocto_%.bbappend @@ -1,2 +1,8 @@ -COMPATIBLE_MACHINE .= "|firefly-rk3288|marsboard-rk3066|radxarock|rock-pi-4|rock2-square|tinker-board-s|tinker-board|vyasa-rk3288" - +COMPATIBLE_MACHINE_marsboard-rk3066 = "marsboard-rk3066" +COMPATIBLE_MACHINE_rock2-square = "rock2-square" +COMPATIBLE_MACHINE_radxarock = "radxarock" +COMPATIBLE_MACHINE_firefly-rk3288 = "firefly-rk3288" +COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288" +COMPATIBLE_MACHINE_tinker-board = "tinker-board" +COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s" +COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4"