MORELLO_RELEASE_VERSION is not used in the SRCTAG or anywhere else where modifying this variable would've provided easy upgrades. Remove it to prevent any future problems.
Signed-off-by: Jon Mason jon.mason@arm.com --- conf/machine/include/morello-1.5.inc | 1 - conf/machine/include/morello-common.inc | 1 - conf/machine/morello-linux-glibc.conf | 1 - conf/machine/morello-linux-musl.conf | 1 - recipes-core/musl/musl-morello-common.inc | 2 -- 5 files changed, 6 deletions(-) delete mode 100644 conf/machine/include/morello-1.5.inc
diff --git a/conf/machine/include/morello-1.5.inc b/conf/machine/include/morello-1.5.inc deleted file mode 100644 index ba380330b904..000000000000 --- a/conf/machine/include/morello-1.5.inc +++ /dev/null @@ -1 +0,0 @@ -MORELLO_RELEASE_VERSION = "1.5" \ No newline at end of file diff --git a/conf/machine/include/morello-common.inc b/conf/machine/include/morello-common.inc index 31601a40ff8a..cea499653c3c 100644 --- a/conf/machine/include/morello-common.inc +++ b/conf/machine/include/morello-common.inc @@ -1,5 +1,4 @@ require ${COREBASE}/meta/conf/machine/include/arm/armv8-2a/tune-neoversen1.inc -require conf/machine/include/morello-1.5.inc
MACHINEOVERRIDES =. "morello"
diff --git a/conf/machine/morello-linux-glibc.conf b/conf/machine/morello-linux-glibc.conf index 83e09eff2414..3ffd19fd8273 100644 --- a/conf/machine/morello-linux-glibc.conf +++ b/conf/machine/morello-linux-glibc.conf @@ -2,7 +2,6 @@ require conf/machine/include/morello-common.inc
MACHINEOVERRIDES =. "morello-linux-glibc:"
-PREFERRED_PROVIDER_virtual/kernel = "linux-morello-${MORELLO_RELEASE_VERSION}" PREFFERED_PROVIDER_morello-linux-image = "morello-linux-image-glibc" PREFFERED_PROVIDER_morello-initramfs = "morello-initramfs-glibc"
diff --git a/conf/machine/morello-linux-musl.conf b/conf/machine/morello-linux-musl.conf index c059775d0f73..c030a358f8d7 100644 --- a/conf/machine/morello-linux-musl.conf +++ b/conf/machine/morello-linux-musl.conf @@ -4,7 +4,6 @@ MACHINEOVERRIDES =. "morello-linux-musl:"
TARGET_OS ?= "linux-musl"
-PREFERRED_PROVIDER_virtual/kernel = "linux-morello-${MORELLO_RELEASE_VERSION}" PREFFERED_PROVIDER_morello-linux-image = "morello-linux-image-musl" PREFFERED_PROVIDER_morello-initramfs = "morello-initramfs-musl"
diff --git a/recipes-core/musl/musl-morello-common.inc b/recipes-core/musl/musl-morello-common.inc index f296e087b914..158331c6f980 100644 --- a/recipes-core/musl/musl-morello-common.inc +++ b/recipes-core/musl/musl-morello-common.inc @@ -1,5 +1,3 @@ -require musl-morello-${MORELLO_RELEASE_VERSION}.inc - DESCRIPTION = "CHERI enabled musl libc" OUTPUTS_NAME = "libc" LICENSE = "MIT"