Re: [OE-core] [PATCH] kernel: provide module.lds for out of tree builds in v5.10+

Khem Raj
2020-11-13T18:10:03Z

On Thu, Nov 12, 2020 at 10:32 PM Bruce Ashfield
<bruce.ashfield@gmail.com> wrote:
>
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
>
> The upstream commit 596b0474d3d [kbuild: preprocess module linker
> script], adds a dependency on module.lds for external module
> building.
>
> Since module.lds is generated as part of 'modules_prepare', we
> must make it available with the other kernel artifacts in the
> kernel shared workdir, otherwise out of tree builds fail.
>
> This fixes errors like:
>
> | make[4]: *** No rule to make target 'scripts/module.lds', needed by
> 'build/tmp/work/qemuarm64-poky-linux/cryptodev-module/1.11-r0/git/cryptodev.ko'.
> Stop.
> | make[4]: *** Waiting for unfinished jobs....
>
> We also ensure that kernel-devsrc has a copy to support on
> target module builds that are often prepared with 'make scripts
> prepare'. Those targets won't regenerate it, so the build fails.
> If 'make modules_prepare' is used, the file will be regenerated
> and overwrite our copy (as expected).
>
> Signed-off-by: Pan, Kris <kris.pan@intel.com>
> Signed-off-by: Lili Li <lili.li@intel.com>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> ---
> meta/classes/kernel.bbclass | 1 +
> meta/recipes-kernel/linux/kernel-devsrc.bb | 6 ++++++
> 2 files changed, 7 insertions(+)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index be93a258f6..ccd74e61e8 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -494,6 +494,7 @@ do_shared_workdir () {
> # Copy files required for module builds
> cp System.map $kerneldir/System.map-${KERNEL_VERSION}
> [ -e Module.symvers ] && cp Module.symvers $kerneldir/
> + [ -e scripts/module.lds ] && install -Dm 0644 scripts/module.lds $kerneldir/scripts/module.lds
> cp .config $kerneldir/
> mkdir -p $kerneldir/include/config
> cp include/config/kernel.release $kerneldir/include/config/kernel.release
> diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
> index 81b1e36041..5f0dedbdf7 100644
> --- a/meta/recipes-kernel/linux/kernel-devsrc.bb
> +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
> @@ -100,6 +100,12 @@ do_install() {
> # be dealt with.
> # cp -a scripts $kerneldir/build
>
> + # although module.lds can be regenerated on target via 'make modules_prepare'
> + # there are several places where 'makes scripts prepare' is done, and that won't
> + # regenerate the file. So we copy it onto the target as a migration to using
> + # modules_prepare
> + cp -a --parents scripts/module.lds $kerneldir/build/ 2>/dev/null || :
> +

I see there are more occurrence of cp -a in this recipe but I thought
I will mention it
cp -a could be perhaps made more portable with cp --preserve=mode,timestamps -R

> if [ -d arch/${ARCH}/scripts ]; then
> cp -a arch/${ARCH}/scripts $kerneldir/build/arch/${ARCH}
> fi
> --
> 2.19.1
>
>
>
>