[PATCH] u-boot-script: Account for deficit in Ubuntu's linux-base

[PATCH] u-boot-script: Account for deficit in Ubuntu's linux-base

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Account for https://bugs.launchpad.net/ubuntu/+source/linux-base/+bug/1941793
by open-coding 'linux-version list', only keeping 'linux-version sort'.
This fixes u-boot-script for arm64 on all recent Ubuntu releases. Needed
since d6954739fe43.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/recipes-bsp/u-boot-script/files/update-u-boot-script | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
index 40d3108..eb2c295 100755
--- a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
+++ b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
@@ -15,7 +15,8 @@ fi
 
 BOOT_CMD=$(mktemp)
 
-KERNEL_VERSION=$(linux-version list | linux-version sort --reverse | head -1)
+KERNEL_VERSION=$(find /boot -name vmlinu[xz]-* | sed 's|/boot/vmlinu[xz]-||g' |
+		 linux-version sort --reverse | head -1)
 
 case $(uname -m) in
 	aarch64|mips|riscv64)
-- 
2.31.1

Re: [PATCH] u-boot-script: Account for deficit in Ubuntu's linux-base

[Henning Schild]

Working on the re-fork of our wic plugins i also stumble over that
vmlinuz vs. vmlinux. It is a mess we are causing ourselves.

I think we should simply stick to vmlinuz for all arches. Now some
bootloaders might need uncompressed versions ... but then these
bootloaders need to extract the kernel instead of the kernel coming in
another variant and way too many ifs and overrides later on.

So i would say let us see if we can switch all arches to vmlinuz and
only extract where we really need to ... will very likely be less
occasions than we have "special case code" right now.

Henning

Am Fri, 27 Aug 2021 13:30:47 +0200
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Account for
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugs.launchpad.net%2Fubuntu%2F%2Bsource%2Flinux-base%2F%2Bbug%2F1941793&amp;data=04%7C01%7Cde173c00-e982-4fda-8644-47edf4671d63%40ad011.siemens.com%7Cb3b141766fd048e577c708d9694e1f6e%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637656606522333500%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=Fx4DUIhsUod%2FC2VQI5e5PvxCY3YOBTL3jhWtVPsXKxA%3D&amp;reserved=0
> by open-coding 'linux-version list', only keeping 'linux-version
> sort'. This fixes u-boot-script for arm64 on all recent Ubuntu
> releases. Needed since d6954739fe43.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  meta/recipes-bsp/u-boot-script/files/update-u-boot-script | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git
> a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
> b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script index
> 40d3108..eb2c295 100755 ---
> a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script +++
> b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script @@ -15,7
> +15,8 @@ fi BOOT_CMD=$(mktemp)
>  
> -KERNEL_VERSION=$(linux-version list | linux-version sort --reverse |
> head -1) +KERNEL_VERSION=$(find /boot -name vmlinu[xz]-* | sed
> 's|/boot/vmlinu[xz]-||g' |
> +		 linux-version sort --reverse | head -1)
>  
>  case $(uname -m) in
>  	aarch64|mips|riscv64)

Re: [PATCH] u-boot-script: Account for deficit in Ubuntu's linux-base

[Jan Kiszka]

On 02.09.21 13:26, Henning Schild wrote:
> Working on the re-fork of our wic plugins i also stumble over that
> vmlinuz vs. vmlinux. It is a mess we are causing ourselves.
> 

Nope, it's an upstream Ubuntu bug - Debian explains why that change was
needed there, and is safe. Ubuntu is just lagging behind Debian here.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

Re: [PATCH] u-boot-script: Account for deficit in Ubuntu's linux-base

[Henning Schild]

Am Thu, 2 Sep 2021 13:36:21 +0200
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> On 02.09.21 13:26, Henning Schild wrote:
> > Working on the re-fork of our wic plugins i also stumble over that
> > vmlinuz vs. vmlinux. It is a mess we are causing ourselves.
> >   
> 
> Nope, it's an upstream Ubuntu bug - Debian explains why that change
> was needed there, and is safe. Ubuntu is just lagging behind Debian
> here.

Ok. I have no objections against that patch. Me saying that we should
revisit the whole xz story was just related.

i.e. we are using vmlinux on arm64 where debian and ubuntu do not ...
because we implement stuff again instead of calling "image_stem"

https://salsa.debian.org/kernel-team/linux-base/-/blob/master/lib/DebianLinux.pm#L79

I will see if i can clean that up.

Henning

> Jan
> 

Re: [PATCH] u-boot-script: Account for deficit in Ubuntu's linux-base

[Anton Mikanovich]

27.08.2021 14:30, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> Account for https://bugs.launchpad.net/ubuntu/+source/linux-base/+bug/1941793
> by open-coding 'linux-version list', only keeping 'linux-version sort'.
> This fixes u-boot-script for arm64 on all recent Ubuntu releases. Needed
> since d6954739fe43.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>   meta/recipes-bsp/u-boot-script/files/update-u-boot-script | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
> index 40d3108..eb2c295 100755
> --- a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
> +++ b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
> @@ -15,7 +15,8 @@ fi
>   
>   BOOT_CMD=$(mktemp)
>   
> -KERNEL_VERSION=$(linux-version list | linux-version sort --reverse | head -1)
> +KERNEL_VERSION=$(find /boot -name vmlinu[xz]-* | sed 's|/boot/vmlinu[xz]-||g' |
> +		 linux-version sort --reverse | head -1)
>   
>   case $(uname -m) in
>   	aarch64|mips|riscv64)

Applied to next, thanks.

-- 
Anton Mikanovich
Promwad Ltd.
External service provider of ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn, Germany
+49 (89) 122 67 24-0
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov