From patchwork Fri Feb 16 15:30:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 13560222 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73CB6C48BF5 for ; Fri, 16 Feb 2024 15:30:31 +0000 (UTC) Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net [185.136.64.226]) by mx.groups.io with SMTP id smtpd.web11.21580.1708097428440934586 for ; Fri, 16 Feb 2024 07:30:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm1 header.b=M+0sJQ4U; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.226, mailfrom: fm-51332-2024021615302593321d63f6169249be-ah7dge@rts-flowmailer.siemens.com) Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2024021615302593321d63f6169249be for ; Fri, 16 Feb 2024 16:30:25 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=h/UUkxPeBoj8PnV8m4El1qVqZzFABfFpOqbTCK3KYpg=; b=M+0sJQ4U32e8+Pt7y5j6nBiEybUCQJ/6Ve4JhpI+afCV2iweIJWv/Pb+GS50fY169MJ7gj /kaLya5wh4Moetvga3lk5scx/hfVZMui8z1qErTZZUJ+eBazudiHjzhVeloowihtio403kVA mzRz6Jl3v8VPORDX45TwnJiwRbcZo=; From: Quirin Gylstorff To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Subject: [cip-dev][isar-cip-core][PATCH v3 2/4] swupdate: set SWU_HW_COMPAT Date: Fri, 16 Feb 2024 16:30:03 +0100 Message-ID: <20240216153024.260416-3-Quirin.Gylstorff@siemens.com> In-Reply-To: <20240216153024.260416-1-Quirin.Gylstorff@siemens.com> References: <20240216153024.260416-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 16 Feb 2024 15:30:31 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/15016 From: Quirin Gylstorff With this item SWUpdate from Debian can be used in place of a build from isar-cip-core. Signed-off-by: Quirin Gylstorff --- recipes-core/images/swupdate.inc | 2 +- recipes-core/swupdate-config/swupdate-config_0.1.bb | 2 +- recipes-core/swupdate/swupdate.inc | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc index 213b97f..1d237f7 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:remove:sid = "swupdate" 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"