[cip-dev][isar-cip-core][PATCH v2] Add missing MACHINE to install swupdate-config*

Quirin Gylstorff <[email protected]>
Newsgroups org.cip-project.lists.cip-dev
Message-ID <[email protected]>
From: Quirin Gylstorff <[email protected]>

This fixes an issue when building swupdate-config* for two different
architectures, for example arm64 and riscv64.

The reason is that both package are ARCH all and provide the virtual
package `swupdate-config` which leads to the following error during
installation in the rootfs with Debian sid:

| 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

To be compliant with the Debian standard the conflict field is missing.

Signed-off-by: Quirin Gylstorff <[email protected]>
---

v1 was 'swupdate-config: Set DPKG_ARCH to any'

Changes v2:
 - set explict recipe name in image creation
 - remove DPKG_ARCH setting in swupdate-config

 recipes-core/images/swupdate.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc
index 00e972e..006d622 100644
--- a/recipes-core/images/swupdate.inc
+++ b/recipes-core/images/swupdate.inc
@@ -59,7 +59,7 @@ IMAGE_PREINSTALL:append = "${@'' if bb.utils.to_boolean(d.getVar('SWUPDATE_SELFB
 
 WFX_URL ??= ""
 # check for wfx url to enable support for wfx backend based updates
-IMAGE_INSTALL:append = "${@' swupdate-config-wfx' if d.getVar("WFX_URL") else ''}"
+IMAGE_INSTALL:append = "${@' swupdate-config-wfx-' + d.getVar("MACHINE") if d.getVar("WFX_URL") else ''}"
 
 IMAGE_INSTALL += " swupdate-handler-roundrobin"
-IMAGE_INSTALL += " swupdate-config"
+IMAGE_INSTALL += " swupdate-config-${MACHINE}"
-- 
2.53.0
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.