From: Markus Niebel <Markus.Niebel@ew.tq-group.com>
Date: Fri, 18 Aug 2023 11:44:13 +0000 (+0200)
Subject: wic: fix wrong attempt to create file system in upartitioned regions
X-Git-Tag: 2022-04.13-kirkstone~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af9f392a5e259b681077f25fa263965714a73a05;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

wic: fix wrong attempt to create file system in upartitioned regions

The kickstart parser defaults fstype to "vfat". This leads to an attempt
to create an empty file system even for regions configured with "--no-table"
if used without fstype when no --sourceparams given.

The fix tests for fstype "none" or no_table in Partition prepare method.
This will omit the file system creation an the potential error for small
region with --no-table option.

Signed-off-by: Markus Niebel <Markus.Niebel@ew.tq-group.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit db771a4cd36bf291a8b68edfd905e03243f2c8b3)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---

diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index dce5d1485bc..5275da6ed34 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -132,7 +132,7 @@ class Partition():
             self.update_fstab_in_rootfs = True
 
         if not self.source:
-            if self.fstype == "none":
+            if self.fstype == "none" or self.no_table:
                 return
             if not self.size and not self.fixed_size:
                 raise WicError("The %s partition has a size of zero. Please "