| Message ID | 20251208085756.2025575-2-ernestas.k@iconn-networks.com |
|---|---|
| State | Changes Requested |
| Headers | show
Return-Path: <swupdate+bncBC33PIG2RUDRB7NG3LEQMGQEEDSK5IQ@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=UNLytz1y;
dkim-atps=neutral
Authentication-Results: legolas.ozlabs.org;
spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com
(client-ip=2a00:1450:4864:20::43d; helo=mail-wr1-x43d.google.com;
envelope-from=swupdate+bncbc33pig2rudrb7ng3leqmgqeedsk5iq@googlegroups.com;
receiver=patchwork.ozlabs.org)
Received: from mail-wr1-x43d.google.com (mail-wr1-x43d.google.com
[IPv6:2a00:1450:4864:20::43d])
(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 4dPwsc030sz1xvn
for <incoming@patchwork.ozlabs.org>; Mon, 08 Dec 2025 19:59:47 +1100 (AEDT)
Received: by mail-wr1-x43d.google.com with SMTP id
ffacd0b85a97d-42b30184be7sf2025945f8f.2
for <incoming@patchwork.ozlabs.org>;
Mon, 08 Dec 2025 00:59:46 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1765184383; cv=pass;
d=google.com; s=arc-20240605;
b=ZdwfbI8TpXMNSfJS31n0O2K+HlGwVA2CbH8+P9c6VXNGIipvb8MjBJGIUukeihzB+U
Bc4w6r+7nmQwWMSuAWWlqW9akxayv3pmMUx15NqvM67N4vGycJgC2VJJVQQhYkU3wGxr
GwyiDx0kpv6omUW3hS8zP4ltF8Ez7EGtQG106Z3XLNUbG0zHU1bCOQD/OULtK35Yy9zn
zh+UKFp4v31WV7ygDC2DDtSJIMMmDSQuLA+nL5lWzPF0xGsxDCODAB1B4KtivmffO4U8
RnIQ87tl7yB1irDRGI7XrNeqfuFbsOvMsbSul+DmIv1phvoW96MbRuQHxha05EyTtOUJ
FuWg==
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=VG1DLz5wt5bD+2lOnG6uyjjYmmfL+ipNjtrNszXsbNI=;
fh=qJ88Ss7azGxoXyq1tik3IWshEgNyy4MmkTIxUve/3cA=;
b=jXlkfMsCbu+wgEnNlV4R14RZYOeeBIVSDjPco+o3XZmamideDPXhhqzLjqnGL8FQtc
SOu7ujrOnu9AUlOGQst+MuO3erzm7NKjyhudKZ/5Gp/NFAOX1SPxFykLuwGMxgyd0gUz
0EDBHtQ4qAMsa/h1Y/LsnumHBUcQvNHiTt1azhZxj1xzg/yAImj52uS9YM+Gy0uAK/ip
lsDJWHKZpI2aIEksDVpA/MqokgnWsC6meDJYwQbFt1ymMz04ROV2Zf7mNuK5Djb8eFSa
62Fp4uUT5IJ2AtWlyMs3V6xI+SvUHhmyHsqAMqk2eu+2sxMWjU83GeWt3hbk3R/uEroJ
RceQ==;
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=azBptzIa;
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=1765184383; x=1765789183;
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=VG1DLz5wt5bD+2lOnG6uyjjYmmfL+ipNjtrNszXsbNI=;
b=UNLytz1yDBHcTsR80mkY+mIw2KHTDpPcJsCUZJTd+C6D2ztnM6b76RlUIpfHSLKaFO
XAMfM0+kWSaT4aP2Mi5NfOpI/Ek9kDGkEundwuatxzLe/wmUSwZolz/O3OzXNWGk3WgX
qMbkaU5ZDgU8fJ96n3Rb3LVJAcnxAgoD3GkwBjtknGKfn5zwFk1SiGDqjBMD8OgkqcA+
21X4jNgHWcjUw4Me+lCi50BaiLDuOVON5bcouZM3/w16c63B8rj8rHfM1EfFxXaZhzsz
WKNKTs057V9oADTpwAYgwDjmkksVcOHiu9G0sf9lGvS4nknkkVYgAYkCC+FvT/NcEVqC
PbBg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1765184383; x=1765789183;
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=VG1DLz5wt5bD+2lOnG6uyjjYmmfL+ipNjtrNszXsbNI=;
b=w7BqLuz9j4RXudTkzYHigsttp7k51JzdVRIv/cVMPKwdOBW6jw5hPNirbbGAid3jss
GqeJLUueI9rupHp670kZ0l7ZTTnXtUG1ePTjBDkqunDRHOfX0+7Zly/2ooWHUrLK8acB
xXWJoOwnkTX1LpZpATJPJauJoVgNxBHxdbP8ZSGxTvA4C2zl7gVGgVoIiAwqQIQQB5Tk
fRf1DjbVOhKx47ob9xzuNIGXwGTEbqzRe7++K/UDXlcHNQePhcLw8zvZ0kq9TI0MOMKs
4av3SL00j0RbMVODR8vYEFcKHlrmAg94dE6qUTVNXZELR+AZBan+yOgQL63uY3MlD/AL
VJWQ==
X-Forwarded-Encrypted: i=2;
AJvYcCWItFIcnLA23XQbGrUJlw86R+LdzLFfHQeQhLvNPuAMK6O6vKFpu7hsQSAtFKnceN2YNSEWUfBddA==@patchwork.ozlabs.org
X-Gm-Message-State: AOJu0Yy7vyM67i7zSc1PNrxxjUUaRQkxTboHG1sNaZX5KKHGQzLVucSn
ASsHIfG2IF6nrSLo3PK/Uv/OeXhC8Lkxp+tfaXJJxOqHIRLyxQNzj78Y
X-Google-Smtp-Source:
AGHT+IHi+QmI9+dwd6V8KG1GPc2zwnUKT2dj/MPi4qOkiXsxgfyDDO/mqAoopZ6ki2Gp1nbMSAIPNg==
X-Received: by 2002:a05:6000:420b:b0:42b:411b:e487 with SMTP id
ffacd0b85a97d-42f89f0b2c2mr6528733f8f.2.1765184383525;
Mon, 08 Dec 2025 00:59:43 -0800 (PST)
X-BeenThere: swupdate@googlegroups.com;
h="AWVwgWZqJ9R5XeyrLIYX+EZzGRUIbCRHrbNuF4ZaDigYIX1eVQ=="
Received: by 2002:a05:6000:2f8a:b0:42b:52c4:6610 with SMTP id
ffacd0b85a97d-42f7b2ec735ls2021498f8f.1.-pod-prod-01-eu; Mon, 08 Dec 2025
00:59:39 -0800 (PST)
X-Received: by 2002:a05:6000:22c8:b0:42b:36f4:cd20 with SMTP id
ffacd0b85a97d-42f89f10244mr7938880f8f.27.1765184378726;
Mon, 08 Dec 2025 00:59:38 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1765184378; cv=none;
d=google.com; s=arc-20240605;
b=UkGJwhPfOsibFL6nE2/6AuN8FsxFq+OYD+6+mPOpbfaYJMHrLHj80ZPCFRBr4zLkuY
0r2xGcFVihsQvnvZZq4wruGvkbP2dCew0Dizhzf+d6qzsRWIKUsupry6U6A2xOe65D5D
qfneU6hCCCQS6YAhALc4M8OZ3iDkMWfL8J644YMw3Bt/Q7RZqIKot1jFkXrijlbBguu/
fXXBboZ/1w+Sb0ZdmFLYETpK+08ZQ96Q6nMzC0BhdM/Si8xpNFVo2dqSKmXtpt0kUGMA
Fwz2a4tFxtfcsuTWmwEWncHE039H+42+Al1wWxPZ+g2PcXjlyYzsDO0kDyoBNA6X6Z4/
QAvw==
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=C1NRr1WAgg8IbVZb1YcAh7/F1Y8DTv3Lewtwmt+bHOg=;
fh=z5EU8Jpv4PD/2kyu/5TapovCO0ItxGnnOw5ONyN7/gQ=;
b=j4cAHP4mqOjPbEMfA3aYePLqUoR5ACx3pDcpDIebI7n9qAU/2wY7PV5yQ/gYRvm2tU
/ZfoZZe3wafv+5lkkRpu7KPdzr2I0ZgXjb5hAD+XFZW1Yv7xWlPEWFvmwhMFrsUMWL65
NhuODtbb2k0Q7Cubf7gLhve6AmoMpJ0L7hQHA/gw7Owh1X0vHo6O03m6nuTYCbWqN0iA
ZUlrGlp6uxxlHS6tNPRHpp20GygKXuWY4pzCcJ6slRFKsfMRst05W8ojRDBno5NvH2Ek
ohNB4zxVVTqbLLX0InFBED9xHybI7kXIj3acbSqiFvGDRhdyS6kpqECTbvx+UN6h5U6Q
rHEA==;
dara=google.com
ARC-Authentication-Results: i=1; gmr-mx.google.com;
dkim=pass header.i=@iconn-networks.com header.s=default
header.b=azBptzIa;
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
ffacd0b85a97d-42f7d21e682si179905f8f.9.2025.12.08.00.59.38
for <swupdate@googlegroups.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 08 Dec 2025 00:59:38 -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 28DC8172E73;
Mon, 8 Dec 2025 10:59:08 +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 v2 2/2] generator: Fix
decompressed-size setting
Date: Mon, 8 Dec 2025 10:57:37 +0200
Message-ID: <20251208085756.2025575-2-ernestas.k@iconn-networks.com>
X-Mailer: git-send-email 2.47.3
In-Reply-To: <20251208085756.2025575-1-ernestas.k@iconn-networks.com>
References: <20251208085756.2025575-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=azBptzIa;
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 |
[swugenerator,v2,1/2] generator: Implement xz support
|
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)