APPLIED Re: [SRU][R:linux-signed][PATCH] UBUNTU: [Packaging] removing "-fde" suffixes from packaging

[Timo Aaltonen]

John Cabaj kirjoitti 9.4.2026 klo 23.46:
> This appears to be a holdover from when "-fde" kernels were
> provided by a separate kernel, fully dependent on its existance
> (eg. linux-azure kernel containing linux-azure-fde packaging).
> 
> For historical reference, this lead to issues of "-fde" kernels
> not being properly tested and otherwise losing visibility in
> several important areas of our infrastructure.
> 
> In the case of linux-azure-fde, it's now provided as a completely
> separate kernel tree, rather than some type of indirect flavour.
> For the purposes of the packaging here, I propose we remove any
> hardcoding of "-fde" to a kernel package name. The "fde"
> considerations should be made at the base kernel level,
> and packaging provided by a distinct "fde" kernel.
> 
> Signed-off-by: John Cabaj <john.cabaj at canonical.com>
> ---
>   debian/scripts/generate_control.py | 4 ++--
>   debian/scripts/signed-install      | 3 ---
>   2 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/debian/scripts/generate_control.py b/debian/scripts/generate_control.py
> index 3147a9c..836cb85 100755
> --- a/debian/scripts/generate_control.py
> +++ b/debian/scripts/generate_control.py
> @@ -131,7 +131,7 @@ def gen_binpkgs(signing: Signing, args: Namespace):
>               dedent(
>                   f"""\
>   
> -            Package: linux-image-{args.abi_version}-{flavour}-fde
> +            Package: linux-image-{args.abi_version}-{flavour}
>               Architecture: {" ".join(archs)}
>               Depends: ${{unsigned:Depends}}
>               Recommends: ${{cvm:Recommends}}
> @@ -212,7 +212,7 @@ def gen_dbgsym_binpkgs(signing: Signing, args: Namespace):
>               dedent(
>                   f"""\
>   
> -            Package: linux-image-{args.abi_version}-{flavour}-fde-dbgsym
> +            Package: linux-image-{args.abi_version}-{flavour}-dbgsym
>               Section: devel
>               Architecture: {" ".join(archs)}
>               Depends: linux-image-unsigned-{args.abi_version}-{flavour}-dbgsym
> diff --git a/debian/scripts/signed-install b/debian/scripts/signed-install
> index e1827a1..438dd54 100755
> --- a/debian/scripts/signed-install
> +++ b/debian/scripts/signed-install
> @@ -12,9 +12,6 @@ do
>   	signed="SIGNED/$instfile-$verflav"
>   
>   	case " $options " in
> -	*' --cvm '*)
> -		package="linux-image-$verflav-fde"
> -		;;
>   	*' --uc '*)
>   		package="linux-image-uc-$verflav"
>   		;;

applied, thanks

-- 
Timo Aaltonen
Kernel Team
Canonical Ltd.