Re: [PATCH] linux-custom: add path to image for arm* kernels < 4.12

[Gylstorff Quirin <quirin.gylstorff@siemens.com>]

On 1/10/20 7:49 PM, Jan Kiszka wrote:
> On 08.01.20 14:57, [ext] Q. Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> ARM/ARM64 Kernel with a version < 4.12 do not contain the path to
>> the kernel image in image_name. This was added with commits:
>> 152e6744ebfc8fa6cc9fff4ba36271f5f1ba2821 for arm and
>> 06995804b5762f016c7a80503406da853a8f3785 for arm64.
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>>   meta/recipes-kernel/linux/files/debian/isar/install.tmpl | 7 ++++++-
>>   1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl 
>> b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
>> index 67b7ce3..ac347aa 100644
>> --- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
>> +++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
>> @@ -56,7 +56,12 @@ EOF
>>   install_image() {
>>       install -m 755 -d ${deb_img_dir}/$(dirname ${kimage_path})
>> -    cp ${O}/${kimage} ${deb_img_dir}/${kimage_path}
>> +    # ARM/ARM64 kernels < 4.12 do not include the path to the kernel
>> +    if [ -e ${O}/${kimage} ]; then
>> +        cp ${O}/${kimage} ${deb_img_dir}/${kimage_path}
>> +    else
>> +        cp ${O}/arch/$ARCH/boot/${kimage} ${deb_img_dir}/${kimage_path}
>> +    fi
> 
> Maybe better expand (i.e. redefine) kimage when ${O}/${kimage} doesn't 
> exist, rather than duplicating the copy operation.

I tried to stay near the 4.11 implementation of 
linux/scripts/package/builddeb[0] line 145. But I will change it to a 
redefinition.
> 
> Jan
> 
>>       # Make sure arm64 kernels are decompressed
>>       if [ "${ARCH}" = "arm64" ]; then
>>
> 

[0]: 
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/scripts/package/builddeb?id=152b695d74376bfe55cd2a6265ccc75b0d39dd19


Quirin