Allow partition build config to be embedded

Avoids need for separate file with simple FWFS definitions
SmingHub · Oct 26, 2021 · e9435e4 · e9435e4
1 parent 420b592
commit e9435e4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/Sming/Components/IFS b/Sming/Components/IFS
diff --git a/Sming/Components/Storage/Tools/hwconfig/hwconfig.py b/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
@@ -3,7 +3,7 @@
 # Sming hardware configuration tool
 #
 
-import common, argparse, os, partition
+import common, argparse, os, partition, json
 from common import *
 from config import Config
 from config import schema as config_schema
@@ -64,7 +64,10 @@ def handle_partgen(args, config, part):
 
 def handle_expr(args, config, part):
     # Evaluate expression against configuration data
-    return str(eval(args.expr)).encode()
+    res = eval(args.expr)
+    if isinstance(res, dict):
+        return json.dumps(res).encode()
+    return str(res).encode()
 
 
 def main():

diff --git a/samples/Basic_Templates/app/CsvTemplate.h b/samples/Basic_Templates/app/CsvTemplate.h
@@ -14,12 +14,16 @@ class CsvTemplate : public SectionTemplate
 	{
 	}
 
+	// Return true if we have a new valid record, false if not
 	bool nextRecord() override
 	{
+		// Content section we fetch the next data record, if there is one
 		if(sectionIndex() == 1) {
 			return csv.next();
 		}
 
+		// This code emits the header and footer sections exactly once
+		// `recordIndex` starts at -1 (before first record)
 		return recordIndex() < 0;
 	}
 

diff --git a/samples/Basic_Templates/basic_templates.hw b/samples/Basic_Templates/basic_templates.hw
@@ -13,7 +13,12 @@
             "filename": "out/fwfs1.bin",
             "build": {
                 "target": "fwfs-build",
-                "config": "fsimage.fwfs"
+                "config": {
+                    "name": "Basic Templates demo volume",
+                    "source": {
+                        "/": "files"
+                    }
+                }
             },
             "readonly": true,
             "encrypted": false

diff --git a/samples/Basic_Templates/fsimage.fwfs b/samples/Basic_Templates/fsimage.fwfs
+15 −0		README.rst
+1 −2		component.mk
+2 −2		tools/fsbuild/README.rst
+5 −2		tools/fsbuild/config.py
+1 −5		tools/fsbuild/fsbuild.py