Re: [PATCH v3 1/3] module.inc: fix kbuild dependency

[Jan Kiszka <jan.kiszka@siemens.com>]

On 13.05.24 06:17, Adriaan Schmidt wrote:
> This achieves two things:
> 
> * Module builds explicitly depend on linux-kbuild-* as build dependency.
>   Previously we only had an implicit RDEPENDS in linux-custom, which is
>   not sufficient. For linux-distro, this means we need to PROVIDE linux-kbuild.
> * Remove the unconditional building of native kbuild when it is
>   not needed, i.e. when we're not actually cross-building a module
> 
> Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
> ---
>  meta/recipes-kernel/linux-module/module.inc | 3 ++-
>  meta/recipes-kernel/linux/linux-custom.inc  | 3 ---
>  meta/recipes-kernel/linux/linux-distro.bb   | 1 +
>  3 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/recipes-kernel/linux-module/module.inc
> index eddbf177..1cca9cfb 100644
> --- a/meta/recipes-kernel/linux-module/module.inc
> +++ b/meta/recipes-kernel/linux-module/module.inc
> @@ -17,7 +17,8 @@ PN .= "-${KERNEL_NAME}"
>  
>  KERNEL_IMAGE_PKG ??= "linux-image-${KERNEL_NAME}"
>  KERNEL_HEADERS_PKG ??= "linux-headers-${KERNEL_NAME}"
> -DEPENDS += "${KERNEL_HEADERS_PKG}"
> +KERNEL_KBUILD_PKG ??= "linux-kbuild-${KERNEL_NAME}"
> +DEPENDS += "${KERNEL_HEADERS_PKG} ${KERNEL_KBUILD_PKG}-native"
>  DEBIAN_BUILD_DEPENDS = "${KERNEL_HEADERS_PKG}"
>  
>  SIGNATURE_KEYFILE ??= ""
> diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
> index 0d222332..35c61187 100644
> --- a/meta/recipes-kernel/linux/linux-custom.inc
> +++ b/meta/recipes-kernel/linux/linux-custom.inc
> @@ -148,9 +148,6 @@ PROVIDES += "${RECIPE_PROVIDES}"
>  # Append build profiles
>  DEB_BUILD_PROFILES += "${BUILD_PROFILES}"
>  
> -# Add dependency to build -kbuildtarget and -native automatically
> -RDEPENDS:append:cross-profile = " ${BPN}-native"
> -
>  def get_kernel_arch(d):
>      distro_arch = d.getVar("DISTRO_ARCH")
>      if distro_arch in ["amd64", "i386"]:
> diff --git a/meta/recipes-kernel/linux/linux-distro.bb b/meta/recipes-kernel/linux/linux-distro.bb
> index bc43528c..13b8dc7e 100644
> --- a/meta/recipes-kernel/linux/linux-distro.bb
> +++ b/meta/recipes-kernel/linux/linux-distro.bb
> @@ -10,6 +10,7 @@ python() {
>      for kernel in distro_kernels.split():
>          d.appendVar('PROVIDES', ' linux-image-' + kernel)
>          d.appendVar('PROVIDES', ' linux-headers-' + kernel)
> +        d.appendVar('PROVIDES', ' linux-kbuild-' + kernel)
>      if d.getVar('KERNEL_IMAGE_PKG'):
>          d.appendVar('PROVIDES', ' ' + d.getVar('KERNEL_IMAGE_PKG'))
>      if d.getVar('KERNEL_HEADERS_PKG'):

There is another change coming with this: In order to install
linux-headers into your target image, you now need to explicitly depend
on linux-${KERNEL_NAME}-kbuildtarget in the image recipe.
linux-headers-${KERNEL_NAME} will not pull the kbuildtarget, and the
latter is not auto-built anymore.

I'm testing some idea (some may call it hack) to resolve that by moving
the linux-headers provider to kbuildtarget and native and then let those
two depend on the base recipe. Not straightforward, but it seems to work.

Jan

-- 
Siemens AG, Technology
Linux Expert Center