[cip-dev] [isar-cip-core][PATCH] kas: Rename opt/targz-img.yml to opt/wic-targz-img.yml

[cip-dev] [isar-cip-core][PATCH] kas: Rename opt/targz-img.yml to opt/wic-targz-img.yml

[Nobuhiro Iwamatsu]

[-- Attachment #1: Type: text/plain, Size: 1692 bytes --]

'wic-targz-img' was specified to IMAGE_TYPE in the original file. And there is 'targz-img' as a
similar function in ISAR.
This renames the file to clarify the functionality it provides.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 .gitlab-ci.yml                               | 6 +++---
 kas/opt/{targz-img.yml => wic-targz-img.yml} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename kas/opt/{targz-img.yml => wic-targz-img.yml} (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77d361c..d14c72f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ variables:
   release: buster
   extention: base
   use_rt: enable
-  targz: enable
+  wic_targz: enable
   dtb: none
   deploy: enable
 
@@ -29,7 +29,7 @@ default:
     - sudo rm -rf build/tmp
     - if [ "${use_rt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/rt.yml"; fi;
     - if [ "${extention}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extention}.yml"; fi;
-    - if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi;
+    - if [ "${wic_targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/wic-targz-img.yml"; fi;
     - kas build ${base_yaml}
     - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi
 
@@ -68,7 +68,7 @@ build:qemu-amd64-base:
     target: qemu-amd64
     extention: security
     use_rt: disable
-    targz: disable
+    wic_targz: disable
     deploy: disable
 
 # test
diff --git a/kas/opt/targz-img.yml b/kas/opt/wic-targz-img.yml
similarity index 100%
rename from kas/opt/targz-img.yml
rename to kas/opt/wic-targz-img.yml
-- 
2.30.0.rc2


[-- Attachment #2: Type: text/plain, Size: 428 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6338): https://lists.cip-project.org/g/cip-dev/message/6338
Mute This Topic: https://lists.cip-project.org/mt/81792908/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [cip-dev] [isar-cip-core][PATCH] kas: Rename opt/targz-img.yml to opt/wic-targz-img.yml

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1916 bytes --]

On 02.04.21 02:51, Nobuhiro Iwamatsu wrote:
> 'wic-targz-img' was specified to IMAGE_TYPE in the original file. And there is 'targz-img' as a
> similar function in ISAR.
> This renames the file to clarify the functionality it provides.
> 
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> ---
>  .gitlab-ci.yml                               | 6 +++---
>  kas/opt/{targz-img.yml => wic-targz-img.yml} | 0
>  2 files changed, 3 insertions(+), 3 deletions(-)
>  rename kas/opt/{targz-img.yml => wic-targz-img.yml} (100%)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 77d361c..d14c72f 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -5,7 +5,7 @@ variables:
>    release: buster
>    extention: base
>    use_rt: enable
> -  targz: enable
> +  wic_targz: enable
>    dtb: none
>    deploy: enable
>  
> @@ -29,7 +29,7 @@ default:
>      - sudo rm -rf build/tmp
>      - if [ "${use_rt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/rt.yml"; fi;
>      - if [ "${extention}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extention}.yml"; fi;
> -    - if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi;
> +    - if [ "${wic_targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/wic-targz-img.yml"; fi;
>      - kas build ${base_yaml}
>      - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi
>  
> @@ -68,7 +68,7 @@ build:qemu-amd64-base:
>      target: qemu-amd64
>      extention: security
>      use_rt: disable
> -    targz: disable
> +    wic_targz: disable
>      deploy: disable
>  
>  # test
> diff --git a/kas/opt/targz-img.yml b/kas/opt/wic-targz-img.yml
> similarity index 100%
> rename from kas/opt/targz-img.yml
> rename to kas/opt/wic-targz-img.yml
> 

Thanks, applied to next.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

[-- Attachment #2: Type: text/plain, Size: 428 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6344): https://lists.cip-project.org/g/cip-dev/message/6344
Mute This Topic: https://lists.cip-project.org/mt/81792908/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-