Skip to contentSkip to conversation

remove LINUX_VERSION_EXTENSION

PATCH Applied Trevor Woerner 1 participant 4 messages Jul 13, 2021 – Jul 27, 2021 Arm Rockchip

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remove LINUX_VERSION_EXTENSION

Adding "-rockchip" to the Linux kernel name implies, to me anyway, that this is a vendor kernel. The PREFERRED_PROVIDERs of all kernels specified in this BSP are upstream linux-yocto kernels, not vendor kernels. Therefore remove the version name extension to avoid confusion.

---
 conf/machine/include/rockchip-defaults.inc | 1 -
 1 file changed, 1 deletion(-)
conf/machine/include/rockchip-defaults.inc +0 -1
index 0666119..905b2a6 100644
@@ -3,7 +3,6 @@
 # kernel
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 KCONFIG_MODE ?= "alldefconfig"
-LINUX_VERSION_EXTENSION ?= "-rockchip"
 
 # xserver
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
Signature · 1 line
2.30.0.rc0
#1 lore raw

PATCH 1/1 rock-pi-e: update preferred kernel

The latest updates to linux-yocto-dev now include support for the rock-pi-e so do away with our custom recipe and use the one from oe-core.

---
 conf/machine/rock-pi-e.conf                    |  2 +-
 .../linux/linux-stable-bleeding_5.11.bb        | 18 ------------------
 recipes-kernel/linux/linux-yocto%.bbappend     |  1 +
 3 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-stable-bleeding_5.11.bb
conf/machine/rock-pi-e.conf +1 -1
index 7afe143..9cd3ed4 100644
@@ -7,7 +7,7 @@ require conf/machine/include/rk3328.inc
 
 MACHINEOVERRIDES =. "rock-pi-e:"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-stable-bleeding"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
 KERNEL_DEVICETREE = "rockchip/rk3328-rock-pi-e.dtb"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
 
recipes-kernel/linux/linux-stable-bleeding_5.11.bb deleted +0 -18
deleted file mode 100644
index 508ddae..0000000
@@ -1,18 +0,0 @@
-# the rock-pi-e is very new
-# it's exciting that support has already been added upstream
-# but it's so new that even linux-yocto-dev doesn't have it yet
-#
-# in time we should see the need for this recipe going away
-
-inherit kernel
-require recipes-kernel/linux/linux-yocto.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
-SRCREV = "c03c21ba6f4e95e406a1a7b4c34ef334b977c194"
-LINUX_VERSION = "5.11"
-LINUX_VERSION_EXTENSION = ""
-PV = "${LINUX_VERSION}"
-
-COMPATIBLE_MACHINE_rock-pi-e = "rock-pi-e"
recipes-kernel/linux/linux-yocto%.bbappend +1 -0
index 3789c72..c2fe9ad 100644
@@ -9,6 +9,7 @@ COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4"
 COMPATIBLE_MACHINE_nanopi-m4 = "nanopi-m4"
 COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb"
 COMPATIBLE_MACHINE_rock64 = "rock64"
+COMPATIBLE_MACHINE_rock-pi-e = "rock-pi-e"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
Signature · 1 line
2.30.0.rc0
author Applied
#2 lore raw

Re: [meta-rockchip][PATCH] rock-pi-e: update preferred kernel

Quoted 4 lines · Trevor Woerner

The latest updates to linux-yocto-dev now include support for the rock-pi-e so
do away with our custom recipe and use the one from oe-core.

Quoted 8 lines
---
 conf/machine/rock-pi-e.conf                    |  2 +-
 .../linux/linux-stable-bleeding_5.11.bb        | 18 ------------------
 recipes-kernel/linux/linux-yocto%.bbappend     |  1 +
 3 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-stable-bleeding_5.11.bb

applied to meta-rockchip master

author Applied
#3 lore raw
In reply to Trevor Woerner
Quoted 8 lines · Trevor Woerner

Adding "-rockchip" to the Linux kernel name implies, to me anyway, that this
is a vendor kernel. The PREFERRED_PROVIDERs of all kernels specified in this
BSP are upstream linux-yocto kernels, not vendor kernels. Therefore remove the
version name extension to avoid confusion.

Quoted 5 lines
---
 conf/machine/include/rockchip-defaults.inc | 1 -
 1 file changed, 1 deletion(-)

applied to meta-rockchip master