{"id":2223786,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2223786/?format=json","web_url":"http://patchwork.ozlabs.org/project/swupdate/patch/20260416080233.3020518-2-peter.marko@siemens.com/","project":{"id":58,"url":"http://patchwork.ozlabs.org/api/1.1/projects/58/?format=json","name":"swupdate development","link_name":"swupdate","list_id":"swupdate.googlegroups.com","list_email":"swupdate@googlegroups.com","web_url":"https://github.com/sbabic/swupdate","scm_url":"git://github.com/sbabic/swupdate","webscm_url":""},"msgid":"<20260416080233.3020518-2-peter.marko@siemens.com>","date":"2026-04-16T08:02:33","name":"[meta-swupdate,1/1] Fix image machine suffix handling","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"40bb1fe2d63b31488daf3001ac56c00858c4cf8d","submitter":{"id":86946,"url":"http://patchwork.ozlabs.org/api/1.1/people/86946/?format=json","name":"Peter Marko","email":"peter.marko@siemens.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/swupdate/patch/20260416080233.3020518-2-peter.marko@siemens.com/mbox/","series":[{"id":500103,"url":"http://patchwork.ozlabs.org/api/1.1/series/500103/?format=json","web_url":"http://patchwork.ozlabs.org/project/swupdate/list/?series=500103","date":"2026-04-16T08:02:32","name":"handle IMAGE_MACHINE_SUFFIX","version":1,"mbox":"http://patchwork.ozlabs.org/series/500103/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2223786/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2223786/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=googlegroups.com header.i=@googlegroups.com\n header.a=rsa-sha256 header.s=20251104 header.b=JQXLqlna;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com\n (client-ip=2607:f8b0:4864:20::337; helo=mail-ot1-x337.google.com;\n envelope-from=swupdate+bncbckk5u7r5mgbbq5pqlhqmgqe6ucbonq@googlegroups.com;\n receiver=patchwork.ozlabs.org)"],"Received":["from mail-ot1-x337.google.com (mail-ot1-x337.google.com\n [IPv6:2607:f8b0:4864:20::337])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fx9Vw45KYz1yDF\n\tfor ; Thu, 16 Apr 2026 18:03:20 +1000 (AEST)","by mail-ot1-x337.google.com with SMTP id\n 46e09a7af769-7d7efc5a904sf19765905a34.3\n for ;\n Thu, 16 Apr 2026 01:03:20 -0700 (PDT)","by 2002:a05:6820:1689:b0:67d:fa47:dad3 with SMTP id\n 006d021491bc7-6943cccf616ls260397eaf.2.-pod-prod-03-us; Thu, 16 Apr 2026\n 01:03:14 -0700 (PDT)","from mta-65-227.siemens.flowmailer.net\n (mta-65-227.siemens.flowmailer.net. [185.136.65.227])\n by gmr-mx.google.com with ESMTPS id\n 006d021491bc7-6932ce0db72si149297eaf.4.2026.04.16.01.03.14\n for \n (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);\n Thu, 16 Apr 2026 01:03:14 -0700 (PDT)","by mta-65-227.siemens.flowmailer.net with ESMTPSA id\n 20260416080311be7be84cac000207f8\n for ;\n Thu, 16 Apr 2026 10:03:11 +0200"],"ARC-Seal":["i=2; a=rsa-sha256; t=1776326596; cv=pass;\n d=google.com; s=arc-20240605;\n b=iRjC9gQb+Hx1eukFRSRE6KrKozvlwt3qgWA6MHs3EH2MPzLRFiyUxEgIgewBadTbrZ\n DX7IYGIJ9o+rL9bOPfOCgkmoYcPkWqpql0CLymJtqgAfFomILYxZAfHjCAjSbnt5AD4u\n aajN+nRoNP85+oQgLDJImdBv3G6A8AwV/MznvxcXGGOaRS63gnBqfatA1dpXyCM6yzS5\n iYBqbSHhQXvuyurM4H+Zd4KQFqTg7rv8PmSUqjMHyxAZyAzS5JpSGh5D6BbBd+fudkkm\n tQkly/pWDXbHYqcnZQhWwukvLmKwO3J1VA5ztdDmAz6TWlGAmqyFhMvsD2ghg2JZnRXT\n qKrA==","i=1; a=rsa-sha256; t=1776326594; cv=none;\n d=google.com; s=arc-20240605;\n b=L5QVUl4fNAN2KiO2Qv3b47w3yjscSNw53XsaW8b8X31fyd1PxE8Oqm4qWRSwFREI/g\n enwPLA2OgOjXGYXwNKm1RYUGqvDJrIecGusHn8jMz4CTKe3t1Wlos7VwtnfBKTaNjWdh\n Z2g7douXJlJyT+NnGQuoQ8ReRcTiRU9vxXA4Wjt4KpA5YFohgn7vtoK8UlHWbYAtwifa\n 936p2gmpKeu8YczuAdAYFtv3M2V+xPDPMIez7cZijcWImdjPYA71BMKICwkpYcARtdMr\n W0lEepBeeAxusSBKNbAonbaNADVuoCUHbTL3ESPqX/p6YUwVPQI3y1nmqrLHZx+V4a8X\n RgAQ=="],"ARC-Message-Signature":["i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com;\n s=arc-20240605;\n h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post\n :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version\n :references:in-reply-to:message-id:date:subject:cc:to:from\n :dkim-signature;\n bh=QwqX9qeSjda+5ROgOhmlscgzNlF4iwuribnjCd5BbKk=;\n fh=0FzQijugwmNoHF/uhCFlsRrEc3jC6mLtK82Xkl8+e30=;\n b=L65PTYuptRpxHLPFxsCTrGaXSYx3pjUs737CQPZa8U/vCTQMkHSfW5SIUmaEWwr9+C\n l9mhP1V+Ok3eAPoCHF2MQEJIwG24hMMYKIZQ8SQ3Zl6huVd8DkG71rne40RiZYUX+8HM\n 8ULKMARFY5j4z/l0g57852qHjiCX7bTXf2Oc8+OVjGlc8uBdS5JKW2POQLg3YgSfgImL\n VA90Yz6rgKFVc0UkqkrmqgI6BGfMm1eDW/KfGiE8NSJAKwZXBaNAKYLD+eoxTpA8xBR9\n 7A03d/w6flehn0YC0OgaUwBHK9YSCCL7LeSzAVgVSVn+0/V7AlbEMULtPpYjYIe2q8yg\n hqQQ==;\n darn=patchwork.ozlabs.org","i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;\n s=arc-20240605;\n h=feedback-id:content-transfer-encoding:mime-version:references\n :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature;\n bh=oErUhevYE3su3HiVIiFPpPQnuFlXzt9EVl5uUx+i2Kg=;\n fh=TvcW8mI+0zbo0ycfYS2jFgyGjn5hqL5s2sXppk3RnqM=;\n b=LCYLcr0LZIh8S9QDt1+IDeivsX2mOsTPBpEzUQ1TQFHmxRyeISUjxuzxwUf4vLgZuv\n wPibUUtZpVXJFSekYG7/JfrUsZs68DSQN13fBjrEWOH81oLO7FcQdu4863muxHnZdNee\n 1cFgSM6Q9naQZZbcI66Qi+fGt2jqPguFqBBYI+TcZaKQ+yVzC1rVcIhuaj2yffOiFQUJ\n DRp/6/Lw5iNg5llUlD4r5qG28XZYjsO7wtGNMkWZj4F8f/cx2sePrOoZwZWbIrp5wFc4\n DRaPhE9LptV2vPvNkmgF6poSSCAR0lQteqqQMc5R1jXhPzBlopCubdXInw8wfCNkitAT\n qsYQ==;\n dara=google.com"],"ARC-Authentication-Results":["i=2; gmr-mx.google.com;\n dkim=pass header.i=@siemens.com header.s=fm2 header.b=etZpThBB;\n spf=pass (google.com: domain of\n fm-256628-20260416080311be7be84cac000207f8-th8xxz@rts-flowmailer.siemens.com\n designates 185.136.65.227 as permitted sender)\n smtp.mailfrom=fm-256628-20260416080311be7be84cac000207f8-Th8xXZ@rts-flowmailer.siemens.com;\n dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com","i=1; gmr-mx.google.com;\n dkim=pass header.i=@siemens.com header.s=fm2 header.b=etZpThBB;\n spf=pass (google.com: domain of\n fm-256628-20260416080311be7be84cac000207f8-th8xxz@rts-flowmailer.siemens.com\n designates 185.136.65.227 as permitted sender)\n smtp.mailfrom=fm-256628-20260416080311be7be84cac000207f8-Th8xXZ@rts-flowmailer.siemens.com;\n dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=googlegroups.com; s=20251104; t=1776326596; x=1776931396;\n darn=patchwork.ozlabs.org;\n h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post\n :list-id:mailing-list:precedence:reply-to\n :x-original-authentication-results:x-original-sender:feedback-id\n :mime-version:references:in-reply-to:message-id:date:subject:cc:to\n :from:from:to:cc:subject:date:message-id:reply-to;\n bh=QwqX9qeSjda+5ROgOhmlscgzNlF4iwuribnjCd5BbKk=;\n b=JQXLqlnavhJ48sOPUYViFtDmPArAYh7OiKtkaCAjft+bICGhep7I95HBM33q/uoVD6\n s+PUANNRcEIHywFNcn4vM/6Rs7jY2JO/4VdgD+6DoutZiZl3v3q6FIm6v2+blzkzO2GG\n 493NU6QdLMkKHyJ0yUrgPjoNmsgfRg1nvZlILsGL1I06a5W+dEh7BD+z35YADM4yiGno\n ilVDwefdJSiiBS9HRE0/CB7YGEB5FA1jXqRe/to2D4ICysZVXQ+eeQJZon/1eLP02OtS\n EW+uAWez/7c95dLlhn9ibQeJsFrVvqZOX3cdHWClDDuKaXOPxxcMVkgsc8GY1BO+yY4W\n A0zA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776326596; x=1776931396;\n h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post\n :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to\n :x-original-authentication-results:x-original-sender:feedback-id\n :mime-version:references:in-reply-to:message-id:date:subject:cc:to\n :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date\n :message-id:reply-to;\n bh=QwqX9qeSjda+5ROgOhmlscgzNlF4iwuribnjCd5BbKk=;\n b=ZHO9edvH6Y/nBi9kuLsNxXdVnRTKbMxCA9oftN+U7MacA34cDYUA0ODyPc+RrfsQnJ\n hg/FupMDc+3dXlLzVEIPY2x/d8SEdotnhQ9ZjTogMuDcSKgeSF8uUxa2evlKdG5kAovh\n dYkTqIOmqdB9QTw9G5FTmGz9WZSi274UYvPG4DRm9n2oFJm4DzXmoLJgiiZ/9DlvJ+11\n iMzoZNHHhYkJJcDvlkUIAIEBEYZW7WQ8dW2X0+im+LlW5+sksORtc4UAEi1c9bnkHgsP\n 7D/knzRiTYi4LnBYZ6mr2oNqvGcSIwmvXdGmkf58FGeGOLlIpSWz2LCHeYPY5j8oWZgv\n fzYw==","X-Forwarded-Encrypted":"i=2;\n AFNElJ8/tUVBQSfsNxAsgDmlswvQmODL4Ra0VCa8N0VYA0fQE6sUDXSucHYW88QeB9ux9vs/j30xQ8G4fg==@patchwork.ozlabs.org","X-Gm-Message-State":"AOJu0Yywbk+mZH1WHVk/4Vaj8uGOgWsgFA9R1XAg+nRrgr4EUNVR9zpV\n\tK+LORmtSrhl7E2gYEMYXbnFTxGHyR7s/eNeY/A/s/DnRaM2mwFaGZX8B","X-Received":["by 2002:a05:6820:8184:b0:67d:eb9e:26ca with SMTP id\n 006d021491bc7-68be79f30e1mr11685007eaf.40.1776326596220;\n Thu, 16 Apr 2026 01:03:16 -0700 (PDT)","by 2002:a05:6820:198b:b0:68c:3d8e:7911 with SMTP id\n 006d021491bc7-68c3d8e7aeamr12729638eaf.44.1776326594539;\n Thu, 16 Apr 2026 01:03:14 -0700 (PDT)"],"X-BeenThere":"swupdate@googlegroups.com;\n h=\"AYAyTiL1FMFisL6AWlUw0gDevmEALT+/0htbbjX4Guk4XS2UCg==\"","Received-SPF":"pass (google.com: domain of\n fm-256628-20260416080311be7be84cac000207f8-th8xxz@rts-flowmailer.siemens.com\n designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227;","From":"\"'Peter Marko' via swupdate\" ","To":"swupdate@googlegroups.com","Cc":"Peter Marko ","Subject":"[swupdate] [meta-swupdate][PATCH 1/1] Fix image machine suffix\n handling","Date":"Thu, 16 Apr 2026 10:02:33 +0200","Message-ID":"<20260416080233.3020518-2-peter.marko@siemens.com>","In-Reply-To":"<20260416080233.3020518-1-peter.marko@siemens.com>","References":"<20260416080233.3020518-1-peter.marko@siemens.com>","MIME-Version":"1.0","X-Flowmailer-Platform":"Siemens","Feedback-ID":"519:519-256628:519-21489:flowmailer","X-Original-Sender":"peter.marko@siemens.com","X-Original-Authentication-Results":"gmr-mx.google.com; dkim=pass\n header.i=@siemens.com header.s=fm2 header.b=etZpThBB; spf=pass\n (google.com: domain of\n fm-256628-20260416080311be7be84cac000207f8-th8xxz@rts-flowmailer.siemens.com\n designates 185.136.65.227 as permitted sender)\n smtp.mailfrom=fm-256628-20260416080311be7be84cac000207f8-Th8xXZ@rts-flowmailer.siemens.com;\n dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com","X-Original-From":"Peter Marko ","Reply-To":"Peter Marko ","Content-Type":"text/plain; charset=\"UTF-8\"","Precedence":"list","Mailing-list":"list swupdate@googlegroups.com;\n contact swupdate+owners@googlegroups.com","List-ID":"","X-Spam-Checked-In-Group":"swupdate@googlegroups.com","X-Google-Group-Id":"605343134186","List-Post":",\n ","List-Help":",\n ","List-Archive":",\n ","List-Unsubscribe":"\n ,\n "},"content":"From: Peter Marko \n\noe-core image classes use IMAGE_MACHINE_SUFFIX, not MACHINE variable.\nIt works most of the time because it defaults to \"-${MACHINE}\", but with\nnon-default IMAGE_MACHINE_SUFFIX the logic is failing.\n\nSigned-off-by: Peter Marko \n---\n classes-recipe/swupdate-common.bbclass | 12 ++++++------\n classes-recipe/swupdate.bbclass | 4 ++--\n 2 files changed, 8 insertions(+), 8 deletions(-)","diff":"diff --git a/classes-recipe/swupdate-common.bbclass b/classes-recipe/swupdate-common.bbclass\nindex 80a5d5b..0fbcd20 100644\n--- a/classes-recipe/swupdate-common.bbclass\n+++ b/classes-recipe/swupdate-common.bbclass\n@@ -20,7 +20,7 @@ do_swuimage[dirs] = \"${SWUDEPLOYDIR}\"\n do_swuimage[cleandirs] += \"${SWUDEPLOYDIR}\"\n do_swuimage[sstate-inputdirs] = \"${SWUDEPLOYDIR}\"\n do_swuimage[sstate-outputdirs] = \"${DEPLOY_DIR_IMAGE}\"\n-do_swuimage[stamp-extra-info] = \"${MACHINE}\"\n+do_swuimage[stamp-extra-info] = \"${IMAGE_MACHINE_SUFFIX}\"\n \n python () {\n deps = \" \" + swupdate_getdepends(d)\n@@ -297,12 +297,12 @@ def swupdate_add_artifacts(d, list_for_cpio):\n encrypted = (d.getVarFlag(\"SWUPDATE_IMAGES_ENCRYPTED\", image) or \"\")\n if fstypes:\n noappend_machine = d.getVarFlag(\"SWUPDATE_IMAGES_NOAPPEND_MACHINE\", image)\n- if noappend_machine == \"0\": # Search for a file explicitly with MACHINE\n- imagebases = [ image + '-' + d.getVar('MACHINE') ]\n- elif noappend_machine == \"1\": # Search for a file explicitly without MACHINE\n+ if noappend_machine == \"0\": # Search for a file explicitly with IMAGE_MACHINE_SUFFIX\n+ imagebases = [ image + d.getVar('IMAGE_MACHINE_SUFFIX') ]\n+ elif noappend_machine == \"1\": # Search for a file explicitly without IMAGE_MACHINE_SUFFIX\n imagebases = [ image ]\n- else: # None, means auto mode. Just try to find an image file with MACHINE or without MACHINE\n- imagebases = [ image + '-' + d.getVar('MACHINE'), image ]\n+ else: # None, means auto mode. Just try to find an image file with IMAGE_MACHINE_SUFFIX or without IMAGE_MACHINE_SUFFIX\n+ imagebases = [ image + d.getVar('IMAGE_MACHINE_SUFFIX'), image ]\n for fstype in fstypes:\n image_found = False\n for imagebase in imagebases:\ndiff --git a/classes-recipe/swupdate.bbclass b/classes-recipe/swupdate.bbclass\nindex 5390c9b..f7134ac 100644\n--- a/classes-recipe/swupdate.bbclass\n+++ b/classes-recipe/swupdate.bbclass\n@@ -22,9 +22,9 @@\n # Example:\n # SWUPDATE_IMAGES = \"core-image-full-cmdline\"\n # SWUPDATE_IMAGES_FSTYPES[core-image-full-cmdline] = \".ext4.gz\"\n-# For this example either a file core-image-full-cmdline-${MACHINE}.ext4.gz or a file\n+# For this example either a file core-image-full-cmdline${IMAGE_MACHINE_SUFFIX}.ext4.gz or a file\n # core-image-full-cmdline.ext4.gz gets added the swu archive. Optionally the variable\n-# SWUPDATE_IMAGES_NOAPPEND_MACHINE allows to explicitly define if the MACHINE name\n+# SWUPDATE_IMAGES_NOAPPEND_MACHINE allows to explicitly define if the IMAGE_MACHINE_SUFFIX name\n # must be part of the image file name or not.\n # * image file name(s)\n # Example:\n","prefixes":["meta-swupdate","1/1"]}