From patchwork Fri May 17 11:44:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 180 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 May 2024 13:44:52 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f57.google.com (mail-wm1-f57.google.com [209.85.128.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44HBipZw015213 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 17 May 2024 13:44:52 +0200 Received: by mail-wm1-f57.google.com with SMTP id 5b1f17b1804b1-4202c2d397asf7236245e9.0 for ; Fri, 17 May 2024 04:44:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715946286; cv=pass; d=google.com; s=arc-20160816; b=0yGUThT2aTRA6cO0RlInNOv8EsOlQiNwjCviTZQHKbJXLILVdYcnOn5cDBU2rP5p3E 9tcGKe6nc+f4O9aiMrSjnkb+MLWX9t+w3VuqQf+audmgRI7CszZEcTF+GhXcZh8yklDr yBYa4LrAo1f6XVytL+0YyF7CcSN0aq42q54dH7osS0Y+6sgl9MZQl2yYJUKUOeMK0hfG AZL4vvctw6oFZIFPqNA0bNhiB+LCF4RdUc0pIGaH84mjJ+ycqHJbpyU/4WxOPG9jdF5i bamF67D4TbvtM7y8qOiEbhZlioucPfujbusF5RV7OvLEwR1ge21I6fbKQ1HnxOcdvez1 MEUQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=LEBWyHbg3e5ssa83J0AqapRNy+y1tQKgNrN0URgCF/4=; fh=clpKqV2x1HwGHZp24j0GDdPcXYcrJA9vSqDimeO3Ji8=; b=NUAoAhgG0rtyWMS4/yBSKgBjLiRBIxq8guzrycUBOaWyfzNgEAwNDl03ZU3eK923uB mQa39nKJvm1Yh9U7h7g0j2fJcwlmKkw36We2QIqxWT6pxXsKTjMF1Pvpk8n0z0FLEdCz nfT/jM8m+UiQaahk986Chc0HGvMM+WgSHbDf3wKdJ9JwEMHz/CS3fM5riFEIasVBYKO+ 3uh6v6F+ncsMVboBxNjW7Mf9R06nUWHk3vnDayo5o9NAmkkHy0hw6ojgotU2G0xunt8S zHeXG6x7Ypgymxlw+l+Q8QYzA1K0D97q9wrlo0CEeDVEKCjByPHecaUHcioD8DOU1jZa PzPQ==; 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=20230601; t=1715946286; x=1716551086; 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:message-id:date:subject:cc:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=LEBWyHbg3e5ssa83J0AqapRNy+y1tQKgNrN0URgCF/4=; b=ZShY7CJw13KR7nKxKkrYGAl+OPqWOK4B/rs9myqsJkLHuOH0O9bDNx8BuT4nSbnMtx wgNBnZiGwThbBJINh4+WQaNt3Szv8H0TJI5hOCEht9n0uWUgerOLdYsz+rgxOcEmGieW jGjeQC5z9pU+bGwnulYjHqqIc8WokNcTzQwKYLSpqexfFcVgNRlry1Q19JNR/2X4Co0v AbXbE683riX4aabBIEkmuSb6+5Jxm7aYIUYRSFzmqyQDuhEfIYL/In6DOaCjj1syHMLU RFawYtgQHEwuMg72AFQgpIsYV5x4bRNj1KZ0f/0jJQb7q+yauDYFexPc0D4nuGXJHCF4 3mIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715946286; x=1716551086; 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 :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=LEBWyHbg3e5ssa83J0AqapRNy+y1tQKgNrN0URgCF/4=; b=JBaBw260Q+MoN3zIPIH1SNy6Wp9Fk1thqCx1yLPg698eEMK/J990TrLg+IacZpgb3B J+7GVcYiJ4maqnO74oZJGMw6igUFS999dm+tC+0oq5ZiyHuJnfbyfS0WNxhBoht9iTBo CZ05CNfVRCmbXnMiDwL+yLP21k4U7fjmnOYFl7WBhMVQ5XZiZkkDSBJDGkd5WWElyKPe RLG/qfS+6ziSy3y6nvCreagbR8cqRQxKQKKEmFaneBtilb5C4s/mbS53UaURUhd/YcwF VkISpkD72amg5nYxteWqvje2v2/XziiTFBRwW+Sw4BbJIr3Fr6wJf30eaINaw5FGnWG8 VJLA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVFbZCA58PZ3/9jeGJDLFlQANhRRuXjDeddnoAOrEceFJk1udW1zVtnhpbdxsPl+yroa0NQRus6vnt11QrLAdpdYWb2hFA= X-Gm-Message-State: AOJu0YxJvYLPiXCW58J1s1I7ma9QcX+Zxs5VPKENrIldIuQ6ZuPk/4uf RGOdPrznL/5sQLhCfDYZWUL9/ukbtPJTOifeM2sY5btxaf/tZ4F/ X-Google-Smtp-Source: AGHT+IGo9psbD2SrO4Zgwrl1jnfk/UwIQsHfuVgPnv8wM1KaySbCRSoowOv+S9s84rW8/oIGDpJh2Q== X-Received: by 2002:a05:600c:45cc:b0:41f:f592:2fa3 with SMTP id 5b1f17b1804b1-41ff5922fb3mr141081205e9.11.1715946286253; Fri, 17 May 2024 04:44:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4fcf:b0:41f:aad8:170b with SMTP id 5b1f17b1804b1-41fc20ecc51ls6147565e9.2.-pod-prod-01-eu; Fri, 17 May 2024 04:44:44 -0700 (PDT) X-Received: by 2002:a05:600c:4f0e:b0:420:151e:b205 with SMTP id 5b1f17b1804b1-420151eb4f3mr111123825e9.39.1715946284162; Fri, 17 May 2024 04:44:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715946284; cv=none; d=google.com; s=arc-20160816; b=cSRZJaFXEOn7OSSEGLZvB+NXe2wGE14Xlr/MjNTfKd+wlqWaumTGnPd676Ys0R/B5X O5LLolfMzSLa74pEpxfogu8YvD60ySMtzsHnjVRfZYglc6fIEoNR3zy8R7D9AB3xfQJ7 oQYIUEi60NpDwilVMgnG1URE+7s6xLYkeJnyXVRhLW7sQmG9AKYICIC/waKAWB8pHiMI EH7xdEav3Fngq0KonlL79EjTHegRgbNKkHqbxrTXQuEC0jwLVq8amWdpIsS0BzKW+jpW T4xFkV8kbaptCs1ILZt0UZB/p3QY4HbpznBTj0YrkMakhGp2+PjVhTSN/Yns7mZTlcZW hrWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=EhDdt+8IWgCp8Gwd7NcNr2R2YKNfGD9KLxqWp0RYQkM=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=a4Uob01FvmcnrLK0hsrgiTRdzr0f3fLpoCQV7v/Vr47eHE+1q8SqjBM/MEscmcAA9b sw7re0T/4vRCg9eozo53CnX6Q3XKePLz9iqYZXpDP1NKfWK1Sdu54WQyTjAYmb0U5Ndn UkJ72FuCpXUFVvupFTeO/1GJlN3OP09HG2e30f4CL9ieHaWFf1EANCFBuF0E6k3Oyp6u gQxcvCL0d05D8vJg1PeFRV9Mlmyz8GgSo1WuStCYd6LQHncJb0EaAI0lKJnOaVui1Uau UKZuTOREPG/vNs6x2SCYStTyuqtCPjHaGaFSYJj3ecw4J7N+yosCZbMyWsT5bRw++js1 mgBw==; 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 5b1f17b1804b1-4200e472cafsi3718315e9.2.2024.05.17.04.44.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 May 2024 04:44:44 -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 user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 44HBigmb015192 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 May 2024 13:44:43 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 0/4] Update WIC to the latest revision Date: Fri, 17 May 2024 14:44:30 +0300 Message-Id: <20240517114434.778656-1-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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?= This patchset updates WIC libs to the latest OE-core revision (version 5.0.0, codename Scarthgap). Commit a4237f08 ("wic/plugins/images/direct: Allow changes in fstab on rootfs") was reapplied because it is needed for some Isar targets. There is also a new fix to keep compatibility with Debian Buster and Ubuntu Focal which prevent those distros from having full identifier reproducibility during image prepare in WIC. --- Changes since v1: - Add missing signed-offs Anton Mikanovich (4): Revert "wic/plugins/images/direct: Allow changes in fstab on rootfs" wic: Update to the latest revision Revert "Revert "wic/plugins/images/direct: Allow changes in fstab on rootfs"" wic: Restore compatibility with old distros .../lib/wic/canned-wks/efi-bootdisk.wks.in | 2 +- .../lib/wic/canned-wks/qemux86-directdisk.wks | 2 +- scripts/lib/wic/filemap.py | 7 + scripts/lib/wic/help.py | 2 +- scripts/lib/wic/ksparser.py | 6 +- scripts/lib/wic/misc.py | 2 +- scripts/lib/wic/partition.py | 47 +++++- scripts/lib/wic/plugins/imager/direct.py | 134 ++++++++++++++---- scripts/lib/wic/plugins/source/bootimg-efi.py | 108 +++++++++++--- .../wic/plugins/source/bootimg-partition.py | 9 +- .../lib/wic/plugins/source/bootimg-pcbios.py | 6 +- scripts/lib/wic/plugins/source/empty.py | 59 +++++++- scripts/lib/wic/plugins/source/rawcopy.py | 9 +- scripts/lib/wic/plugins/source/rootfs.py | 4 +- 14 files changed, 336 insertions(+), 61 deletions(-)