diff mbox series

[1/2] parser: relax partition check

Message ID 20200121130336.16724-1-sbabic@denx.de
State Accepted
Headers show
Series [1/2] parser: relax partition check | expand

Commit Message

Stefano Babic Jan. 21, 2020, 1:03 p.m. UTC 
The check on partition entry is suitable for an UBI volume because it
verifies that a volume name is set. In case of disk partitions there is
no volume.

Signed-off-by: Stefano Babic <sbabic@denx.de>
---
 parser/parser.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/parser/parser.c b/parser/parser.c
index 67a56f7..a7c8dc2 100644
--- a/parser/parser.c
+++ b/parser/parser.c
@@ -351,7 +351,8 @@  static int parse_partitions(parsertype p, void *cfg, struct swupdate_cfg *swcfg)
 
 		partition->provided = 1;
 
-		if (!strlen(partition->volname) || !strlen(partition->device)) {
+		if ((!strlen(partition->volname) && !strcmp(partition->type, "ubipartition")) ||
+				!strlen(partition->device)) {
 			ERROR("Partition incompleted in description file");
 			free_image(partition);
 			return -1;
@@ -359,8 +360,10 @@  static int parse_partitions(parsertype p, void *cfg, struct swupdate_cfg *swcfg)
 
 		get_field(p, elem, "size", &partition->partsize);
 
+		add_properties(p, elem, partition);
+
 		TRACE("Partition: %s new size %lld bytes",
-			partition->volname,
+			!strcmp(partition->type, "ubipartition") ? partition->volname : partition->device,
 			partition->partsize);
 
 		LIST_INSERT_HEAD(&swcfg->images, partition, next);