linux-kernel-base: Fold remainder into kernel-arch and drop

The remaining usages can all work from kernel-arch so fold the class into
there and drop linux-kernel-base since the name is an outlier anyway.

Clean up some of the kernel class inherits to be in the same line
to make it cleare which uses what.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes-recipe/kernel-arch.bbclass b/meta/classes-recipe/kernel-arch.bbclass
index eb598d98b6ef8603d0c4fddcc9af522a8fa8312d..26b8a1a67f927482c1e64967fdf66697f154be8f 100644 (file)
--- a/meta/classes-recipe/kernel-arch.bbclass
+++ b/meta/classes-recipe/kernel-arch.bbclass
@@ -34,3 +34,7 @@ KERNEL_OBJCOPY:toolchain-clang = "llvm-objcopy ${TARGET_OBJCOPY_KERNEL_ARCH}"
 KERNEL_STRIP:toolchain-clang = "llvm-strip"
 KERNEL_TOOLCHAIN ?= "gcc"
 TOOLCHAIN = "${KERNEL_TOOLCHAIN}"
+
+export KBUILD_BUILD_VERSION = "1"
+export KBUILD_BUILD_USER ?= "oe-user"
+export KBUILD_BUILD_HOST ?= "oe-host"

diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass
index 28460ce1cb9534da3b3934fac187741f22eca6f9..a82bdf7ecba825267e27c9bddd41949f17ec3a0c 100644 (file)
--- a/meta/classes-recipe/kernel.bbclass
+++ b/meta/classes-recipe/kernel.bbclass
@@ -4,7 +4,8 @@
 # SPDX-License-Identifier: MIT
 #
 
-inherit linux-kernel-base kernel-module-split features_check
+inherit kernel-arch kernel-module-split kernel-devicetree kernel-artifact-names
+inherit features_check  deploy cml1 pkgconfig
 
 ARCH = "${@oe.kernel.map_kernel_arch(d)}"
 
@@ -215,8 +216,6 @@ python do_symlink_kernsrc () {
 # do_configure on do_symlink_kernsrc.
 addtask symlink_kernsrc before do_patch do_configure after do_unpack
 
-inherit kernel-arch deploy
-
 PACKAGES_DYNAMIC += "^${KERNEL_PACKAGE_NAME}-module-.*"
 PACKAGES_DYNAMIC += "^${KERNEL_PACKAGE_NAME}-image-.*"
 PACKAGES_DYNAMIC += "^${KERNEL_PACKAGE_NAME}-firmware-.*"
@@ -675,8 +674,6 @@ kernel_do_configure() {
        ${KERNEL_CONFIG_COMMAND}
 }
 
-inherit cml1 pkgconfig
-
 EXPORT_FUNCTIONS do_compile do_transform_kernel do_transform_bundled_initramfs do_install do_configure
 
 # kernel-base becomes kernel-${KERNEL_VERSION}
@@ -789,8 +786,6 @@ do_sizecheck[dirs] = "${B}"
 
 addtask sizecheck before do_install after do_strip
 
-inherit kernel-artifact-names
-
 kernel_do_deploy() {
        deployDir="${DEPLOYDIR}"
        if [ -n "${KERNEL_DEPLOYSUBDIR}" ]; then
@@ -915,5 +910,4 @@ do_create_spdx:append() {
 }
 do_create_spdx[depends] += "virtual/kernel:do_configure"
 
-# Add using Device Tree support
-inherit kernel-devicetree
+

diff --git a/meta/classes-recipe/kernelsrc.bbclass b/meta/classes-recipe/kernelsrc.bbclass
index b105fc159907af724e56aa0148309d56dd2037b9..fa204a007a3b45c261544431d53604e59f402b9d 100644 (file)
--- a/meta/classes-recipe/kernelsrc.bbclass
+++ b/meta/classes-recipe/kernelsrc.bbclass
@@ -13,8 +13,6 @@ do_package[depends] += "virtual/kernel:do_populate_sysroot"
 KERNEL_VERSION = "${@oe.kernel.get_version_file("${STAGING_KERNEL_BUILDDIR}")}"
 LOCAL_VERSION = "${@oe.kernel.get_localversion_file("${STAGING_KERNEL_BUILDDIR}")}"
 
-inherit linux-kernel-base
-
 # The final packages get the kernel version instead of the default 1.0
 python do_package:prepend() {
     d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0])

diff --git a/meta/classes-recipe/linux-kernel-base.bbclass b/meta/classes-recipe/linux-kernel-base.bbclass
deleted file mode 100644 (file)
index 566b2c9..0000000
--- a/meta/classes-recipe/linux-kernel-base.bbclass
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright OpenEmbedded Contributors
-#
-# SPDX-License-Identifier: MIT
-#
-
-export KBUILD_BUILD_VERSION = "1"
-export KBUILD_BUILD_USER ?= "oe-user"
-export KBUILD_BUILD_HOST ?= "oe-host"
-

diff --git a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
index 6e64918f5b5c1f063bf560b50c57950cbc3bdb28..18768c1ec4a4eaabb8f7bb0d3fd3bc0d5fd57382 100644 (file)
--- a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
+++ b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
@@ -3,8 +3,7 @@ HOMEPAGE = "https://www.yoctoproject.org/"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
-inherit kernel-arch linux-kernel-base
-inherit pkgconfig
+inherit kernel-arch pkgconfig
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 5fa98a0d94bc41b7a80021544e5e4c7a4d533c6a..25852f8a22a200e882c842aea00bc8539174bcff 100644 (file)
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -56,7 +56,7 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
 PROVIDES = "virtual/perf"
 
-inherit linux-kernel-base kernel-arch manpages pkgconfig
+inherit kernel-arch manpages pkgconfig
 
 ARCH = "${@oe.kernel.map_kernel_arch(d)}"