| Message ID | 20240208104550.170816-1-Quirin.Gylstorff@siemens.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [isar-cip-core,v4] swupdate.bbclass: add scripts section to the swu file | expand |
On 08.02.24 11:45, Quirin Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > This allows the user to add scripts[1] to the swu file by > setting the variable `SWU_SCRIPTS`. Scripts can be used to > prepare the system for an update. > > ``` > SWU_SCRIPTS = "<script_file_name>@<script_type>@<optional_data>" > ``` > This will add `file://<script_file_name>` to the variable `SRC_URI` and > `<script_file_name>` to `SWU_ADDTIONAL_FILES`. The sw-description will contain > the following section: > ``` > scripts: ( > { > filename = "<script_file_name>"; > type = "<script_type>"; > data = "<optional_data>"; > sha256 = "<automatically added sha256 of script_file_name>"; > },): > ``` > > [1]: https://sbabic.github.io/swupdate/sw-description.html?#scripts > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > > Changes v4: > - rebase onto next > Changes v3: > - fix message > - add luascript example to README > > Changes v2: > - change seperator from `:` to `@` as it already used for the > configfilecheck > - add optional data entry > - add warning if less then 2 parameters are given for entry > > > > classes/swupdate.bbclass | 38 +++++++++++ > doc/README.swupdate.md | 71 +++++++++++++++++++++ > recipes-core/images/swu/sw-description.tmpl | 1 + > 3 files changed, 110 insertions(+) > > diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass > index 403bdef..0c451cc 100644 > --- a/classes/swupdate.bbclass > +++ b/classes/swupdate.bbclass > @@ -57,6 +57,7 @@ IMAGE_TEMPLATE_VARS:swu = " \ > SWU_NAME \ > SWU_FILE_NODES \ > SWU_BOOTLOADER_FILE_NODE \ > + SWU_SCRIPTS_NODE \ > " > > # TARGET_IMAGE_UUID needs to be generated before completing the template > @@ -93,6 +94,43 @@ python add_swu_compression(){ > d.setVar('SWU_COMPRESSION_NODE', '') > } > > + > +SWU_EXTEND_SW_DESCRIPTION += "add_scripts" > +python add_scripts(){ > + swu_scripts = d.getVar('SWU_SCRIPTS') > + if not swu_scripts: > + return > + swu_script_entries = [ s for s in swu_scripts.split() ] > + script_node_list = [] > + for entry in swu_script_entries: > + script_elems = entry.split('@') > + if len(script_elems) < 2: > + bb.warn(f"SWU_SCRIPTS entry:'{entry}' is missing elements.") > + continue > + > + script_file = script_elems[0] > + script_type = script_elems[1] > + script_data = None > + if len(script_elems) > 2: > + script_data = script_elems[2] > + node = f""" > + {{ > + filename = "{script_file}"; > + type = "{script_type}"; > + """ > + if script_data: > + node += f""" data = "{script_data}";""" > + node += f""" > + sha256 = "{script_file}-sha256"; > + }}""" > + script_node_list.append(node) > + d.appendVar('SWU_ADDITIONAL_FILES', " " + script_file) > + d.appendVar('SRC_URI', f" file://{script_file}") > + > + swu_scripts_node = "scripts: (" + ','.join([n for n in script_node_list]) + ");" > + d.appendVar('SWU_SCRIPTS_NODE', swu_scripts_node) > +} > + > # convert between swupdate compressor name and imagetype extension > def get_swu_compression_type(d): > swu_ct = d.getVar('SWU_COMPRESSION_TYPE') > diff --git a/doc/README.swupdate.md b/doc/README.swupdate.md > index 1c94699..1a7fa0f 100644 > --- a/doc/README.swupdate.md > +++ b/doc/README.swupdate.md > @@ -21,6 +21,77 @@ window is still possible. > If the variable `SWU_EBG_UPDATE` is set to `"1"` the update is also stored in > the `*.swu` file. > > +## SWUpdate scripts > + > +It is possible to add [scripts](https://sbabic.github.io/swupdate/sw-description.html?#scripts) to a swu file. > + > +To add a script entry in isar-cip-core set the variable `SWU_SCRIPTS`. > +The content of the variable has the following pattern: > +`<script_file_name>@<script_type>@<optional_data>` Is that "@" separator sufficient to separate all types of information? What is "optional_data", and what do I do when it needs to contain blanks? What if I don't need it? > + > +The file referenced by `<script_file_name>` is added to the variables `SRC_URI` > +and `SWU_ADDITIONAL_FILES`. Therefore, it needs to be safed in a `FILESPATH` > +location. > + > +The mandatory element `script_type` can have the following values: > +- [lua](https://sbabic.github.io/swupdate/sw-description.html#lua) > +- [shellscript](https://sbabic.github.io/swupdate/sw-description.html#shellscript) > +- [preinstall](https://sbabic.github.io/swupdate/sw-description.html#preinstall) > +- [postinstall](https://sbabic.github.io/swupdate/sw-description.html#postinstall) > + > +### Example: postinstall.sh > + > +``` > +SWU_SCRIPTS = "postinstall" > +SWU_SCRIPT_postinstall[file] = "postinstall.sh" > +SWU_SCRIPT_postinstall[type] = "postinstall" > +SWU_SCRIPT_postinstall[data] = "some_data" Err, that is not in line with code and description above. It is more readable. If there weren't that 'data' field, SWU_SCRIPTS_<type> = "script1 script2" etc. would be very convenient and self-explanatory. I do not like the other format, just visually. > +``` > + > +This will add `file://postinstall.sh` to the variable `SRC_URI` and > +`postinstall.sh` to `SWU_ADDTIONAL_FILES`. The sw-description will contain > +the following section: > +``` > + scripts: ( > + { > + filename = "postinstall.sh"; > + type = "postinstall"; > + data = "some_data" > + sha256 = "<sha256 of postinstall.sh>"; > + },): > +``` > +### Example: Luascript > +The simplest lua script has the following content: > +```lua > +function preinst() > + local message = "preinst called\n" > + local success = true > + return success, message > +end > +function postinst() > + local message = "postinst called\n" > + local success = true > + return success, message > +end > +``` > +and is added: > + > +``` > +SWU_SCRIPTS = "luascript.lua@lua@some_data" > + > +``` > + > +The sw-description will contain the following section: > +``` > + scripts: ( > + { > + filename = "luascript.lua"; > + type = "lua"; > + data = "some_data" > + sha256 = "<sha256 of luascript.lua>"; > + },): > +``` > + > # Building and testing the CIP Core image > > Set up `kas-container` as described in the [top-level README](../README.md). > diff --git a/recipes-core/images/swu/sw-description.tmpl b/recipes-core/images/swu/sw-description.tmpl > index c52372c..88cb475 100644 > --- a/recipes-core/images/swu/sw-description.tmpl > +++ b/recipes-core/images/swu/sw-description.tmpl > @@ -35,4 +35,5 @@ software = > }; > sha256 = "linux.efi-sha256"; > }${SWU_FILE_NODES}); > + ${SWU_SCRIPTS_NODE} > } Jan
diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass index 403bdef..0c451cc 100644 --- a/classes/swupdate.bbclass +++ b/classes/swupdate.bbclass @@ -57,6 +57,7 @@ IMAGE_TEMPLATE_VARS:swu = " \ SWU_NAME \ SWU_FILE_NODES \ SWU_BOOTLOADER_FILE_NODE \ + SWU_SCRIPTS_NODE \ " # TARGET_IMAGE_UUID needs to be generated before completing the template @@ -93,6 +94,43 @@ python add_swu_compression(){ d.setVar('SWU_COMPRESSION_NODE', '') } + +SWU_EXTEND_SW_DESCRIPTION += "add_scripts" +python add_scripts(){ + swu_scripts = d.getVar('SWU_SCRIPTS') + if not swu_scripts: + return + swu_script_entries = [ s for s in swu_scripts.split() ] + script_node_list = [] + for entry in swu_script_entries: + script_elems = entry.split('@') + if len(script_elems) < 2: + bb.warn(f"SWU_SCRIPTS entry:'{entry}' is missing elements.") + continue + + script_file = script_elems[0] + script_type = script_elems[1] + script_data = None + if len(script_elems) > 2: + script_data = script_elems[2] + node = f""" + {{ + filename = "{script_file}"; + type = "{script_type}"; + """ + if script_data: + node += f""" data = "{script_data}";""" + node += f""" + sha256 = "{script_file}-sha256"; + }}""" + script_node_list.append(node) + d.appendVar('SWU_ADDITIONAL_FILES', " " + script_file) + d.appendVar('SRC_URI', f" file://{script_file}") + + swu_scripts_node = "scripts: (" + ','.join([n for n in script_node_list]) + ");" + d.appendVar('SWU_SCRIPTS_NODE', swu_scripts_node) +} + # convert between swupdate compressor name and imagetype extension def get_swu_compression_type(d): swu_ct = d.getVar('SWU_COMPRESSION_TYPE') diff --git a/doc/README.swupdate.md b/doc/README.swupdate.md index 1c94699..1a7fa0f 100644 --- a/doc/README.swupdate.md +++ b/doc/README.swupdate.md @@ -21,6 +21,77 @@ window is still possible. If the variable `SWU_EBG_UPDATE` is set to `"1"` the update is also stored in the `*.swu` file. +## SWUpdate scripts + +It is possible to add [scripts](https://sbabic.github.io/swupdate/sw-description.html?#scripts) to a swu file. + +To add a script entry in isar-cip-core set the variable `SWU_SCRIPTS`. +The content of the variable has the following pattern: +`<script_file_name>@<script_type>@<optional_data>` + +The file referenced by `<script_file_name>` is added to the variables `SRC_URI` +and `SWU_ADDITIONAL_FILES`. Therefore, it needs to be safed in a `FILESPATH` +location. + +The mandatory element `script_type` can have the following values: +- [lua](https://sbabic.github.io/swupdate/sw-description.html#lua) +- [shellscript](https://sbabic.github.io/swupdate/sw-description.html#shellscript) +- [preinstall](https://sbabic.github.io/swupdate/sw-description.html#preinstall) +- [postinstall](https://sbabic.github.io/swupdate/sw-description.html#postinstall) + +### Example: postinstall.sh + +``` +SWU_SCRIPTS = "postinstall" +SWU_SCRIPT_postinstall[file] = "postinstall.sh" +SWU_SCRIPT_postinstall[type] = "postinstall" +SWU_SCRIPT_postinstall[data] = "some_data" +``` + +This will add `file://postinstall.sh` to the variable `SRC_URI` and +`postinstall.sh` to `SWU_ADDTIONAL_FILES`. The sw-description will contain +the following section: +``` + scripts: ( + { + filename = "postinstall.sh"; + type = "postinstall"; + data = "some_data" + sha256 = "<sha256 of postinstall.sh>"; + },): +``` +### Example: Luascript +The simplest lua script has the following content: +```lua +function preinst() + local message = "preinst called\n" + local success = true + return success, message +end +function postinst() + local message = "postinst called\n" + local success = true + return success, message +end +``` +and is added: + +``` +SWU_SCRIPTS = "luascript.lua@lua@some_data" + +``` + +The sw-description will contain the following section: +``` + scripts: ( + { + filename = "luascript.lua"; + type = "lua"; + data = "some_data" + sha256 = "<sha256 of luascript.lua>"; + },): +``` + # Building and testing the CIP Core image Set up `kas-container` as described in the [top-level README](../README.md). diff --git a/recipes-core/images/swu/sw-description.tmpl b/recipes-core/images/swu/sw-description.tmpl index c52372c..88cb475 100644 --- a/recipes-core/images/swu/sw-description.tmpl +++ b/recipes-core/images/swu/sw-description.tmpl @@ -35,4 +35,5 @@ software = }; sha256 = "linux.efi-sha256"; }${SWU_FILE_NODES}); + ${SWU_SCRIPTS_NODE} }