From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7096083842147024896 X-Received: by 2002:a05:600c:1d8f:b0:394:8be3:a81e with SMTP id p15-20020a05600c1d8f00b003948be3a81emr12309487wms.97.1652185770002; Tue, 10 May 2022 05:29:30 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1f11:b0:394:7a2e:a847 with SMTP id bd17-20020a05600c1f1100b003947a2ea847ls1226237wmb.0.gmail; Tue, 10 May 2022 05:29:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxECCut7G8UsHgVBG5t+cDR+hZxU3X2eQS5B9RHs8gmX9vzWuB57sHSAj58sb7jgS24j/iy X-Received: by 2002:a05:600c:348a:b0:394:8777:c24e with SMTP id a10-20020a05600c348a00b003948777c24emr14159766wmq.93.1652185769013; Tue, 10 May 2022 05:29:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652185769; cv=none; d=google.com; s=arc-20160816; b=Dz8FQd5Zk6DZKB1O1f9dM63CD0q5rTCtVdvaoVzmZvd+mx6m1LBSDZkCLfWgLHOB2+ xp7tswimjzcs9+7B3WQlTMZtNZEyQd4V5BRGv/NBvmutm81p+uarxuaQ0iJSmJh/pkXF cXy8PqdFMCGhbAAnjpIXVMjycYCxQkU/KZ3L04O4/+LyV9P32c1pp0bS86QSknyM3y0A lp5CwZvK7IGu82/cRiOsk1tSor2VqoPjN4XmXd55UhlM7v+WuruLQR3qZFjEHFAZjiLr pWg2I4U+Scxnz5Zq3x14g9ac8FMNn4EWkLyhC2+orNMzxJis8zg93gR5AbgD245OjC7a TDxg== 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=m6Q7ozO/LWfKLdW/FQ+EXOvn1sFHyerpDeNgEnhEqLMdN5Ui4SoruZ7fGeDht8EyJr 13DNsUIKOjGxx+6vbI97PlwAtucehZ0oCr22O1gJ4CfC63o3tmxaHz5qQAWqsrjNWDYQ /jDvjh+xpUpsyx5lPtEpUxR0BGdPjw1qA5zms2p0AouYtv1NtCbHAasHxPXHMFY8OEnu v1ulzuO/LWqc776gaz9eSIc4vV/irHaFpNoI3+kKpZnffRNGJ4iyc9cOCjj6SBf+1YY9 4XSg4+ZuOcPeczSVMOFiyKYj+qZGFRNPcORfD8HdGF8VAcZfG5b70SRhpOiqf8GExjEx a3Zw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=lp4aeYHa; spf=pass (google.com: domain of fm-72506-202205101229289021b0c095b020e012-x9xzll@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202205101229289021b0c095b020e012-x9XZLL@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id d23-20020a1c7317000000b0038ebc691b17si265404wmb.2.2022.05.10.05.29.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 May 2022 05:29:29 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202205101229289021b0c095b020e012-x9xzll@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=lp4aeYHa; spf=pass (google.com: domain of fm-72506-202205101229289021b0c095b020e012-x9xzll@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202205101229289021b0c095b020e012-x9XZLL@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202205101229289021b0c095b020e012 for ; Tue, 10 May 2022 14:29:28 +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=lp4aeYHaMbiHOKzYAZsGtxV4uLS5kBG/tjB6nMK9B3eZMwupN3sv2a8aDwYVibtxtzPyLg 3hZabVg8fJ4hZhQa/b4c2du8GSzR/HgD+guXRQ/+FzWICC4C0n56VpuzD/HCMC6sQyOMwHhe LhfR0x49V8wD37yx7iUd0Vb88ABpY=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, henning.schild@siemens.com, Felix Moessbauer Subject: [PATCH 1/1] wic: Update to the latest revision Date: Tue, 10 May 2022 14:29:06 +0200 Message-Id: <20220510122906.922777-2-felix.moessbauer@siemens.com> In-Reply-To: <20220510122906.922777-1-felix.moessbauer@siemens.com> References: <20220510122906.922777-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: tFfzO3ytiZ3w 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