From eb80e80538eb66a1123e94357c455cc6e8f78e75 Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Mon, 11 Jan 2021 12:42:54 +0800 Subject: Revert "yocto-bsp: explicitly set preferred version for reference boards" This reverts commit da27ca50eebf80463cb8d7b85f3b705254823413. We usually select the preferred kernel version in the machine conf. This is also what recommend in the BSP Developer's Guide. The beaglebone-yocto and edgerouter have already done this in their machine conf files. Resetting it in the layer conf is redundant. So revert this patch first, we will also explicitly select the kernel version for the x86 machines in the following patch. (From meta-yocto rev: 825645ff2b663ae5c5845e8ae4679f6e346eac8c) Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/layer.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/meta-yocto-bsp/conf/layer.conf b/meta-yocto-bsp/conf/layer.conf index eb9f55ea97..bf0c1bfece 100644 --- a/meta-yocto-bsp/conf/layer.conf +++ b/meta-yocto-bsp/conf/layer.conf @@ -5,12 +5,6 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" - -PREFERRED_VERSION_linux-yocto_genericx86 ?= "5.8%" -PREFERRED_VERSION_linux-yocto_genericx86-64 ?= "5.8%" -PREFERRED_VERSION_linux-yocto_edgerouter ?= "5.8%" -PREFERRED_VERSION_linux-yocto_beaglebone-yocto ?= "5.8%" - BBFILE_COLLECTIONS += "yoctobsp" BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" BBFILE_PRIORITY_yoctobsp = "5" -- cgit v1.2.3-54-g00ecf