Thread (1 message) 1 message, 1 author, 2021-04-02

Re: [cip-dev] [PATCH] kas: Add opt/targz-img.yml

From: Nobuhiro Iwamatsu <hidden>
Date: 2021-04-02 01:02:33

Possibly related (same subject, not in this thread)

Hi,

This patch is for isar-cip-core.

Best regards,
  Nobuhiro
quoted hunk
-----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) <redacted>
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 <redacted>
---
 .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
  

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help