linux-mfgtool: Simplify linux-mfgtool support

As OpenEmbedded-Core now supports (from commit
5b4aab6b40cf21471442e21abc8051b38985de84) building multiple kernels,
this patch completly replaces the old linux-mfgtool with a single
statement:

KERNEL_PACKAGE_NAME = "linux-mfgtool"

and it works surprisingly well! This patch also provides a separate
defconfig for linux-imx-mfgtool (which currently is a copy of
linux-imx defconfig).

Note: The linux-mfgtool kernel will be deployed in ${DEPLOY}/mfgtool.

Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

1 files changed, 1 insertions, 81 deletions

diff --git a/recipes-kernel/linux/linux-mfgtool.inc b/recipes-kernel/linux/linux-mfgtool.inc
index dc06c541..7ff370e4 100644
--- a/recipes-kernel/linux/linux-mfgtool.inc
+++ b/recipes-kernel/linux/linux-mfgtool.inc
@@ -1,87 +1,7 @@
 # Produces a Manufacturing Tool compatible Linux Kernel
 #
-# This makes a separated binary set for Manufacturing Tool use
-# without clobbering the Linux Kernel used for normal use.
-#
-# This file must be included after the original linux-imx.inc file
-# as it overrides the needed values.
-#
 # Copyright (C) 2014, 2015, 2018 O.S. Systems Software LTDA.
 
-# Adjust provides
 PROVIDES = "linux-mfgtool"
 
-# Avoid coliding files
-LOCALVERSION_append = "-mfgtool"
-KERNEL_SRC_PATH = "/usr/src/kernel-mfgtool"
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-mfgtool-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
-KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-mfgtool-${MACHINE}"
-MODULE_IMAGE_BASE_NAME = "modules-mfgtool-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-MODULE_TARBALL_SYMLINK_NAME = "modules-mfgtool-${MACHINE}.tgz"
-STAGING_KERNEL_DIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-mfgtool-source"
-STAGING_KERNEL_BUILDDIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-mfgtool-build-artifacts"
-
-# Ensures we prefer our mfgtool specific files
-FILESEXTRAPATHS_prepend := "${THISDIR}/${ORIG_PN}-${PV}:${THISDIR}/${ORIG_PN}:"
-
-python mfgtool_recipe_handler () {
-    pn = e.data.getVar("PN", True)
-    if not (pn.endswith("-mfgtool") or pn.startswith("mfgtool-")):
-        return
-
-    e.data.setVar("MLPREFIX", "mfgtool-")
-    e.data.setVar("ORIG_PN", e.data.getVar("PN", True))
-    e.data.setVar("PN", "mfgtool-" + e.data.getVar("PN", True).replace("-mfgtool", "").replace("mfgtool-", ""))
-}
-
-python () {
-    pn = d.getVar("PN", True)
-    if not pn.startswith("mfgtool-"):
-        return
-
-    from oe.classextend import ClassExtender
-
-    # We need to expand KERNEL_VERSION at runtime, not at parse time
-    # The class extension code can expand variables early so remove
-    # the variable from the datastore temporarily and then restore
-    kernver = d.getVar("KERNEL_VERSION", False)
-    kernverpkgname = d.getVar("KERNEL_VERSION_PKG_NAME", False)
-    d.delVar("KERNEL_VERSION")
-    d.delVar("KERNEL_VERSION_PKG_NAME")
-
-    class LinuxMfgToolExtender(ClassExtender):
-        def extend_name(self, name):
-            if name.startswith("kernel-"):
-                return self.extname + "-" + name
-            return super().extend_name(name)
-
-    clsextend = LinuxMfgToolExtender("mfgtool", d)
-    clsextend.rename_packages()
-    clsextend.rename_package_variables((d.getVar("PACKAGEVARS", True) or "").split())
-
-    clsextend.map_packagevars()
-    clsextend.map_regexp_variable("PACKAGES_DYNAMIC")
-
-    d.setVar("KERNEL_VERSION", kernver)
-    d.setVar("KERNEL_VERSION_PKG_NAME", kernverpkgname)
-}
-
-addhandler mfgtool_recipe_handler
-mfgtool_recipe_handler[eventmask] = "bb.event.RecipePreFinalise"
-
-# FIXME: Avoid depmod data emiting as kernel-abiversion path is
-#        hardcoded.
-emit_depmod_pkgdata() {
-    :
-}
-
-# FIXME: We need to remove the STAGING_KERNEL_BUILDDIR contents as
-#        kernel.bbclass has no way to skip its installation.
-# FIXME: It is not possible to have external modules against
-#        this kernel variant.
-do_install_append() {
-    rm -r ${STAGING_KERNEL_BUILDDIR}
-}
-
-POPULATESYSROOTDEPS_class-target = "virtual/${TARGET_PREFIX}binutils:do_populate_sysroot"
+KERNEL_PACKAGE_NAME = "mfgtool"