From mboxrd@z Thu Jan 1 00:00:00 1970 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 5526FC433EF for ; Mon, 4 Oct 2021 10:37:42 +0000 (UTC) Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by mx.groups.io with SMTP id smtpd.web08.7439.1633343861233115130 for ; Mon, 04 Oct 2021 03:37:42 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: siemens.com, ip: 192.35.17.14, mailfrom: jan.kiszka@siemens.com) Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 194Abcrt022398 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 4 Oct 2021 12:37:38 +0200 Received: from [167.87.3.213] ([167.87.3.213]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 194Abb64030996; Mon, 4 Oct 2021 12:37:38 +0200 Subject: Re: [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE From: Jan Kiszka To: Quirin Gylstorff Cc: dinesh.kumar@toshiba-tsip.com, cip-dev@lists.cip-project.org References: <20210928184948.737071-1-Quirin.Gylstorff@siemens.com> <20210928184947.AYjduU9bTolWO5fGM5sHK1KwOFt_xWwyNQv5uQOgPvk@z> <5da61997-9b25-d965-9d5b-0f148c8f4e5b@siemens.com> Message-ID: Date: Mon, 4 Oct 2021 12:37:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <5da61997-9b25-d965-9d5b-0f148c8f4e5b@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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 ; Mon, 04 Oct 2021 10:37:42 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/6772 On 04.10.21 11:28, Jan Kiszka wrote: > On 28.09.21 20:49, Quirin Gylstorff wrote: >> From: Quirin Gylstorff >> >> Replace the default assignment to ensure the generation of the >> swu file. As stated in [1]: If multiple `?=` assignments are used >> the first of those assignments ends up getting used. >> >> This fixes [2]. >> >> [1]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value >> [2]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14 >> >> Signed-off-by: Quirin Gylstorff >> --- >> kas/opt/swupdate.yml | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml >> index 7d86ad5..3cc02a3 100644 >> --- a/kas/opt/swupdate.yml >> +++ b/kas/opt/swupdate.yml >> @@ -19,5 +19,5 @@ local_conf_header: >> IMAGE_INSTALL_append = " swupdate" >> >> wic-swu: | >> - IMAGE_TYPE ?= "wic-swu-img" >> - WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks" >> + IMAGE_TYPE = "wic-swu-img" >> + WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks" >> >> > > Thanks, applied. > Something seems to break: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/pipelines/381889283 Could you have a look? We also had fetching issues against gitlab, but those were "solved" by retrying and were surely not triggered by this patch. Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EC31C433F5 for ; Mon, 4 Oct 2021 10:37:43 +0000 (UTC) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D9CD5613A8 for ; Mon, 4 Oct 2021 10:37:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D9CD5613A8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id VJGDYY4521723xwa5nN52hbl; Mon, 04 Oct 2021 03:37:42 -0700 X-Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by mx.groups.io with SMTP id smtpd.web08.7439.1633343861233115130 for ; Mon, 04 Oct 2021 03:37:42 -0700 X-Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 194Abcrt022398 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 4 Oct 2021 12:37:38 +0200 X-Received: from [167.87.3.213] ([167.87.3.213]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 194Abb64030996; Mon, 4 Oct 2021 12:37:38 +0200 Subject: Re: [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE From: "Jan Kiszka" To: Quirin Gylstorff Cc: dinesh.kumar@toshiba-tsip.com, cip-dev@lists.cip-project.org References: <20210928184948.737071-1-Quirin.Gylstorff@siemens.com> <20210928184947.AYjduU9bTolWO5fGM5sHK1KwOFt_xWwyNQv5uQOgPvk@z> <5da61997-9b25-d965-9d5b-0f148c8f4e5b@siemens.com> Message-ID: Date: Mon, 4 Oct 2021 12:37:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <5da61997-9b25-d965-9d5b-0f148c8f4e5b@siemens.com> Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: Msw6yeySUMmgUBtaPEirqVsZx4520388AA= Content-Type: multipart/mixed; boundary="69FHU03Wa0R581xziwsN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1633343862; bh=/qgwv0exugWUCEUnqGwcOcmcE62qgf/FEahaRGoQM6Y=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=V2fn6SVmojEkPiBSyUoVGgrdq8kaPA95wo+G/HqeUK7esEHG68RDalyqZ+OdFWfFNGF /S+NvQ66clFVQeJGJ490hZf2K2WoxP1r9al1UVYq323q/P+EbQy5UOxEIOEjOfb+h47OQ 9/2DBlvhJgL6KP1VrHbugmvs0/3bd8kxNfU= Message-ID: <20211004103737.YwqpHxS6mT1llRN3-ScEqh4rXTmNkCKvO6UHMY5aN_E@z> --69FHU03Wa0R581xziwsN Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 04.10.21 11:28, Jan Kiszka wrote: > On 28.09.21 20:49, Quirin Gylstorff wrote: >> From: Quirin Gylstorff >> >> Replace the default assignment to ensure the generation of the >> swu file. As stated in [1]: If multiple `?=` assignments are used >> the first of those assignments ends up getting used. >> >> This fixes [2]. >> >> [1]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value >> [2]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14 >> >> Signed-off-by: Quirin Gylstorff >> --- >> kas/opt/swupdate.yml | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml >> index 7d86ad5..3cc02a3 100644 >> --- a/kas/opt/swupdate.yml >> +++ b/kas/opt/swupdate.yml >> @@ -19,5 +19,5 @@ local_conf_header: >> IMAGE_INSTALL_append = " swupdate" >> >> wic-swu: | >> - IMAGE_TYPE ?= "wic-swu-img" >> - WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks" >> + IMAGE_TYPE = "wic-swu-img" >> + WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks" >> >> > > Thanks, applied. > Something seems to break: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/pipelines/381889283 Could you have a look? We also had fetching issues against gitlab, but those were "solved" by retrying and were surely not triggered by this patch. Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux --69FHU03Wa0R581xziwsN Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Links: You receive all messages sent to this group. View/Reply Online (#6772): https://lists.cip-project.org/g/cip-dev/message/= 6772 Mute This Topic: https://lists.cip-project.org/mt/86062392/4520388 Group Owner: cip-dev+owner@lists.cip-project.org Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/10495289/4520388= /727948398/xyzzy [cip-dev@archiver.kernel.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- --69FHU03Wa0R581xziwsN--