Re: [PATCH 04/10] recipes-kernel/linux: make KERNEL_DEFCONFIG support in-tree defconfigs

[Cedric Hombourger <cedric_hombourger@mentor.com>]

On 11/6/2019 5:03 PM, Jan Kiszka wrote:
> On 24.10.19 20:02, [ext] Henning Schild wrote:
>> Not sure i like that. We are mixing "make target" and .config-filename
>> into one variable. I would rather invent another one.
>>
> Would be in line with Yocto/OE at least.
>
>> KERNEL_CONFIG_FILE ?= "foo"
>> KERNEL_CONFIG_TARGET ?= "olddefconfig"
> Downside: you have to fiddle with both variables when switching from
> defconfig to provide config + olddefconfig.
>
> I think the unified semantic is not that bad. A user still has control
> over file vs. built-in config by not providing that file in the first place.

and I now understand what Henning was suggesting in the first place

the linux-custom patch series I sent yesterday only has KERNEL_DEFCONFIG 
as user-visible API. I would agree with Jan that we probably want to 
keep it simple for the end-user. I would vote for keeping 
KERNEL_DEFCONFIG as the only API but I am happy to discuss what we do 
with respect to in-tree / out-of-tree defconfigs. This patch will have 
Isar automagically determine where to get the defconfig from. We could 
alternatively require the defconfig to be always be part of the tree but 
that may make some people unhappy since they may be relying on the 
current behavior. Requiring people to copy the in-tree defconfig to 
their layer so that Isar can find it does not sound great either. Hence 
the current proposal - some sort of middle-ground - well I hope !

Cedric



> Jan
>
>> Henning
>>
>>
>> Am Thu, 24 Oct 2019 11:02:18 +0200
>> schrieb Cedric Hombourger <Cedric_Hombourger@mentor.com>:
>>
>>> The recipe expected the specified KERNEL_DEFCONFIG to be provided as a
>>> SRC_URI while the kernel already provides many useful defconfigs. The
>>> recipe will now check if the specified configuration can be found in
>>> WORKDIR. If it is found, it will then be used via "make olddefconfig"
>>> as before. It will otherwise assume that it is an in-tree defconfig
>>> and attempt a "make foobar_defconfig" (where foobar_defconfig is the
>>> user-provided KERNEL_DEFCONFIG setting).
>>>
>>> Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
>>> ---
>>>   meta/recipes-kernel/linux/files/build-kernel.sh |  6 +-----
>>>   meta/recipes-kernel/linux/linux-custom.inc      | 11 +++++++++--
>>>   2 files changed, 10 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh
>>> b/meta/recipes-kernel/linux/files/build-kernel.sh index
>>> dcb46f7..cb310f7 100644 ---
>>> a/meta/recipes-kernel/linux/files/build-kernel.sh +++
>>> b/meta/recipes-kernel/linux/files/build-kernel.sh @@ -36,11 +36,7 @@
>>> REPACK_DIR="$1/../repack"
>>> REPACK_LINUX_IMAGE_DIR="${REPACK_DIR}/linux-image"
>>> REPACK_LINUX_HEADERS_DIR="${REPACK_DIR}/linux-headers"
>>> -if [ -e .config ]; then
>>> -	make olddefconfig
>>> -else
>>> -	make defconfig
>>> -fi
>>> +make ${KERNEL_DEFCONFIG}
>>>   
>>>   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 5a34dd1..c53cd90
>>> 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc
>>> +++ b/meta/recipes-kernel/linux/linux-custom.inc
>>> @@ -61,8 +61,14 @@ addtask devshell after do_install_builddeps
>>>   
>>>   dpkg_runbuild() {
>>>   	chmod +x ${WORKDIR}/build-kernel.sh
>>> -	if [ -n "${KERNEL_DEFCONFIG}" ]; then
>>> -		cp ${WORKDIR}/${KERNEL_DEFCONFIG} ${S}/.config
>>> +	defconfig="${KERNEL_DEFCONFIG}"
>>> +	if [ -n "${defconfig}" ]; then
>>> +		if [ -e "${WORKDIR}/${defconfig}" ]; then
>>> +			cp ${WORKDIR}/${defconfig} ${S}/.config
>>> +			defconfig="olddefconfig"
>>> +		fi
>>> +	else
>>> +		defconfig="defconfig"
>>>   	fi
>>>   
>>>   	E="${@ bb.utils.export_proxies(d)}"
>>> @@ -72,6 +78,7 @@ dpkg_runbuild() {
>>>   
>>>   	export KBUILD_DEPENDS="${KBUILD_DEPENDS}"
>>>   	export KERNEL_DEBIAN_DEPENDS="${KERNEL_DEBIAN_DEPENDS}"
>>> +	export KERNEL_DEFCONFIG="${defconfig}"
>>>   	export KERNEL_FILE="${KERNEL_FILE}"
>>>   	export
>>> KERNEL_HEADERS_DEBIAN_DEPENDS="${KERNEL_HEADERS_DEBIAN_DEPENDS}"