Changed the compatible machine from morello-linux to morello, this was done to match the new machine config.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- recipes-core/busybox/busybox-morello.inc | 2 +- recipes-core/musl/musl_%.bbappend | 4 ++-- recipes-devtools/gdb/gdb_%.bbappend | 2 +- recipes-devtools/llvm/llvm-morello_13.0.bb | 2 +- recipes-kernel/linux/linux-morello.inc | 2 +- recipes-morello-apps/applications/pure-cap-app.bb | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/recipes-core/busybox/busybox-morello.inc b/recipes-core/busybox/busybox-morello.inc index 7c5fd9d..97bb2ef 100644 --- a/recipes-core/busybox/busybox-morello.inc +++ b/recipes-core/busybox/busybox-morello.inc @@ -1,6 +1,6 @@ inherit llvm-morello-native
-COMPATIBLE_MACHINE = "morello-linux" +COMPATIBLE_MACHINE = "morello" SUMMARY = "CHERI enabled busybox" LICENSE = "GPL-2.0-only" SECTION = "base" diff --git a/recipes-core/musl/musl_%.bbappend b/recipes-core/musl/musl_%.bbappend index cfe23e8..4f899a9 100644 --- a/recipes-core/musl/musl_%.bbappend +++ b/recipes-core/musl/musl_%.bbappend @@ -1,8 +1,8 @@ require musl-morello-${MORELLO_ARCH}.inc musl-morello-${MORELLO_ARCH}-so.inc musl-morello-target.inc
MACHINE_INC ?= "" -MACHINE_INC:morello-linux-glibc = "override-glibc.inc" -MACHINE_INC:morello-linux-musl = "override-musl.inc" +MACHINE_INC:morello-soc = "override-glibc.inc" +MACHINE_INC:morello-fvp = "override-glibc.inc"
require ${MACHINE_INC}
diff --git a/recipes-devtools/gdb/gdb_%.bbappend b/recipes-devtools/gdb/gdb_%.bbappend index a73a113..631c79e 100644 --- a/recipes-devtools/gdb/gdb_%.bbappend +++ b/recipes-devtools/gdb/gdb_%.bbappend @@ -1,4 +1,4 @@ -COMPATIBLE_MACHINE = "morello-linux" +COMPATIBLE_MACHINE = "morello"
SRC_URI = "git://git.morello-project.org/morello/binutils-gdb.git;protocol=https;branch=${SRCBRANCH}" SRCBRANCH = "users/ARM/morello-binutils-gdb-master" diff --git a/recipes-devtools/llvm/llvm-morello_13.0.bb b/recipes-devtools/llvm/llvm-morello_13.0.bb index dc10f9d..61bc9bd 100644 --- a/recipes-devtools/llvm/llvm-morello_13.0.bb +++ b/recipes-devtools/llvm/llvm-morello_13.0.bb @@ -1,5 +1,5 @@
-COMPATIBLE_MACHINE = "morello-linux" +COMPATIBLE_MACHINE = "morello" DESCRIPTION = "The Morello LLVM Compiler Infrastructure for A64" SUMMARY = "LLVM Morello" HOMEPAGE = "https://git.morello-project.org/morello/llvm-project-releases" diff --git a/recipes-kernel/linux/linux-morello.inc b/recipes-kernel/linux/linux-morello.inc index cb9f1db..30f681f 100644 --- a/recipes-kernel/linux/linux-morello.inc +++ b/recipes-kernel/linux/linux-morello.inc @@ -1,6 +1,6 @@ inherit llvm-morello-native require recipes-kernel/linux/linux-yocto.inc -COMPATIBLE_MACHINE = "morello-linux" +COMPATIBLE_MACHINE = "morello" SUMMARY = "Morello Linux kernel fork" DESCRIPTION = "CHERI aware Linux kernel" OUTPUTS_NAME = "morello-linux" diff --git a/recipes-morello-apps/applications/pure-cap-app.bb b/recipes-morello-apps/applications/pure-cap-app.bb index a5b2e01..7f3c6db 100644 --- a/recipes-morello-apps/applications/pure-cap-app.bb +++ b/recipes-morello-apps/applications/pure-cap-app.bb @@ -1,6 +1,6 @@ inherit pure-cap-application llvm-morello-native
-COMPATIBLE_MACHINE = "morello-linux" +COMPATIBLE_MACHINE = "morello" SUMMARY = "Simple capability application" DESCRIPTION = "Application used in the series of blogs found @ https://www.thegoodpenguin.co.uk/blog/tag/morello/" OUTPUTS_NAME = "pure-cap-app"