From patchwork Wed May 8 14:37:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 173 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 08 May 2024 16:38:21 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f59.google.com (mail-lf1-f59.google.com [209.85.167.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 448EcLoJ032742 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 May 2024 16:38:21 +0200 Received: by mail-lf1-f59.google.com with SMTP id 2adb3069b0e04-51fa975896esf3430158e87.3 for ; Wed, 08 May 2024 07:38:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715179095; cv=pass; d=google.com; s=arc-20160816; b=Y1ABXfEmaUKM9kXDOpsV4SUoJh8iJMlImKnBDNfLwY1n5WmgGPiJMvdTb3XyEJKkux /3uI0KwAJ+pNKyFzxfamlq0/B6EF/8UQCKA2XtqOBrtL9yo44xR6FPVItZO68SS2cJSl DCwtlHo4TmhBVAeAOfudWYuPLJZPegvrgDwrLIRfwFSkUMoPmGAfTAK0wPSCpnFYF0s4 l7QI/G6zrOnPX8ZZb8A2TAmmZPbl+xDajD78/MZdkKe8Q14HcdjGsYjaXQ9rMA1Ckt6u oSFuvqTQCp0EhJDOKwiMDzanpuDsNvFhqTSjhzlijGwC9BVkYEs0wYozUg6eE70Fa6Ym qG2w== 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=UWIJEKmL99lutqqP3uSPHc+vYDFLTZjT/YthQ8qMkOQ=; fh=ghTmSvXNLHnGMj94WbK3+FPR1xXfVEb0+2HbsZNMXco=; b=m000GUWZLt/boyaeuJesiBaX4EFH+dqVA3BGUhlhXoYWQBFIRZSMAtGRiq9jnSQh7T WUiNSly9vvrj9abHeuWJNYxRyKV32UxkRNsSh8Oj0/qsiuhIq7oB6NM+XY1Lx1XimUO3 YLhfVpxZ3UMS3OLfXWgXtAsqpMijtklslNWu2n/eXHdAFs2CUZwUOvvxFKsKCjKFaMhI v6Jh9UJRdufyiIgQfyY+3iukwXhCZgpyts9QCdbbBtyzAKME2KP9+ZjVuXcgyeAup/6q EDSTdiZFUnDAKv4IEh39soO4SKtMFjYeYTnS4Ts/gfSpOB4fhvrT5C5GfgrU5ZzlsexI ldJw==; 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=1715179095; x=1715783895; 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=UWIJEKmL99lutqqP3uSPHc+vYDFLTZjT/YthQ8qMkOQ=; b=pfDsblHj5P+yCoP436Pz+CgRxTvKYNYg44mIf5mRR462D9v1xCh03hjLiOZudauVo1 IYgStonhDTyZg6rAtHSUun5BOPMb/HoZVum29Kf3n5BCIm01wZXAJWewnr4KNiKJlDg2 YgQDxyKi/0WmV1+ryKDoD7uIVz9nVQg025WjYampYf/kcQW0I8nkVBiAAjQQ7fjKrCgW IuSTTS1JAhlQSeSjy6jdAyEdVW61F8wU4OdYHkANU17z/g763UPUGDMk98+DAjirnTyL dVfMnfIsfv8WwEZsxJToawVhURF7c3XB8dvU125gErIXKSROF6jG+DwSZdYZnSfPZP99 TlXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715179095; x=1715783895; 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=UWIJEKmL99lutqqP3uSPHc+vYDFLTZjT/YthQ8qMkOQ=; b=eYZv4hSasbpRjzIWQ3BSoRjSw2/h3xqH7NxXQrwf9ji5RnteIvQ6BAzcaKqk3sQYX0 xjBTWgiLS7RXTBrtNpeuHp4EKQBl2DXc1YNqt1+KU3WqxQpTI7tSt7ghf6CurxMgWpEh drW2Z0K8U0/eFtAKsI/3w1f6kzbGHwF5MExH0x7KXgSyy/aY6fUVOzn1b9jFz7EjLRKT stqMOdoP1uj4mCgjJcRIVcR/Gi12qZ0KAqdophHWeCY4IgIhwWjfECLXctLoHLfHVnpG cL3yndA9xEiqHNunAzcVNJVFVXuF8Tzi8BzESoaRYl/jjP0SEyZ2AbJ3UWj43foqLv9q Hs0Q== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVyvVpI8ADkaxqWa2mhCNU/nIKD7uVQWEYnDW+X7KbwyvvCcmLcu4ScM/1rkqyrY3CWVb6FpDEoLgbKvw+tYXlnXBXXVDk= X-Gm-Message-State: AOJu0Yzu/uy1K/j4OxtnxOLZGEXlU3VLkPYv36JDapP7ks1YofB1IG6I dWPKaieXPfmjoxf3dRy7Qb4LZtJg/Cfol83sp6K0MGs6pyhG+Hjf X-Google-Smtp-Source: AGHT+IHwOGEtWvIzkMBwjZ9cvyJ5lloygGPmrBU9kwGdM8+8fQUwuWuA8z+6B9PnAmrXAqI1C4zmQg== X-Received: by 2002:ac2:592f:0:b0:51d:8283:cf72 with SMTP id 2adb3069b0e04-5217cd4bc8emr1598343e87.57.1715179094524; Wed, 08 May 2024 07:38:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:280b:b0:519:6fe8:c02e with SMTP id 2adb3069b0e04-51f01969d88ls1418357e87.0.-pod-prod-03-eu; Wed, 08 May 2024 07:38:12 -0700 (PDT) X-Received: by 2002:ac2:4547:0:b0:51d:3b87:70a4 with SMTP id 2adb3069b0e04-5217c56f2aamr1717958e87.36.1715179092278; Wed, 08 May 2024 07:38:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715179092; cv=none; d=google.com; s=arc-20160816; b=XYMDn/0+lpRPsjhuCcW4eDj+2rzy+coD59Im4XF/AMEQ8AuP3ve0zzgfhQ2XKCkxBa AUI+9o/v7CktbvzdrWN0/A4/Ijzyqqrf5JO878H/LVrdgGC9d40j0BtBoggiRKuRlgGv SZFKHM+f/xeBpTxd8iEuuzV844HQ93+hC0TLT44SgkHaGWHMT7rNBglsyJyEoJE/TW0m IBJNTUuTjVXowBufIadrObRFtdWill7b6vmj7daPWvddUk1LqlNq+OTD0DkLLR14J+V2 072x+VL72KMS52AkThip3Zb+03wych26gR6anh7ggwFjRmrBT9PbmZosRBwMvYBvBYRh b2Ng== 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=xpOukPNdAfkDmxXZJYywWmyciLcXbO4R55sbDRlVTIs=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=otZpW5lEO2weqjiaocM3+57gccVo4C4suKDgrv8U+fV0QXN50Yexk7Mp3maU1m0IqZ 8D/DjmhHWTQ3oX+oDzsPqQn3a/E78lgc35duA1YGcEHjkYTRtd4JODQZFj7dDyVYJIkP bb2kaA8t9kk/ZN2CUbrh1H25aitMgKSfI0jUWrrcVMJqpK/ZctXQtaGrFRvg6+3pNM4H xPa4IDWT9szWeE7NoSSqJAyJyqERuaaUNeREn+cxYr4tmzCO+7fitXVnG/ocSN7S83bs WXmamwnIhHgLgUPwY/GmCW3fPIkUx3qiQj5RDht8TdY8ynRygCx+GHy8ftgldKAL8kfN D89g==; 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 q26-20020ac2529a000000b0051daa69fec1si447779lfm.2.2024.05.08.07.38.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 May 2024 07:38:12 -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 448EcAtj032711 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 8 May 2024 16:38:10 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 0/4] Update WIC to the latest revision Date: Wed, 8 May 2024 17:37:57 +0300 Message-Id: <20240508143801.557383-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. 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(-)