From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7096083842147024896 X-Received: by 2002:a2e:878d:0:b0:24f:2bf2:5a79 with SMTP id n13-20020a2e878d000000b0024f2bf25a79mr20345861lji.497.1652348731927; Thu, 12 May 2022 02:45:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4c49:0:b0:472:627f:9c3c with SMTP id o9-20020ac24c49000000b00472627f9c3cls1544398lfk.3.gmail; Thu, 12 May 2022 02:45:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9a4sNv8CJwwjK9fTe2WOwM9OBviKxtdFNh7b08WbRrAx1QCrVZQ7wsNIz0WTQjvOXu5Ys X-Received: by 2002:a19:fc1b:0:b0:474:4bf7:e135 with SMTP id a27-20020a19fc1b000000b004744bf7e135mr3121400lfi.362.1652348730797; Thu, 12 May 2022 02:45:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652348730; cv=none; d=google.com; s=arc-20160816; b=0eidHLuCruf4PDrQl9AW6OnmkoeTayHgl/JbqWKWbJGJBt5tepBFQA9raU9ibxi5bx xPXjR9VPhuFLnN8+Xw/P+27//e2qgL8x/ndgEnNHN6EQt1jPwqjU8ItsPaX+iPJv+3JU 4nTD8kKNIwW7GQ4kivNgaPCq24l2kn756/O8raNuVAgR7Y2M4z3ffEB1HeD/Tt/NIxOj SkCRB9IdwObpTdOKkXPj58IiuGYKv/cyfzzdkpz2c8FIRy3KdjYzPeP2/Lsw/F0SKXTe qk8GF3d/PrmA/HT08BmauUdlDcDAhLDDJJ5z5BVFxB28JjVlcCvq1pIEyMMJnlzrjyf/ zoAg== 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=as3sbAz3osDMgLOy61UTfV3HkmHZXsPFt/NizetRaM+n2LB5qBWL90/dV99eYa1bcR lxvXpQq+Ynh8ZtW8kN2s7ejSTylZMA5UyvdvZNcn1DuCG0lzgwDtCOwSPIKxvjMKjabc pwn4/ziGPNAMEZ+XMLK9sUGdrEC9aE1hg6AA7TNoNrWE4XcILTrQ2xPcgpgdxpDfOyKj PJY6xkQ4nprH3WqjwopUHrTYGy/FvheRXFkpTsHSYc54r0CuqdFUqWI4l8yYvBaRgSZh zcXxnKjzfOkv79BZhgKaC1pRFOw3ppOG+EcH3kZAEJxhUuhr4kwPMVzC9ptpjz8rvznZ iYog== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ORiM6PFz; spf=pass (google.com: domain of fm-72506-20220512094530fe4257c7a30f2bc033-ztfthu@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20220512094530fe4257c7a30f2bc033-ZTftHu@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 22-20020ac25f56000000b00472523f3a8esi227062lfz.6.2022.05.12.02.45.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 May 2022 02:45:30 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20220512094530fe4257c7a30f2bc033-ztfthu@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=ORiM6PFz; spf=pass (google.com: domain of fm-72506-20220512094530fe4257c7a30f2bc033-ztfthu@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20220512094530fe4257c7a30f2bc033-ZTftHu@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 20220512094530fe4257c7a30f2bc033 for ; Thu, 12 May 2022 11:45:30 +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=ORiM6PFzx3fdWJj3TLDrNf/u0oxXVMKFlUuqxFJzQuNCitIRLWnnO+AWWIsxIHHq95Ltxl WsPtZfxQmBxa0c92TaGzQuU6qCFCURR5bjaqZWHSTBVQsxJwjo8ewzilkiWJISl7CC2fu1E8 gy099/Q/vZ4Ekw/iKnWWAtqrs+Xg8=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v2 1/4] wic: Update to the latest revision Date: Thu, 12 May 2022 11:45:21 +0200 Message-Id: <20220512094524.216340-2-felix.moessbauer@siemens.com> In-Reply-To: <20220512094524.216340-1-felix.moessbauer@siemens.com> References: <20220512094524.216340-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: HcBHB+9/tguo 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