From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7102799916284510208 X-Received: by 2002:a2e:9941:0:b0:247:dce8:b0ec with SMTP id r1-20020a2e9941000000b00247dce8b0ecmr28244625ljj.404.1653749476370; Sat, 28 May 2022 07:51:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1a25:b0:255:4ab8:5c45 with SMTP id by37-20020a05651c1a2500b002554ab85c45ls57075ljb.5.gmail; Sat, 28 May 2022 07:51:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLp+g3ZLZnVDhL+r3Rdwq/YKTuaovB2paB6tqRzQnPlkNymIg3XH2CfUxgHXkMpdUVYF/S X-Received: by 2002:a05:651c:39c:b0:254:20d9:855a with SMTP id e28-20020a05651c039c00b0025420d9855amr7218425ljp.329.1653749475265; Sat, 28 May 2022 07:51:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653749475; cv=none; d=google.com; s=arc-20160816; b=PSX7Ko/eFWxW04B8Op8jigDgyFGIJlgHrCbSriNuzxM4+d/Ym1Vue9OFHwEL73s3eh wp2w1Sza/SgYefGoeUiLkMGpkG21p4TDhzKBvj2to5CZOWHA8SIy/sKlYgGExPdzRGHC bYKFCA0VvSytks5Iyg3O/ynnMOHpXOotU2VCCUNlaqaMNpj8Vo22Wx16LRSDpNIGHWJT PAvL8exn6EN6SfktijYw1G2SCia7D0VfhOawsfxHxzcX6BGUCZi/0YpGKB319swQW2rp A1NeQre9SwmQFN1OsiGSaOrAlBsXPDEA57752H4S3nEPpVixwxd7uQNC8ojleUy+gCHf SA5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=ubnStfTPlbi6G0GJkHmxen2XzX5SNOqT94A03rtd0+Y=; b=xPfLSwORVW7XFJupv2zm6d9nRR2F6ZOcAeo7LckIQSBPAh1s4PbTwBZjLgyc4VI2eo MIhGiPy0dtPPEtJb0ROQRGJjk4TbkqhRr9V8nGe2N6Za/muyog5UwUC6kmrNtXBn7S8+ XmqxzeS08YA0Bfnl4DNlw9yIryCYepbDB3McHq7rCIr04lJ82CZ6ng/XMCfizaEDVCYw 29FImbf2KWK5GvC0s3eQUJcNmIRg7mEvphfRwLef3Pw8t7NlDIXPSsocKcUcxjpziM15 5ahWUhZ3+69JpaNQaPuI6NnEJwGA+04X4N1xQ6aww5fEykcr3ivEtq5FUEzagpMyNwWu 40dg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Tv0b5DJ7; spf=pass (google.com: domain of fm-72506-20220528145114ea8b4141ab29a108f3-gjwl_l@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20220528145114ea8b4141ab29a108f3-GJWl_l@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id h12-20020a05651c124c00b0024eee872899si340895ljh.0.2022.05.28.07.51.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 May 2022 07:51:15 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20220528145114ea8b4141ab29a108f3-gjwl_l@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Tv0b5DJ7; spf=pass (google.com: domain of fm-72506-20220528145114ea8b4141ab29a108f3-gjwl_l@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20220528145114ea8b4141ab29a108f3-GJWl_l@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20220528145114ea8b4141ab29a108f3 for ; Sat, 28 May 2022 16:51:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=ubnStfTPlbi6G0GJkHmxen2XzX5SNOqT94A03rtd0+Y=; b=Tv0b5DJ78bU82p9N9RrS4Z6r/HSGyT3b2P7D5FX3AZrq73VRp0nJeax/wLKZv+4RUQi3UB ODZNFWUX3TsnhoetquDd0YwQeBa6LAaPTNx/9voq8F7JnquV3+hfdYdtjyu78psz19NWQXh1 g/KKr/dWozq3zTT/yDWEGfuWVDlNs=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, henning.schild@siemens.com, florian.bezdeka@siemens.com, amikan@ilbers.de, Felix Moessbauer Subject: [PATCH v4 1/5] wic: Update to the latest revision Date: Sat, 28 May 2022 16:50:38 +0200 Message-Id: <20220528145042.130894-2-felix.moessbauer@siemens.com> In-Reply-To: <20220528145042.130894-1-felix.moessbauer@siemens.com> References: <20220528145042.130894-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: jDcIOppV4Xmo Update to the latest wic from OE-core. OE-core Revision: b8878cf0d35cf3d1ac30576d9b9943a7761c011b Signed-off-by: Felix Moessbauer --- scripts/lib/wic/misc.py | 1 + scripts/lib/wic/plugins/imager/direct.py | 2 +- scripts/lib/wic/plugins/source/rootfs.py | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py index 3e118229..3bc165fd 100644 --- a/scripts/lib/wic/misc.py +++ b/scripts/lib/wic/misc.py @@ -36,6 +36,7 @@ NATIVE_RECIPES = {"bmaptool": "bmap-tools", "mkdosfs": "dosfstools", "mkisofs": "cdrtools", "mkfs.btrfs": "btrfs-tools", + "mkfs.erofs": "erofs-utils", "mkfs.ext2": "e2fsprogs", "mkfs.ext3": "e2fsprogs", "mkfs.ext4": "e2fsprogs", diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 35fff7c1..4d0b836e 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -259,7 +259,7 @@ class DirectPlugin(ImagerPlugin): if part.mountpoint == "/": if part.uuid: return "PARTUUID=%s" % part.uuid - elif part.label: + elif part.label and self.ptable_format != 'msdos': return "PARTLABEL=%s" % part.label else: suffix = 'p' if part.disk.startswith('mmcblk') else '' diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index 2e34e715..25bb41dd 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -50,7 +50,7 @@ class RootfsPlugin(SourcePlugin): @staticmethod def __get_rootfs_dir(rootfs_dir): - if os.path.isdir(rootfs_dir): + if rootfs_dir and os.path.isdir(rootfs_dir): return os.path.realpath(rootfs_dir) image_rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", rootfs_dir) @@ -96,6 +96,9 @@ class RootfsPlugin(SourcePlugin): part.rootfs_dir = cls.__get_rootfs_dir(rootfs_dir) part.has_fstab = os.path.exists(os.path.join(part.rootfs_dir, "etc/fstab")) pseudo_dir = os.path.join(part.rootfs_dir, "../pseudo") + if not os.path.lexists(pseudo_dir): + pseudo_dir = os.path.join(cls.__get_rootfs_dir(None), '../pseudo') + if not os.path.lexists(pseudo_dir): logger.warn("%s folder does not exist. " "Usernames and permissions will be invalid " % pseudo_dir) -- 2.30.2