From patchwork Fri Jun 19 07:21:29 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 5165 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 19 Jun 2026 09:22:51 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f61.google.com (mail-lf1-f61.google.com [209.85.167.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 65J7MnaU032739 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Jun 2026 09:22:50 +0200 Received: by mail-lf1-f61.google.com with SMTP id 2adb3069b0e04-5aa68e1b53dsf1278031e87.3 for ; Fri, 19 Jun 2026 00:22:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1781853764; cv=pass; d=google.com; s=arc-20240605; b=O5Ahz1YbHfhgtagABYLV9nvUDhWUPEmnLULCwh47p5JTADHzECL5lhs0MKawstKDVI aIDOgs3bXKmzMWz9/o23c4IpYarArkMo45WrRkINPIjKcotMFwUD5wGLJOUg5NyjdCK9 E4eEY2xIrWWGpUIhnKUlHnljo+uxQicCOJEGTTa7X0E0CqQuQKIGcnCY0piUUNHqYifu ASy+58WbA5cOfEgz3ENfWSh5TeA8shgv8JPX/CDsoNKsiZlWpNXB18Lj9PFjVrxpDVyR DYb2mzsSkMhiK0MFiORrSOfgaVMco5J1z4JnZw+uLjhPt1gQCoMVBAzJ/Iv7bDy4t4aM CAIw== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=fpucDVhHdaEZ4kMlAki8oZHiQ/EMC9IIQelTL3gccaY=; fh=RwyHGCX04nkij8y1owxAdVXF/MRMgDOWqTn4IcWTEDI=; b=gUD+9x9H6HUSALhGEX1FEjqUVagzklF8ShtRbqlARaAURzhx78Fz0ff3ZxHG7Tsp5N CEYrWv/Az1R0NLt3ImsivElf6eOL30hxllw/cUMv44snbvrZMSEKsXCCipVt+g6JQvvb Zc6JWxGBX6Vij5v6WjNWwcp+L1jj6Ep9K3h7hif9GFEgX0lgWeb4bZ5cwVCk49BfE8TD FlrfQgRcglQpmaqSJsYCKYu+JGT478E0zc9YH5gdef1gXyI6/+mAEAytAcWUmM5XB+tl foo1aBefmfj7fQZjMqQry5Bd89Guc/U4bCknGe8KSoAPnC3If4P5qp+lwQpMDFko3IOc +eGw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1781853764; x=1782458564; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=fpucDVhHdaEZ4kMlAki8oZHiQ/EMC9IIQelTL3gccaY=; b=qntRNe0ALOcivUPQZp0RJXydFQEbLJmzELKhjJpSyYt4LxYR5cbuu1CO0JeDdP0wa0 voaGkM6GVUywv4kjZr7ZrAlYSdb/EDAJL8/KQZDjrQyJWxqLMNrZPRYhAMD6Krak+2hB N7Y0j35+CM0MwH2yeqab0cDuM9hJ1uGyiOuIdxIkYYlLtIEWLKFMzmDXhoGWzKGMAQsZ NlVf/WwSobZB+OfwJhqQaXuOLk/8HzanbaeKfG7XVc2rGr6jiujDmZ/OifM8TDZMMdiu G7GwnYYY9rbag/f6G2JodizqlxSCNgWdjxUYet3O5bKyy47CGIdRYN13PyfgE9cy4Ga8 9Sbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781853764; x=1782458564; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :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:sender:from:to:cc:subject:date :message-id:reply-to; bh=fpucDVhHdaEZ4kMlAki8oZHiQ/EMC9IIQelTL3gccaY=; b=tJ1zEtlb+GNssKehgT8WlbSJwOuFzEBo8EWtTz4gdhrgVT5zevAl2/iM78Cg+HLLv+ vySPWx5BfR23DJQ+w1/ckMkSXAk1vAy5SnFCU24w3IRJFWkyT0oxaTQpr2HoE1j54A5K P48SUUavZj8LwVKRWYS4wgeKJqv6ojribK1tA2UhVDXuNRmWz+AwnVCmFpUd2JtxkMbw A+zynMe164GhMYPgG+YlJKLiRTFVHSsCizGid/uaAn1z4tcMHtANVlKCectmVUEbMNl2 kdeIbuxkbZkBfdL2h4wtoKEUkM20m+dVRIdtA2rXbJqDwiBEYuzDl0q6ION8WLQumeSH +smw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AFNElJ8RO/am9h10/d8QZN8YsfMhB6AEpItgxNenvsvRGeUqT/vtLws2XwgSdcpLrAYUi1xC13ot0tA=@isar-build.org X-Gm-Message-State: AOJu0YzI4MCdkNnHw6DZhIxSu2UKoprFLaKJ0HkVj1qEPgWKTB4Q6mjP UBs19vF8wl1y/UosJHnZ93GpHyWWqoaho2jCtKhJgoBATv1NoKLLS8n/ X-Received: by 2002:a05:6512:4607:b0:5aa:6586:ce37 with SMTP id 2adb3069b0e04-5ad58f578ddmr343006e87.44.1781853764537; Fri, 19 Jun 2026 00:22:44 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AX0PUUdGtmWQujzT+8cl4hE5PSWUaNpn8DOIVC9TzcsgYDsyww==" Received: by 2002:a05:6512:40c2:20b0:5ad:4aaa:330c with SMTP id 2adb3069b0e04-5ad4da69b91ls454112e87.0.-pod-prod-03-eu; Fri, 19 Jun 2026 00:22:42 -0700 (PDT) X-Received: by 2002:a05:6512:3353:b0:5aa:780b:f341 with SMTP id 2adb3069b0e04-5ad58f53159mr379689e87.35.1781853762325; Fri, 19 Jun 2026 00:22:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1781853762; cv=none; d=google.com; s=arc-20240605; b=jXAr2Ay8pWolAXUNZpGxfGfvWrdxmHa6Do4b3ozlWV/KGraSJQEfE7b8uxTWmpfZL9 YZCkt7bJa6PHIo3QduGWgj20yRos5DwWgq1sInWIAeAxG4HKjLGD9fdpbO7saRXvfBNV UdRuSr3Znu5Rgw48Rehgs6TuQgt4ZjSK+OCnT+ZU+0k695q4/iRv7t9zaawMMxSKadXF B4gOSgepP+u0EnhAZZxCGodqfWLwjWhsvo8vZgBt/N4pax5VSNj7FDZK1cabjRbgai5w f9waB5Hm0Lfj8PRFgeEJ4xWxv4KrIBZ+Ol8bqyLm8ohYVoajjpkPLyL8EEJXNgHI5lWB tk0w== 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; bh=3Nnjjb103Em0S7E1wv5FgfZt7tj3ajKq6n8QEW5BT4g=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=dTpo5PFxW7/zSActRqVZcr9jniX0V1eCKgftwD7KVY0LYAUGFjpSEhwS4RmN1jMFRs 2jMiryh3m4vYbqKdhbPWCWhZ+2xeEnYyX2Cx0nU5Mwf5lIrqPflC123vwdli/tREoiyA OoOKM1hkPQ8Cp5yKc+UbUPAsxeVHgFGhrMAHL6wvSmyAmn4Z5s+6r3cb5CGT2arksbYn JewTeuaMSFpiqr6ThIIf/1Z31RWU8a+kdJaWDdlWsRNUWYwSAZbjqsRJ4GQLd75J8Fj5 hiC5ukaytr8F15CH8yOLoACKLRUJpyQf4KEfinEv02aWXgrWsPkTY/e/0v3UKTPg22uG djMg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-5ad57284f63si38049e87.3.2026.06.19.00.22.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Jun 2026 00:22:42 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from headcrash-nb.m.ilbers.de ([88.130.203.42]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 65J7MewJ032697 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 19 Jun 2026 09:22:41 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 1/7] wic: Update libs to v5.0.3 Date: Fri, 19 Jun 2026 09:21:29 +0200 Message-ID: <20260619072238.52120-2-amikan@ilbers.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260619072238.52120-1-amikan@ilbers.de> References: <20260619072238.52120-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= OE-core Revision: 236ac1b43308df722a78d3aa20aef065dfae5b2b. Following changes are left because they are still needed in Isar: d70553ae wic: Restore compatibility with old distros a4237f08 wic/plugins/images/direct: Allow changes in fstab on rootfs Signed-off-by: Anton Mikanovich --- scripts/lib/wic/engine.py | 2 +- scripts/lib/wic/plugins/source/bootimg-efi.py | 4 ++-- scripts/lib/wic/plugins/source/bootimg-partition.py | 2 +- scripts/lib/wic/plugins/source/empty.py | 2 +- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 2 ++ scripts/lib/wic/plugins/source/rawcopy.py | 2 +- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 674ccfc2..ce7e6c5d 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -359,7 +359,7 @@ class Disk: Remove files/dirs and their contents from the partition. This only applies to ext* partition. """ - abs_path = re.sub('\/\/+', '/', path) + abs_path = re.sub(r'\/\/+', '/', path) cmd = "{} {} -wR 'rm \"{}\"'".format(self.debugfs, self._get_part_image(pnum), abs_path) diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 13a9cddf..7cc51315 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -428,10 +428,10 @@ class BootimgEFIPlugin(SourcePlugin): elif source_params['loader'] == 'uefi-kernel': kernel = get_bitbake_var("KERNEL_IMAGETYPE") if not kernel: - raise WicError("Empty KERNEL_IMAGETYPE %s\n" % target) + raise WicError("Empty KERNEL_IMAGETYPE") target = get_bitbake_var("TARGET_SYS") if not target: - raise WicError("Unknown arch (TARGET_SYS) %s\n" % target) + raise WicError("Empty TARGET_SYS") if re.match("x86_64", target): kernel_efi_image = "bootx64.efi" diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py index 94183174..1071d1af 100644 --- a/scripts/lib/wic/plugins/source/bootimg-partition.py +++ b/scripts/lib/wic/plugins/source/bootimg-partition.py @@ -1,5 +1,5 @@ # -# Imported from openembedded-core +# Copyright OpenEmbedded Contributors # # SPDX-License-Identifier: GPL-2.0-only # diff --git a/scripts/lib/wic/plugins/source/empty.py b/scripts/lib/wic/plugins/source/empty.py index c1903ca5..41789123 100644 --- a/scripts/lib/wic/plugins/source/empty.py +++ b/scripts/lib/wic/plugins/source/empty.py @@ -1,5 +1,5 @@ # -# Imported from openembedded-core +# Copyright OpenEmbedded Contributors # # SPDX-License-Identifier: MIT # diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index afc9ea0f..607356ad 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py @@ -1,4 +1,6 @@ # +# Copyright OpenEmbedded Contributors +# # SPDX-License-Identifier: GPL-2.0-only # # DESCRIPTION diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index 73017e86..21903c2f 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py @@ -1,5 +1,5 @@ # -# Imported from openembedded-core +# Copyright OpenEmbedded Contributors # # SPDX-License-Identifier: GPL-2.0-only # diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index c990143c..e29f3a4c 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -43,7 +43,7 @@ class RootfsPlugin(SourcePlugin): # directory, or modify a directory outside OpenEmbedded). full_path = os.path.realpath(os.path.join(rootfs_dir, path)) if not full_path.startswith(os.path.realpath(rootfs_dir)): - logger.error("%s: Must point inside the rootfs: %s" % (cmd, path)) + logger.error("%s: Must point inside the rootfs:" % (cmd, path)) sys.exit(1) return full_path