From 5466b245db538c6edac83a3f041a4ffc01e18a2e Mon Sep 17 00:00:00 2001
From: Luis Araujo <luis.araujo@collabora.co.uk>
Date: Mon, 11 Dec 2017 23:29:14 +0800
Subject: [PATCH] Concatenate .img suffix for images names
This commit removes printf and use concatenation to get the .img
suffix in the images names.
Signed-off-by: Luis Araujo <luis.araujo@collabora.co.uk>
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D7346
---
apertis-image-sdk.yaml | 2 +-
apertis-image-uboot.yaml | 2 +-
apertis-image-uefi.yaml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apertis-image-sdk.yaml b/apertis-image-sdk.yaml
index 57acc03..cd5a535 100644
--- a/apertis-image-sdk.yaml
+++ b/apertis-image-sdk.yaml
@@ -18,7 +18,7 @@ actions:
file: {{ $ospack }}
- action: image-partition
- imagename: {{ (printf "%s.img" $image) }}
+ imagename: {{ $image }}.img
imagesize: 20G
partitiontype: gpt
diff --git a/apertis-image-uboot.yaml b/apertis-image-uboot.yaml
index 5fbeea6..20c0f6d 100644
--- a/apertis-image-uboot.yaml
+++ b/apertis-image-uboot.yaml
@@ -17,7 +17,7 @@ actions:
file: {{ $ospack }}
- action: image-partition
- imagename: {{ (printf "%s.img" $image) }}
+ imagename: {{ $image }}.img
{{ if eq $type "minimal" }}
imagesize: 4G
{{ else }}
diff --git a/apertis-image-uefi.yaml b/apertis-image-uefi.yaml
index 4e093d0..f97a39d 100644
--- a/apertis-image-uefi.yaml
+++ b/apertis-image-uefi.yaml
@@ -17,7 +17,7 @@ actions:
file: {{ $ospack }}
- action: image-partition
- imagename: {{ (printf "%s.img" $image) }}
+ imagename: {{ $image }}.img
{{ if eq $type "minimal" }}
imagesize: 7G
{{end}}
--
GitLab