* [cip-dev] [PATCH] kas: Add opt/targz-img.yml
@ 2021-04-02 0:53 Nobuhiro Iwamatsu
2021-04-06 8:14 ` Jan Kiszka
0 siblings, 1 reply; 4+ messages in thread
From: Nobuhiro Iwamatsu @ 2021-04-02 0:53 UTC (permalink / raw)
To: jan.kiszka; +Cc: cip-dev, Nobuhiro Iwamatsu
[-- Attachment #1: Type: text/plain, Size: 1878 bytes --]
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
+
+local_conf_header:
+ image-type: |
+ IMAGE_TYPE = "targz-img"
--
2.30.0.rc2
[-- Attachment #2: Type: text/plain, Size: 428 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6339): https://lists.cip-project.org/g/cip-dev/message/6339
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]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [cip-dev] [PATCH] kas: Add opt/targz-img.yml
2021-04-02 0:53 [cip-dev] [PATCH] kas: Add opt/targz-img.yml Nobuhiro Iwamatsu
@ 2021-04-06 8:14 ` Jan Kiszka
2021-04-08 2:08 ` Nobuhiro Iwamatsu
0 siblings, 1 reply; 4+ messages in thread
From: Jan Kiszka @ 2021-04-06 8:14 UTC (permalink / raw)
To: Nobuhiro Iwamatsu; +Cc: cip-dev
[-- Attachment #1: Type: text/plain, Size: 2208 bytes --]
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
--
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 (#6343): https://lists.cip-project.org/g/cip-dev/message/6343
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]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [cip-dev] [PATCH] kas: Add opt/targz-img.yml
2021-04-06 8:14 ` Jan Kiszka
@ 2021-04-08 2:08 ` Nobuhiro Iwamatsu
0 siblings, 0 replies; 4+ messages in thread
From: Nobuhiro Iwamatsu @ 2021-04-08 2:08 UTC (permalink / raw)
To: cip-dev
[-- Attachment #1: Type: text/plain, Size: 2464 bytes --]
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
[-- Attachment #2: Type: text/plain, Size: 428 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
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]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <1671E45E13223112.31642@lists.cip-project.org>]
* Re: [cip-dev] [PATCH] kas: Add opt/targz-img.yml
[not found] <1671E45E13223112.31642@lists.cip-project.org>
@ 2021-04-02 1:02 ` Nobuhiro Iwamatsu
0 siblings, 0 replies; 4+ messages in thread
From: Nobuhiro Iwamatsu @ 2021-04-02 1:02 UTC (permalink / raw)
To: cip-dev, jan.kiszka
[-- Attachment #1: Type: text/plain, Size: 2545 bytes --]
Hi,
This patch is for isar-cip-core.
Best regards,
Nobuhiro
> -----Original Message-----
> From: cip-dev@lists.cip-project.org [mailto:cip-dev@lists.cip-project.org] On Behalf Of Nobuhiro Iwamatsu
> Sent: Friday, April 2, 2021 9:54 AM
> To: jan.kiszka@siemens.com
> Cc: cip-dev@lists.cip-project.org; iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT) <nobuhiro1.iwamatsu@toshiba.co.jp>
> Subject: [cip-dev] [PATCH] kas: Add opt/targz-img.yml
>
> 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
> +
> +local_conf_header:
> + image-type: |
> + IMAGE_TYPE = "targz-img"
> --
> 2.30.0.rc2
[-- Attachment #2: Type: text/plain, Size: 428 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6340): https://lists.cip-project.org/g/cip-dev/message/6340
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]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-08 2:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-02 0:53 [cip-dev] [PATCH] kas: Add opt/targz-img.yml Nobuhiro Iwamatsu
2021-04-06 8:14 ` Jan Kiszka
2021-04-08 2:08 ` Nobuhiro Iwamatsu
[not found] <1671E45E13223112.31642@lists.cip-project.org>
2021-04-02 1:02 ` Nobuhiro Iwamatsu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).