All of lore.kernel.org
 help / color / mirror / Atom feed
From: Quirin Gylstorff <Quirin.Gylstorff@siemens.com>
To: felix.moessbauer@siemens.com, cip-dev@lists.cip-project.org,
	jan.kiszka@siemens.com
Subject: [cip-dev][isar-cip-core][PATCH v2 2/3] swupdate: set SWU_HW_COMPAT
Date: Wed,  7 Feb 2024 14:44:26 +0100	[thread overview]
Message-ID: <20240207134505.3286003-3-Quirin.Gylstorff@siemens.com> (raw)
In-Reply-To: <20240207134505.3286003-1-Quirin.Gylstorff@siemens.com>

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

With this item SWUpdate from Debian can be used in place of a
build from isar-cip-core.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 recipes-core/images/swupdate.inc                    | 2 +-
 recipes-core/swupdate-config/files/hwrevision.tmpl  | 2 +-
 recipes-core/swupdate-config/swupdate-config_0.1.bb | 2 +-
 recipes-core/swupdate/swupdate.inc                  | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc
index 4983f7c..183503b 100644
--- a/recipes-core/images/swupdate.inc
+++ b/recipes-core/images/swupdate.inc
@@ -13,7 +13,7 @@ inherit image_uuid
 inherit read-only-rootfs
 
 SWU_SIGNED ?= "1"
-
+SWU_HW_COMPAT ?= "cip-core-1.0"
 IMAGE_INSTALL += " swupdate"
 
 IMAGE_INSTALL += " swupdate-handler-roundrobin"
diff --git a/recipes-core/swupdate-config/files/hwrevision.tmpl b/recipes-core/swupdate-config/files/hwrevision.tmpl
index ec1d667..1eb0996 100644
--- a/recipes-core/swupdate-config/files/hwrevision.tmpl
+++ b/recipes-core/swupdate-config/files/hwrevision.tmpl
@@ -1 +1 @@
-cip-${MACHINE} ${IMAGE_HW_VERSION}
+cip-${MACHINE} ${MACHINE_HW_VERSION}
diff --git a/recipes-core/swupdate-config/swupdate-config_0.1.bb b/recipes-core/swupdate-config/swupdate-config_0.1.bb
index 6991321..260c0f1 100644
--- a/recipes-core/swupdate-config/swupdate-config_0.1.bb
+++ b/recipes-core/swupdate-config/swupdate-config_0.1.bb
@@ -14,7 +14,7 @@ inherit dpkg-raw
 SRC_URI = "file://swupdate.cfg \
            file://hwrevision.tmpl"
 
-MACHINE_HW_VERSION ??= ""
+MACHINE_HW_VERSION ??= "cip-core-1.0"
 TEMPLATE_FILES += "hwrevision.tmpl"
 TEMPLATE_VARS += "MACHINE MACHINE_HW_VERSION"
 
diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc
index cb1716b..818b431 100644
--- a/recipes-core/swupdate/swupdate.inc
+++ b/recipes-core/swupdate/swupdate.inc
@@ -34,9 +34,6 @@ DEPENDS += "${@bb.utils.contains('DEB_BUILD_PROFILES', 'mtd', 'mtd-utils', '', d
 
 DEB_BUILD_PROFILES += "${@'pkg.swupdate.nosigning' if not d.getVar('SWU_SIGNED') == '1' else ''}"
 
-# deactivate hardware compability for simple a/b rootfs update
-DEB_BUILD_PROFILES += "pkg.swupdate.nohwcompat"
-
 # add cross build and deactivate testing for arm based builds
 DEB_BUILD_PROFILES += "cross nocheck"
 
-- 
2.43.0



  parent reply	other threads:[~2024-02-07 13:45 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-07 13:44 [cip-dev][isar-cip-core][PATCH v2 0/3] Reduce difference to debian Quirin Gylstorff
2024-02-07 13:44 ` [cip-dev][isar-cip-core][PATCH v2 1/3] swupdate-config: move swupdate.cfg from customizations to own recipe Quirin Gylstorff
2024-02-12 18:46   ` Jan Kiszka
2024-02-07 13:44 ` Quirin Gylstorff [this message]
2024-02-12 18:46   ` [cip-dev][isar-cip-core][PATCH v2 2/3] swupdate: set SWU_HW_COMPAT Jan Kiszka
2024-02-07 13:44 ` [cip-dev][isar-cip-core][PATCH v2 3/3] swupdate.bbclass: weak default assignment for SWU_HW_COMPAT Quirin Gylstorff
2024-02-12 18:41 ` [cip-dev][isar-cip-core][PATCH v2 0/3] Reduce difference to debian Jan Kiszka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240207134505.3286003-3-Quirin.Gylstorff@siemens.com \
    --to=quirin.gylstorff@siemens.com \
    --cc=cip-dev@lists.cip-project.org \
    --cc=felix.moessbauer@siemens.com \
    --cc=jan.kiszka@siemens.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.