[meta-rockchip][PATCH] remove LINUX_VERSION_EXTENSION

[meta-rockchip][PATCH] remove LINUX_VERSION_EXTENSION

[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.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 conf/machine/include/rockchip-defaults.inc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc
index 0666119..905b2a6 100644
--- a/conf/machine/include/rockchip-defaults.inc
+++ b/conf/machine/include/rockchip-defaults.inc
@@ -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"
-- 
2.30.0.rc0

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

[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.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 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

diff --git a/conf/machine/rock-pi-e.conf b/conf/machine/rock-pi-e.conf
index 7afe143..9cd3ed4 100644
--- a/conf/machine/rock-pi-e.conf
+++ b/conf/machine/rock-pi-e.conf
@@ -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"
 
diff --git a/recipes-kernel/linux/linux-stable-bleeding_5.11.bb b/recipes-kernel/linux/linux-stable-bleeding_5.11.bb
deleted file mode 100644
index 508ddae..0000000
--- a/recipes-kernel/linux/linux-stable-bleeding_5.11.bb
+++ /dev/null
@@ -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"
diff --git a/recipes-kernel/linux/linux-yocto%.bbappend b/recipes-kernel/linux/linux-yocto%.bbappend
index 3789c72..c2fe9ad 100644
--- a/recipes-kernel/linux/linux-yocto%.bbappend
+++ b/recipes-kernel/linux/linux-yocto%.bbappend
@@ -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:"
 
-- 
2.30.0.rc0

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

[Trevor Woerner]

[-- Attachment #1: Type: text/plain, Size: 649 bytes --]

On Tue, Jul 13, 2021 at 7:32 PM Trevor Woerner <twoerner@gmail.com> wrote:

> 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.
>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  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

[-- Attachment #2: Type: text/html, Size: 1197 bytes --]

Re: [meta-rockchip][PATCH] remove LINUX_VERSION_EXTENSION

[Trevor Woerner]

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

On Tue, Jul 13, 2021 at 7:32 PM Trevor Woerner <twoerner@gmail.com> wrote:

> 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.
>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  conf/machine/include/rockchip-defaults.inc | 1 -
>  1 file changed, 1 deletion(-)
>

applied to meta-rockchip master

[-- Attachment #2: Type: text/html, Size: 922 bytes --]