| Message ID | 20251208091154.2027780-3-ernestas.k@iconn-networks.com |
|---|---|
| State | New |
| Headers | show
Return-Path: <swupdate+bncBC33PIG2RUDRB65M3LEQMGQEKDBRAVA@googlegroups.com>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@legolas.ozlabs.org
Authentication-Results: legolas.ozlabs.org;
dkim=pass (2048-bit key;
unprotected) header.d=googlegroups.com header.i=@googlegroups.com
header.a=rsa-sha256 header.s=20230601 header.b=efSQZeZR;
dkim-atps=neutral
Authentication-Results: legolas.ozlabs.org;
spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com
(client-ip=2a00:1450:4864:20::338; helo=mail-wm1-x338.google.com;
envelope-from=swupdate+bncbc33pig2rudrb65m3leqmgqekdbrava@googlegroups.com;
receiver=patchwork.ozlabs.org)
Received: from mail-wm1-x338.google.com (mail-wm1-x338.google.com
[IPv6:2a00:1450:4864:20::338])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)
(No client certificate requested)
by legolas.ozlabs.org (Postfix) with ESMTPS id 4dPx8Q6kwzz1xvn
for <incoming@patchwork.ozlabs.org>; Mon, 08 Dec 2025 20:12:37 +1100 (AEDT)
Received: by mail-wm1-x338.google.com with SMTP id
5b1f17b1804b1-4779b432aecsf25414665e9.0
for <incoming@patchwork.ozlabs.org>;
Mon, 08 Dec 2025 01:12:37 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1765185150; cv=pass;
d=google.com; s=arc-20240605;
b=lHiLHlHLmhv+tdNZvrwKChCc3gLrNhiIBev1+H+ANOwOgNpxCEn7KZQOJiIukrsrIv
J3ko0jMGLaBOb5EcS0YAbSDwnslIbCnkTUC86TXbbpaXmNnwFufVMlnIoK8zutxnU5p0
lfybYt/w5NGoy8JP8WdIqBNxIR1tPzIyLkC6+3eINLpSLFm7X1xYkNkS0m31cCe2zCNV
wH3CQAe0OkYOGEJA/ZoiwLrRaZnNE5moytOJgltPgmH5FDy4Z7YUDT4YmD0AnE84e4yZ
t9orMxVdk4H7sg/LTWNOK4dqlpwzhm61bqSZI31Ga6pubBCQ9xrUNeZzp87i0lnloKBP
V4ig==
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20240605;
h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post
:list-id:mailing-list:precedence:reply-to:mime-version:references
:in-reply-to:message-id:date:subject:cc:to:from:dkim-signature;
bh=LfuZI51pzez8zP9ikOJrp98np71NAk27TDili8Xt2bY=;
fh=aVpEpd239rukJIMCIEtZ9SE4pHpPBwgjsGh/4JQFamk=;
b=I6pO0p7Q12yyBX67PpQ6PiWAJZkO0M25NrPnaBLk5FFBqGp9P26RuK5HjQnQFiH/Vf
insagviNE1GuuMxBaolkUlKBWGB0I2zXviRJ27DtVO/Y97dlKFIkfjMxmwG66c2QpONl
oGvp7ppzrWpMSrprtbjkvw7ky5zVXua7g43LrMd0kRz9wFS8WDRREsh3uTTbiDy5jft7
4F/ONKriZ1bZhqY/G6wiKdlvD+MxjMrnjsa5tVksESI3Q0cEBNbvSGofiAGjvleUSHtb
hy4BT/APBCe29TuG2rvFnsV0NLhTSICz0zaCiswWdGOyE0fGtyLPPQ6Ar573Xy/lRBT3
TCww==;
darn=patchwork.ozlabs.org
ARC-Authentication-Results: i=2; gmr-mx.google.com;
dkim=pass header.i=@iconn-networks.com header.s=default
header.b=QtrXAr7w;
spf=pass (google.com: domain of ernestas.k@iconn-networks.com
designates 62.77.155.212 as permitted sender)
smtp.mailfrom=ernestas.k@iconn-networks.com;
dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE)
header.from=iconn-networks.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=googlegroups.com; s=20230601; t=1765185150; x=1765789950;
darn=patchwork.ozlabs.org;
h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post
:list-id:mailing-list:precedence:reply-to
:x-original-authentication-results:x-original-sender:mime-version
:references:in-reply-to:message-id:date:subject:cc:to:from:from:to
:cc:subject:date:message-id:reply-to;
bh=LfuZI51pzez8zP9ikOJrp98np71NAk27TDili8Xt2bY=;
b=efSQZeZR8fNapsr7werAg2A3q1f4etgOZ7Wvzst8rX51Iy64lx6JhbU1BdR/OKaMfb
bDOMXIHh13OzyeBSJ/2GlTL2T2MMhRSuDC7bLac6MEIPrqfs4kIWQCXaLdur5EFxoflB
A1rr4AjLQEeGofS6TqQofkONVlMcimDT4g/2J1R1exYm25qpN9cUeDSgtONrkews6r78
2yW5hX5au/Z4TVfeJKEBQn8Y2xxXelVm/zJB+DLTvTRZbHXqbw8Fl6ZI0ukf37Vc6MVR
y4A2jmaEF81f9/AwBX1GndnbmMWborUyla+jKoEMu3uGdEuUr/eINpPFo67g55mNzP7z
5g6A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1765185150; x=1765789950;
h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post
:x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to
:x-original-authentication-results:x-original-sender:mime-version
:references:in-reply-to:message-id:date:subject:cc:to:from
:x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=LfuZI51pzez8zP9ikOJrp98np71NAk27TDili8Xt2bY=;
b=hBlu0nsL4d6qO8K6twPUXvv1ixaFSEQtq5CNINcs7mEzhVLj0vhERidm6kw4xJRsMl
WmU16eTAMlanZtbKfvydFvwmeZusEDVIJAaE42AE2H2hU9Mr3scOX8cZLH5I5xaXyS56
PghC0ySFtGJDGAxiDJYZFF+epXpAbZeLjI0zy6+IosfV0CeIecJ7ma3SjueMB/+w+yGo
t0A8Bvb55y2P61HqgzBurn/adnWttKJFAH4iJABx36O53HWpqaAdVMq4Dl52lFRGGm2C
pKuAIiHgNbdSDYAA8pzi6BUFwlBQrz520aZBX175ZkEbyvIfE15648e6/q6K93xuex9z
XDZg==
X-Forwarded-Encrypted: i=2;
AJvYcCWPyMj83oHiEVTf/pmsFoSGFjk7LnRohID5A6j2moHDPLBKEzRk5Gz5m2cb5BVfWFRdokTu/OQnpA==@patchwork.ozlabs.org
X-Gm-Message-State: AOJu0YzbY2w7+W2qWpIlR/equKWXgr9vZN4S8IHXLDl6rTCpV+ZEsMVE
/XfjEAS9ulHiUhxGDWtADTpEn4vWNW2mF31wposkvLdLYr+pTnyj/X7h
X-Google-Smtp-Source:
AGHT+IG5L8KSBFMjVnT4aLt++0ux8JcjsGH26NY+Q68V+G1934dwTUF9YfQ3yRkp0H3qcYSL7JK4cQ==
X-Received: by 2002:a05:600c:1c28:b0:46e:49fb:4776 with SMTP id
5b1f17b1804b1-47939df55abmr70703625e9.11.1765185149708;
Mon, 08 Dec 2025 01:12:29 -0800 (PST)
X-BeenThere: swupdate@googlegroups.com;
h="AWVwgWarhoZz3OSWyEB+MXaJxsoyNmSgTCm7NrW3lGVZLAyB9g=="
Received: by 2002:a05:600c:45d1:b0:477:980b:bafe with SMTP id
5b1f17b1804b1-4792fcd1ed6ls25890185e9.1.-pod-prod-04-eu; Mon, 08 Dec 2025
01:12:25 -0800 (PST)
X-Received: by 2002:a05:600c:4fd6:b0:471:1765:839c with SMTP id
5b1f17b1804b1-47939e1e42fmr55235535e9.20.1765185145483;
Mon, 08 Dec 2025 01:12:25 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1765185145; cv=none;
d=google.com; s=arc-20240605;
b=F9aVvyMCqxdnFCVKFTmgCTN5v48P1MRP1Hn/pkr5ntkvx+3W52AseDL3z36NyVlt8q
XmHdHTdXW2OXwgIFY/vY8X2mP13S++Q5S0Yvr8/Hy7iD6QnPblItw4ZgYDTIT9L1AL8O
RnK9lSl9jPK4KfHat9HDr4gQCrzcK74ax7nQRxai+RON1cNDYlD3rq7CotG5pOTBtERR
thS+HH8+XQo+v8G8aul2V9lnhKpA0uB5HPnCcIXIA9REcxl7qUEPDOdofnxhp3qa8ouq
NY5Mr4idA32naZ0Q65n89nMhiFTEyl2C8TsCfBLDfJNt0ROfs5DDIxnPXBoUtGcJJgNi
kdcw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20240605;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:dkim-signature;
bh=1XlEh3NTa2KuppdshWIGc1dPfYyIi0NwXYdvIcDv3Ws=;
fh=z5EU8Jpv4PD/2kyu/5TapovCO0ItxGnnOw5ONyN7/gQ=;
b=SjH8qjWZOYmaFe9fSr2KyFTdFalVXHXq4CAZbtNQL9L8MHnJiMeI3l2ZNzQKVYkM96
aQoN1/3gHT66UU3UHs7A7Qp0zkN30OgbpoUAb3DoudcJRO0ZrU5KDuhahW5gFuiGJvkg
QeexGUJu1SydwpA84qeeHJSPXyuqFrExO2Xl7K9y9HjNtc1+cXyl1EbC3sABAtBcyh8N
ZnFYfoIArGvMevEkV1mNFX88pf9idxq+JJK/O52O01dsLM1R6grNLe2pOr9BiAEQN6yE
sw/8VFgFBz3JhmzAIW7vOS2o9lmEbDNWqo8WfFtScvsczS+ggAhDBgVS9gO3blI6bm6N
trtQ==;
dara=google.com
ARC-Authentication-Results: i=1; gmr-mx.google.com;
dkim=pass header.i=@iconn-networks.com header.s=default
header.b=QtrXAr7w;
spf=pass (google.com: domain of ernestas.k@iconn-networks.com
designates 62.77.155.212 as permitted sender)
smtp.mailfrom=ernestas.k@iconn-networks.com;
dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE)
header.from=iconn-networks.com
Received: from zebra.wilibox.com (zebra.wilibox.com. [62.77.155.212])
by gmr-mx.google.com with ESMTPS id
5b1f17b1804b1-47a779a96e1si170965e9.2.2025.12.08.01.12.25
for <swupdate@googlegroups.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 08 Dec 2025 01:12:25 -0800 (PST)
Received-SPF: pass (google.com: domain of ernestas.k@iconn-networks.com
designates 62.77.155.212 as permitted sender) client-ip=62.77.155.212;
Received: from debian.. (unknown [81.7.79.211])
(Authenticated sender: ernestas.k@iconn-networks.com)
by zebra.wilibox.com (Postfix) with ESMTPSA id A59611734A9;
Mon, 8 Dec 2025 11:12:24 +0200 (EET)
From: "'Ernestas Kulik' via swupdate" <swupdate@googlegroups.com>
To: swupdate@googlegroups.com
Cc: toertel@gmail.com,
Ernestas Kulik <ernestas.k@iconn-networks.com>
Subject: [swupdate] [swugenerator] [PATCH v3 2/2] generator: Fix
decompressed-size setting
Date: Mon, 8 Dec 2025 11:08:13 +0200
Message-ID: <20251208091154.2027780-3-ernestas.k@iconn-networks.com>
X-Mailer: git-send-email 2.47.3
In-Reply-To: <20251208091154.2027780-1-ernestas.k@iconn-networks.com>
References: <20251208091154.2027780-1-ernestas.k@iconn-networks.com>
MIME-Version: 1.0
X-Original-Sender: ernestas.k@iconn-networks.com
X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass
header.i=@iconn-networks.com header.s=default header.b=QtrXAr7w;
spf=pass (google.com: domain of ernestas.k@iconn-networks.com
designates 62.77.155.212 as permitted sender)
smtp.mailfrom=ernestas.k@iconn-networks.com;
dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE)
header.from=iconn-networks.com
X-Original-From: Ernestas Kulik <ernestas.k@iconn-networks.com>
Reply-To: Ernestas Kulik <ernestas.k@iconn-networks.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: list
Mailing-list: list swupdate@googlegroups.com;
contact swupdate+owners@googlegroups.com
List-ID: <swupdate.googlegroups.com>
X-Spam-Checked-In-Group: swupdate@googlegroups.com
X-Google-Group-Id: 605343134186
List-Post: <https://groups.google.com/group/swupdate/post>,
<mailto:swupdate@googlegroups.com>
List-Help: <https://groups.google.com/support/>,
<mailto:swupdate+help@googlegroups.com>
List-Archive: <https://groups.google.com/group/swupdate
List-Subscribe: <https://groups.google.com/group/swupdate/subscribe>,
<mailto:swupdate+subscribe@googlegroups.com>
List-Unsubscribe:
<mailto:googlegroups-manage+605343134186+unsubscribe@googlegroups.com>,
<https://groups.google.com/group/swupdate/subscribe>
|
| Series |
Compressed entry changes
|
expand
|
diff --git a/swugenerator/generator.py b/swugenerator/generator.py index 706b850..6578f75 100644 --- a/swugenerator/generator.py +++ b/swugenerator/generator.py @@ -90,14 +90,10 @@ class SWUGenerator: ) sys.exit(1) new.fullfilename = new_path - if entry.get("type") == "ubivol": - entry.setdefault("properties", {}) \ - .update({ "decompressed-size": str(new.getsize()) }) - def process_entry(self, entry): if "filename" not in entry: return new = None for image in self.artifacts: @@ -201,10 +197,13 @@ class SWUGenerator: entry["filename"] = new.newfilename if not self.nohash: entry["sha256"] = new.getsha256() if "encrypted" in entry and entry["encrypted"] is True: entry["ivt"] = new.ivt + if entry.get("compressed") and not self.nocompress: + entry.setdefault("properties", {}) \ + .update({ "decompressed-size": str(new.getsize()) }) def find_files_in_swdesc(self, first): for n, val in first.items(): if isinstance(val, libconf.AttrDict): self.find_files_in_swdesc(val)
Currently, when using single image in multiple handlers (e.g. just flashing to several MTD partitions), the decompressed-size property will only be set for the first one. Moreover, it only being set for ubivol handlers breaks MTD flashing. Signed-off-by: Ernestas Kulik <ernestas.k@iconn-networks.com> --- swugenerator/generator.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)