From ae7ed6c9db24956774935ef2b09a3185a5cb0af7 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 9 Aug 2021 19:05:08 -0400 Subject: [PATCH] arm-bsp: Update kernel recipes to match upstream format Using recipes-kernel/linux/linux-yocto_5.4.bb as a guide, format the kernel recipes to match. This enables easier diffing and updating. Signed-off-by: Jon Mason --- meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb | 11 +++++++++-- meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6.bb | 11 +++++++++-- meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7.bb | 12 +++++++++--- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb index 9d5e9ce8..036cb00a 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb +++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb @@ -1,4 +1,4 @@ -KBRANCH = "v5.3/base" +KBRANCH ?= "v5.3/standard/base" require recipes-kernel/linux/linux-yocto.inc @@ -8,8 +8,15 @@ SRCREV_meta = "8d0ed83a864cc91eef4d2abbc90f13d4ecd1c213" 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.4;destsuffix=${KMETA}" -LINUX_VERSION = "5.3.18" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +LINUX_VERSION = "5.3.18" + +DEPENDS += "openssl-native util-linux-native" PV = "${LINUX_VERSION}+git${SRCPV}" + KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "1" + +# Functionality flags +KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6.bb b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6.bb index d17cb308..33e6dd93 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6.bb +++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6.bb @@ -1,4 +1,4 @@ -KBRANCH = "v5.6/base" +KBRANCH ?= "v5.6/standard/base" require recipes-kernel/linux/linux-yocto.inc @@ -8,8 +8,15 @@ SRCREV_meta = "b152cd93ea7046a835c869a76085aefdb6ce7421" 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.6;destsuffix=${KMETA}" -LINUX_VERSION = "5.6.14" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +LINUX_VERSION = "5.6.14" + +DEPENDS += "openssl-native util-linux-native" PV = "${LINUX_VERSION}+git${SRCPV}" + KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "1" + +# Functionality flags +KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7.bb b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7.bb index 12eaa592..81b602d6 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7.bb +++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7.bb @@ -1,4 +1,4 @@ -KBRANCH = "v5.7/base" +KBRANCH ?= "v5.7/standard/base" require recipes-kernel/linux/linux-yocto.inc @@ -8,9 +8,15 @@ SRCREV_meta = "b9e6fd082dc5bfb51699809d7119d4b20d280c0b" 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.7;destsuffix=${KMETA}" -LINUX_VERSION = "5.7.19" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +LINUX_VERSION = "5.7.19" + +DEPENDS += "openssl-native util-linux-native" PV = "${LINUX_VERSION}+git${SRCPV}" -KMETA = "kernel-meta" +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "1" + +# Functionality flags +KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"