From 9fc670b6a129d7de0ba1b1512e783200c8d9017b Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Fri, 8 Apr 2022 15:25:16 -0400 Subject: [PATCH] linux-yocto: Remove unnecessary, commented out qemuarm entry The line in question is already in place in qemuarm.conf. Remove it from here, as it is not necessary and references an older kernel. (From OE-Core rev: c8350634a9aba9080939af55d8fe91819fb83cc8) Signed-off-by: Jon Mason Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 3 --- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 3 --- 2 files changed, 6 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 0cf14b748f..06242ade68 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -25,9 +25,6 @@ SRCREV_machine:qemumips64 ?= "279f142932679a8ba212ebae4b9db851636a1fab" SRCREV_machine ?= "d2f7a595bf0b752275d503046494b668549cb151" SRCREV_meta ?= "2278ed571c14df6e87d8e01ac26f649d98020623" -# remap qemuarm to qemuarma15 for the 5.8 kernel -# KMACHINE:qemuarm ?= "qemuarma15" - SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 54157fd245..5cfa0c37d7 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -34,9 +34,6 @@ SRCREV_machine:class-devupstream ?= "e29be6724adbc9c3126d2a9550ec21f927f22f6d" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" -# remap qemuarm to qemuarma15 for the 5.8 kernel -# KMACHINE:qemuarm ?= "qemuarma15" - SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"