From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7096083842147024896 X-Received: by 2002:a1c:2185:0:b0:38f:f4ed:f964 with SMTP id h127-20020a1c2185000000b0038ff4edf964mr9886597wmh.115.1652357645726; Thu, 12 May 2022 05:14:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:64ca:0:b0:20c:bb44:bd7 with SMTP id f10-20020a5d64ca000000b0020cbb440bd7ls2537220wri.0.gmail; Thu, 12 May 2022 05:14:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwje41K76rHCK5XpK7RgUlKHulUJDWV34ZitVkFEjFDk+tNBrfzyXHPwg9/OQqXvqOoaMo2 X-Received: by 2002:a5d:4148:0:b0:20a:d2de:d960 with SMTP id c8-20020a5d4148000000b0020ad2ded960mr27166980wrq.61.1652357644742; Thu, 12 May 2022 05:14:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652357644; cv=none; d=google.com; s=arc-20160816; b=WJSW8YttM5kFlgrC4wXTSbL74g+PiSFlLrnzX7cq4r8irGUYDE46djcWAVlzTqPBFo CkikvShJzBnv7hJ2Qd8VTphgj213/IcFx673zAZ01Hwfb7fVWhsKRf+S3JD1eNFOAVwv fIMExTPHuuXmGSCmnqDseZndVJsyDyjvvVC06le4q8l+ycQA0VzCVf5hcO6j2J8z0QXU lzS2JiU2lq1YZAFfenQepMVWb/ixYvTph7neFSc43rHpd1CTOVcdp1aW1zPLnygghygG j3G1kui2RHRhvHzvq9Y8yMvaZMn+zJa1w44ol31JkxCADq40khi6UJf6/tO6Q4HSlO+0 Y87Q== 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=QYbgrMNGAioOiHlrsYZJ3Qzz5oOZHEEh21QXOefqBeglfFStzKEfP44edjYEJgjCEd glYcM2nBlrGq/mkvB0iMb/itF+yeEm2Y261ujuwfUNLJ0byLstnRkyA4Dq8sXW/9FPuE tZXcXXqdhMQu0ATNMxmTY1YOhh8yji/dQn7xqbQDaogHidiKXvBVeh+1FIDlvSJ4inkY wMYOOPRmobnXPGCjfKlMoVuN41DHpWGf/Rs/zbgFy6raQsxYaV3rlbm7yEuXvkTrTxTr BA66cygK2YUdahcyQsrElGZyYplWStxF5EXNX28ibEIQ79C8SV10UxaIntlHUDYxUOD8 bDHQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=cq9+BXVU; spf=pass (google.com: domain of fm-72506-20220512121404833251ad6480fd587a-1imfmg@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-72506-20220512121404833251ad6480fd587a-1IMFmG@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id m16-20020a05600c3b1000b0038e70fa4e56si172424wms.3.2022.05.12.05.14.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 May 2022 05:14:04 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20220512121404833251ad6480fd587a-1imfmg@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=cq9+BXVU; spf=pass (google.com: domain of fm-72506-20220512121404833251ad6480fd587a-1imfmg@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-72506-20220512121404833251ad6480fd587a-1IMFmG@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20220512121404833251ad6480fd587a for ; Thu, 12 May 2022 14:14:04 +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=cq9+BXVUpXZFOQzqK+wy2P/tJZT84DwtEe3UDaVvSeUR715+fLv4LA6HE2Wr8Y4ZNcsasL 2rSwHZsnzeD3wWKzZ0dGGsTeL/Xy0jnmN6Ww3ds4/8VzwapWNE6kupkvSwJGIHJ4ZgIu4b4/ wcTGLvHOfPiRkOXNbl0BVSaJUNggI=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, jan.kiszka@siemens.com, florian.bezdeka@siemens.com, Felix Moessbauer Subject: [PATCH v3 1/4] wic: Update to the latest revision Date: Thu, 12 May 2022 14:13:43 +0200 Message-Id: <20220512121346.361428-2-felix.moessbauer@siemens.com> In-Reply-To: <20220512121346.361428-1-felix.moessbauer@siemens.com> References: <20220512121346.361428-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: V+OImz1EM5YQ 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