Re: [isar-cip-core][PATCH] swupdate-config: suffix package with -${MACHINE}

On 2/11/25 8:46 AM, Cedric Hombourger wrote:
> swupdate-config generates ${MACHINE}-dependent code since it uses
> templates where ${MACHINE} is expanded for the configuration files
> it ships. This causes problems in multiconfig builds. Dynamically
> suffix the name of the recipe and package with -${MACHINE} to get
> a separate build for each ${MACHINE} selected in the multiconfig.
> 
> Signed-off-by: Cedric Hombourger <[email protected]>
> ---
>   .../{swupdate-config_0.1.bb => swupdate-config_0.2.bb}       | 5 +++++
>   1 file changed, 5 insertions(+)
>   rename recipes-core/swupdate-config/{swupdate-config_0.1.bb => swupdate-config_0.2.bb} (89%)
> 
> diff --git a/recipes-core/swupdate-config/swupdate-config_0.1.bb b/recipes-core/swupdate-config/swupdate-config_0.2.bb
> similarity index 89%
> rename from recipes-core/swupdate-config/swupdate-config_0.1.bb
> rename to recipes-core/swupdate-config/swupdate-config_0.2.bb
> index 3495285..63fa320 100644
> --- a/recipes-core/swupdate-config/swupdate-config_0.1.bb
> +++ b/recipes-core/swupdate-config/swupdate-config_0.2.bb
> @@ -11,6 +11,11 @@
>   
>   inherit dpkg-raw
>   
> +PROVIDES := "${PN}"
> +DEBIAN_PROVIDES := "${PN}"
> +
> +PN .= "-${MACHINE}"
> +
>   SRC_URI = "file://swupdate.cfg \
>              file://hwrevision.tmpl"

Ok this pattern is now broken on sid:

| Get:4 file:/isar-apt isar/main Sources [490 B]
| Get:5 file:/isar-apt isar/main riscv64 Packages [4,462 B]
| Reading package lists...
| DEBUG: Shell function rootfs_install_pkgs_update finished
| DEBUG: Executing shell function rootfs_install_resolvconf
| DEBUG: Shell function rootfs_install_resolvconf finished
| DEBUG: Executing shell function rootfs_import_package_cache
| DEBUG: Shell function rootfs_import_package_cache finished
| DEBUG: Executing shell function rootfs_install_pkgs_download
| Reading package lists...
| Building dependency tree...
| Reading state information...
| Package swupdate-config is a virtual package provided by:
|   swupdate-config-qemu-riscv64 0.2
|   swupdate-config-qemu-arm64 0.2
| E: Package 'swupdate-config' has no installation candidate
| WARNING: exit code 100 from a shell command.
| DEBUG: Executing shell function rootfs_do_umounts
| DEBUG: Shell function rootfs_do_umounts finished

The pattern to add a machine is wrong. I will change the type
from all to any which has the same effect.

Quirin


>