diff mbox series

kas: Add opt/targz-img.yml

Message ID 20210402005346.372098-1-nobuhiro1.iwamatsu@toshiba.co.jp (mailing list archive)
State Accepted
Headers show
Series kas: Add opt/targz-img.yml | expand

Commit Message

Nobuhiro Iwamatsu April 2, 2021, 12:53 a.m. UTC 
This provides the function to specify 'targz-img' for IMAGE_TYPE. This is
used when creating a tar.gz image that does not support wic.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 .gitlab-ci.yml        |  3 +++
 kas/opt/targz-img.yml | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 kas/opt/targz-img.yml

Comments

Jan Kiszka April 6, 2021, 8:14 a.m. UTC | #1 
On 02.04.21 02:53, Nobuhiro Iwamatsu wrote:
> This provides the function to specify 'targz-img' for IMAGE_TYPE. This is
> used when creating a tar.gz image that does not support wic.
> 
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> ---
>  .gitlab-ci.yml        |  3 +++
>  kas/opt/targz-img.yml | 20 ++++++++++++++++++++
>  2 files changed, 23 insertions(+)
>  create mode 100644 kas/opt/targz-img.yml
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index d14c72f..8802af1 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -6,6 +6,7 @@ variables:
>    extention: base
>    use_rt: enable
>    wic_targz: enable
> +  targz: disable
>    dtb: none
>    deploy: enable
>  
> @@ -30,6 +31,7 @@ default:
>      - 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 [ "${wic_targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/wic-targz-img.yml"; fi;
> +    - if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi;
>      - kas build ${base_yaml}
>      - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi
>  
> @@ -69,6 +71,7 @@ build:qemu-amd64-base:
>      extention: security
>      use_rt: disable
>      wic_targz: disable
> +    targz: enable
>      deploy: disable
>  
>  # test
> diff --git a/kas/opt/targz-img.yml b/kas/opt/targz-img.yml
> new file mode 100644
> index 0000000..43c545e
> --- /dev/null
> +++ b/kas/opt/targz-img.yml
> @@ -0,0 +1,20 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2019
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> +  version: 10
> +
> +# lava uses nfs to deploy the image. For this we need a tarball instead of
> +# full image

This should rather go into the commit message as more specific reason
why we need this patch.

> +
> +local_conf_header:
> +  image-type: |
> +    IMAGE_TYPE = "targz-img"
> 

Jan
Nobuhiro Iwamatsu April 8, 2021, 2:08 a.m. UTC | #2 
Hi Jan,

Thanks for your review.

On Tue, Apr 06, 2021 at 10:14:31AM +0200, Jan Kiszka wrote:
> On 02.04.21 02:53, Nobuhiro Iwamatsu wrote:
> > This provides the function to specify 'targz-img' for IMAGE_TYPE. This is
> > used when creating a tar.gz image that does not support wic.
> > 
> > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> > ---
> >  .gitlab-ci.yml        |  3 +++
> >  kas/opt/targz-img.yml | 20 ++++++++++++++++++++
> >  2 files changed, 23 insertions(+)
> >  create mode 100644 kas/opt/targz-img.yml
> > 
> > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> > index d14c72f..8802af1 100644
> > --- a/.gitlab-ci.yml
> > +++ b/.gitlab-ci.yml
> > @@ -6,6 +6,7 @@ variables:
> >    extention: base
> >    use_rt: enable
> >    wic_targz: enable
> > +  targz: disable
> >    dtb: none
> >    deploy: enable
> >  
> > @@ -30,6 +31,7 @@ default:
> >      - 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 [ "${wic_targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/wic-targz-img.yml"; fi;
> > +    - if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi;
> >      - kas build ${base_yaml}
> >      - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi
> >  
> > @@ -69,6 +71,7 @@ build:qemu-amd64-base:
> >      extention: security
> >      use_rt: disable
> >      wic_targz: disable
> > +    targz: enable
> >      deploy: disable
> >  
> >  # test
> > diff --git a/kas/opt/targz-img.yml b/kas/opt/targz-img.yml
> > new file mode 100644
> > index 0000000..43c545e
> > --- /dev/null
> > +++ b/kas/opt/targz-img.yml
> > @@ -0,0 +1,20 @@
> > +#
> > +# CIP Core, generic profile
> > +#
> > +# Copyright (c) Siemens AG, 2019
> > +#
> > +# Authors:
> > +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> > +#
> > +# SPDX-License-Identifier: MIT
> > +#
> > +
> > +header:
> > +  version: 10
> > +
> > +# lava uses nfs to deploy the image. For this we need a tarball instead of
> > +# full image
> 
> This should rather go into the commit message as more specific reason
> why we need this patch.

OK, I will remove this sentence, and add to commit message.

> 
> > +
> > +local_conf_header:
> > +  image-type: |
> > +    IMAGE_TYPE = "targz-img"
> > 
> 
> Jan

Best regards,
  Nobuhiro
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6348): https://lists.cip-project.org/g/cip-dev/message/6348
Mute This Topic: https://lists.cip-project.org/mt/81792957/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]
-=-=-=-=-=-=-=-=-=-=-=-
diff mbox series

Patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d14c72f..8802af1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@  variables:
   extention: base
   use_rt: enable
   wic_targz: enable
+  targz: disable
   dtb: none
   deploy: enable
 
@@ -30,6 +31,7 @@  default:
     - 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 [ "${wic_targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/wic-targz-img.yml"; fi;
+    - if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi;
     - kas build ${base_yaml}
     - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi
 
@@ -69,6 +71,7 @@  build:qemu-amd64-base:
     extention: security
     use_rt: disable
     wic_targz: disable
+    targz: enable
     deploy: disable
 
 # test
diff --git a/kas/opt/targz-img.yml b/kas/opt/targz-img.yml
new file mode 100644
index 0000000..43c545e
--- /dev/null
+++ b/kas/opt/targz-img.yml
@@ -0,0 +1,20 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+#
+# Authors:
+#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 10
+
+# lava uses nfs to deploy the image. For this we need a tarball instead of
+# full image
+
+local_conf_header:
+  image-type: |
+    IMAGE_TYPE = "targz-img"