Re: [PATCH 08/10] linux-custom: add support for kernel config fragments

[Henning Schild <henning.schild@siemens.com>]

Am Thu, 24 Oct 2019 20:25:15 +0200
schrieb Cedric Hombourger <cedric_hombourger@mentor.com>:

> Hi Henning,
> 
> On 10/24/2019 8:21 PM, Henning Schild wrote:
> > Is that taken from or inspired by OE? I have seen patterns like that
> > for isar:  
> It is inspired. they use their scc tool but eventually use the kernel 
> merge_config tool
> > do_prepare_build_prepend() {
> >      cat ${WORKDIR}/preempt-rt.cfg >> ${WORKDIR}/${KERNEL_DEFCONFIG}
> > }  
> I have used this kludge myself :) but the kernel provides a tool to 
> facilitate merging of config fragments so let's use it so that we do
> not come up with different mechanisms
> > In a recipe that extends a generic kernel recipe with some config
> > switches.
> >
> > I am personally not a big fan of magic, and it seems the extension
> > ".cfg" makes magic happen. We will need an apply=no like for
> > patches.  
> OE does not but I see no harm in taking inspiration from OE and
> tweaking it to our liking

I think it would be clean to have a way to disable the magic. Even if
SRC_URI entries ending on .cfg in a kernel recipe are not likely to be
required for something else.

Henning

> >
> > Henning
> >
> >
> > Am Thu, 24 Oct 2019 11:02:22 +0200
> > schrieb Cedric Hombourger <Cedric_Hombourger@mentor.com>:
> >  
> >> Check for .cfg files listed in SRC_URI and merge them with the
> >> main defconfig using the kernel merge_config script.
> >>
> >> Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
> >> ---
> >>   .../linux/files/build-kernel.sh               |  5 ++++-
> >>   meta/recipes-kernel/linux/linux-custom.inc    | 20
> >> +++++++++++++++++++ 2 files changed, 24 insertions(+), 1
> >> deletion(-)
> >>
> >> diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh
> >> b/meta/recipes-kernel/linux/files/build-kernel.sh index
> >> cb310f7..9faa6bb 100644 ---
> >> a/meta/recipes-kernel/linux/files/build-kernel.sh +++
> >> b/meta/recipes-kernel/linux/files/build-kernel.sh @@ -36,7 +36,10
> >> @@ REPACK_DIR="$1/../repack"
> >> REPACK_LINUX_IMAGE_DIR="${REPACK_DIR}/linux-image"
> >> REPACK_LINUX_HEADERS_DIR="${REPACK_DIR}/linux-headers"
> >> -make ${KERNEL_DEFCONFIG}
> >> +make ${KERNEL_DEFCONFIG} || exit ${?}
> >> +if [ -n "${KERNEL_FRAGMENTS}" ]; then
> >> +    scripts/kconfig/merge_config.sh -m .config ${KERNEL_FRAGMENTS}
> >> +fi
> >>   
> >>   KV=$( make -s kernelrelease )
> >>   if [ "${KV}" != "${PV}" ]; then
> >> diff --git a/meta/recipes-kernel/linux/linux-custom.inc
> >> b/meta/recipes-kernel/linux/linux-custom.inc index c53cd90..b06529f
> >> 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc
> >> +++ b/meta/recipes-kernel/linux/linux-custom.inc
> >> @@ -18,6 +18,16 @@ python() {
> >>                            'linux-headers-' + kernel_name)
> >>   }
> >>   
> >> +def config_fragments(d):
> >> +    fragments = []
> >> +    sources = d.getVar("SRC_URI").split()
> >> +    for s in sources:
> >> +        _, _, local, _, _, parm = bb.fetch.decodeurl(s)
> >> +        base, ext = os.path.splitext(os.path.basename(local))
> >> +        if ext and ext in (".cfg"):
> >> +            fragments.append(local)
> >> +    return fragments
> >> +
> >>   inherit dpkg-base
> >>   
> >>   SRC_URI += "file://build-kernel.sh"
> >> @@ -71,6 +81,16 @@ dpkg_runbuild() {
> >>   		defconfig="defconfig"
> >>   	fi
> >>   
> >> +	# copy config fragments over to the kernel tree
> >> +	src_frags="${@ " ".join(config_fragments(d)) }"
> >> +	out_frags="${@ " ".join(map(lambda frag:
> >> 'debian/fragments/'
> >> + frag, config_fragments(d))) }"
> >> +	rm -rf ${S}/debian/fragments
> >> +	if [ -n "${src_frags}" ]; then
> >> +		mkdir -p ${S}/debian/fragments
> >> +		(cd ${WORKDIR} && cp ${src_frags}
> >> ${S}/debian/fragments/)
> >> +	fi
> >> +	export KERNEL_FRAGMENTS="${out_frags}"
> >> +
> >>   	E="${@ bb.utils.export_proxies(d)}"
> >>   
> >>   	export PV=${PV}