| Message ID | 20240207134505.3286003-3-Quirin.Gylstorff@siemens.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Reduce difference to debian | expand |
On 07.02.24 14:44, Quirin Gylstorff wrote: > 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" What is "1.0" in this context? Jan > 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" >
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"