From be77bec32f7ea42334b60bf8c51f0586f87002f0 Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Sun, 24 May 2020 12:58:13 +0200 Subject: [PATCH] linux-qoriq.inc: build kernel PV as linux-imx.inc For later common kernel *.inc files, adopt setting the PV to the correct kernel version to satisfy the kernel version sanity check. Signed-off-by: Jens Rehsack --- recipes-kernel/linux/linux-qoriq.inc | 3 +++ recipes-kernel/linux/linux-qoriq_5.4.bb | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc index 7f70260a..dcf28401 100644 --- a/recipes-kernel/linux/linux-qoriq.inc +++ b/recipes-kernel/linux/linux-qoriq.inc @@ -18,6 +18,9 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" ZIMAGE_BASE_NAME = "zImage-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" ZIMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +# Set the PV to the correct kernel version to satisfy the kernel version sanity check +PV = "${LINUX_VERSION}+git${SRCPV}" + SCMVERSION ?= "y" LOCALVERSION = "" DELTA_KERNEL_DEFCONFIG ?= "" diff --git a/recipes-kernel/linux/linux-qoriq_5.4.bb b/recipes-kernel/linux/linux-qoriq_5.4.bb index 2d6c7cc5..1b152106 100644 --- a/recipes-kernel/linux/linux-qoriq_5.4.bb +++ b/recipes-kernel/linux/linux-qoriq_5.4.bb @@ -1,5 +1,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +LINUX_VERSION = "5.4.3" + SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/linux;nobranch=1 \ file://0001-Makfefile-linux-5.4-add-warning-cflags-on-LSDK-20.04.patch \ file://0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch \ -- 2.40.1