aboutsummaryrefslogtreecommitdiffstats
path: root/templates/base
diff options
context:
space:
mode:
authorJerome Brunet <jbrunet@baylibre.com>2017-09-15 10:33:21 +0200
committerJerome Brunet <jbrunet@baylibre.com>2017-09-19 15:28:29 +0200
commit6d8721a6c24bb6b681d9c369e0032a05e54db26a (patch)
tree01de76930070633b3d6f74a719fb6c4d28ce73c2 /templates/base
parent36d0e4617c16c193a8a9932f1b09cfe97f9f767e (diff)
rfs-image: provide command line options to setup the image name
Provide 2 new command line options: --img-name and --img-ext These two options require one another since the name image will be composed from both of them in the following way: rfs_image = img_name + "-" + yocto-machine + "." + img_ext Change-Id: I2b6d174b4c141cea28ce63c3c7c7beae1a82ed4c Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Diffstat (limited to 'templates/base')
-rw-r--r--templates/base/agl-base-defaults.jinja24
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2
index c8b18b4..af82379 100644
--- a/templates/base/agl-base-defaults.jinja2
+++ b/templates/base/agl-base-defaults.jinja2
@@ -21,13 +21,13 @@
{%- if rootfs_type == 'nbd' %}
{%- set deploy_to = "nbd" %}
{%- set boot_commands = "nbd" %}
-{%- set nbdroot = nbdroot|default("core-image-minimal-" + yocto_machine + ".ext4.xz") %}
+{%- set nbdroot = rfs_image|default("core-image-minimal-" + yocto_machine + ".ext4.xz") %}
{%- set nbdroot_url = nbdroot_url|default(baseurl(nbdroot)) %}
{%- set nbdroot_compression = nbdroot_compression|default(nbdroot|get_extension) %}
{%- set nbdinitrd = nbdinitrd|default("initramfs-netboot-image-" + yocto_machine +".ext4.gz") %}
{%- set nbdinitrd_url = nbdinitrd_url|default(baseurl(nbdinitrd)) %}
{%- elif rootfs_type == 'ramdisk' %}
-{%- set initrd = initrd|default("initramfs-boot-image-" + yocto_machine +".gz") %}
+{%- set initrd = rfs_image|default("initramfs-boot-image-" + yocto_machine + ".gz") %}
{%- set initrd_compression = initrd_compression|default(initrd|get_extension) %}
{%- endif %}
{%- if initrd %}