diff mbox series

[2/2,isar-cip-core] Add support qemu-arm

Message ID 20210408023230.388313-2-nobuhiro1.iwamatsu@toshiba.co.jp (mailing list archive)
State Accepted
Headers show
Series [1/2,isar-cip-core] Add support qemu-arm64 | expand

Commit Message

Nobuhiro Iwamatsu April 8, 2021, 2:32 a.m. UTC 
This adds configuration files to support QEMU/arm.
This is intended to be used for a test image of LAVA of CIP.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 .gitlab-ci.yml             | 19 +++++++++++++++++++
 conf/machine/qemu-arm.conf | 14 ++++++++++++++
 kas/board/qemu-arm.yml     | 16 ++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 conf/machine/qemu-arm.conf
 create mode 100644 kas/board/qemu-arm.yml

Comments

Jan Kiszka April 8, 2021, 6:04 a.m. UTC | #1 
On 08.04.21 04:32, Nobuhiro Iwamatsu wrote:
> This adds configuration files to support QEMU/arm.
> This is intended to be used for a test image of LAVA of CIP.
> 
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> ---
>  .gitlab-ci.yml             | 19 +++++++++++++++++++
>  conf/machine/qemu-arm.conf | 14 ++++++++++++++
>  kas/board/qemu-arm.yml     | 16 ++++++++++++++++
>  3 files changed, 49 insertions(+)
>  create mode 100644 conf/machine/qemu-arm.conf
>  create mode 100644 kas/board/qemu-arm.yml
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 01d9609..b53d9cc 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -84,6 +84,16 @@ build:qemu-arm64-base:
>      wic_targz: disable
>      targz: enable
>  
> +build:qemu-arm-base:
> +  extends:
> +    - .build_base
> +  variables:
> +    target: qemu-arm
> +    extention: security
> +    use_rt: disable
> +    wic_targz: disable
> +    targz: enable
> +
>  # test
>  build:simatic-ipc227e-test:
>    extends:
> @@ -124,3 +134,12 @@ build:qemu-arm64-test:
>      extention: test
>      wic_targz: disable
>      targz: enable
> +
> +build:qemu-arm-test:
> +  extends:
> +    - .build_base
> +  variables:
> +    target:  qemu-arm
> +    extention: test
> +    wic_targz: disable
> +    targz: enable
> diff --git a/conf/machine/qemu-arm.conf b/conf/machine/qemu-arm.conf
> new file mode 100644
> index 0000000..81a22c1
> --- /dev/null
> +++ b/conf/machine/qemu-arm.conf
> @@ -0,0 +1,14 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2019
> +# Copyright (c) TOSHIBA CORPORATION, 2021
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +DISTRO_ARCH = "armhf"
> +
> +IMAGE_TYPE ?= "ext4-img"
> +USE_CIP_KERNEL_CONFIG = "1"
> +KERNEL_DEFCONFIG ?= "cip-kernel-config/4.19.y-cip/arm/qemu_arm_defconfig"
> diff --git a/kas/board/qemu-arm.yml b/kas/board/qemu-arm.yml
> new file mode 100644
> index 0000000..9bf9728
> --- /dev/null
> +++ b/kas/board/qemu-arm.yml
> @@ -0,0 +1,16 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2019
> +# Copyright (c) TOSHIBA CORPORATION, 2021
> +#
> +# Authors:
> +#  Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> +  version: 10
> +
> +machine: qemu-arm
> 

Thanks, both applied.

Jan
Jan Kiszka April 29, 2021, 7:24 a.m. UTC | #2 
On 08.04.21 04:32, Nobuhiro Iwamatsu wrote:
> This adds configuration files to support QEMU/arm.
> This is intended to be used for a test image of LAVA of CIP.
> 
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> ---
>  .gitlab-ci.yml             | 19 +++++++++++++++++++
>  conf/machine/qemu-arm.conf | 14 ++++++++++++++
>  kas/board/qemu-arm.yml     | 16 ++++++++++++++++
>  3 files changed, 49 insertions(+)
>  create mode 100644 conf/machine/qemu-arm.conf
>  create mode 100644 kas/board/qemu-arm.yml
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 01d9609..b53d9cc 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -84,6 +84,16 @@ build:qemu-arm64-base:
>      wic_targz: disable
>      targz: enable
>  
> +build:qemu-arm-base:
> +  extends:
> +    - .build_base
> +  variables:
> +    target: qemu-arm
> +    extention: security
> +    use_rt: disable
> +    wic_targz: disable
> +    targz: enable
> +
>  # test
>  build:simatic-ipc227e-test:
>    extends:
> @@ -124,3 +134,12 @@ build:qemu-arm64-test:
>      extention: test
>      wic_targz: disable
>      targz: enable
> +
> +build:qemu-arm-test:
> +  extends:
> +    - .build_base
> +  variables:
> +    target:  qemu-arm
> +    extention: test
> +    wic_targz: disable
> +    targz: enable
> diff --git a/conf/machine/qemu-arm.conf b/conf/machine/qemu-arm.conf
> new file mode 100644
> index 0000000..81a22c1
> --- /dev/null
> +++ b/conf/machine/qemu-arm.conf
> @@ -0,0 +1,14 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2019
> +# Copyright (c) TOSHIBA CORPORATION, 2021
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +DISTRO_ARCH = "armhf"
> +
> +IMAGE_TYPE ?= "ext4-img"
> +USE_CIP_KERNEL_CONFIG = "1"
> +KERNEL_DEFCONFIG ?= "cip-kernel-config/4.19.y-cip/arm/qemu_arm_defconfig"
> diff --git a/kas/board/qemu-arm.yml b/kas/board/qemu-arm.yml
> new file mode 100644
> index 0000000..9bf9728
> --- /dev/null
> +++ b/kas/board/qemu-arm.yml
> @@ -0,0 +1,16 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2019
> +# Copyright (c) TOSHIBA CORPORATION, 2021
> +#
> +# Authors:
> +#  Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> +  version: 10
> +
> +machine: qemu-arm
> 

It looks to me we have some regressions in master (which does
deployment), caused by these commits. Could you have a look at

https://gitlab.com/cip-project/cip-core/isar-cip-core/-/pipelines/294203272

TIA,
Jan
Nobuhiro Iwamatsu May 10, 2021, 12:16 a.m. UTC | #3 
Hi Jan,

> -----Original Message-----
> From: Jan Kiszka [mailto:jan.kiszka@siemens.com]
> Sent: Thursday, April 29, 2021 4:25 PM
> To: iwamatsu nobuhiro(岩松 信洋 □ＳＷＣ◯ＡＣＴ) <nobuhiro1.iwamatsu@toshiba.co.jp>
> Cc: cip-dev@lists.cip-project.org
> Subject: Re: [PATCH 2/2] [isar-cip-core] Add support qemu-arm
> 
> On 08.04.21 04:32, Nobuhiro Iwamatsu wrote:
> > This adds configuration files to support QEMU/arm.
> > This is intended to be used for a test image of LAVA of CIP.
> >
> > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> > ---
> >  .gitlab-ci.yml             | 19 +++++++++++++++++++
> >  conf/machine/qemu-arm.conf | 14 ++++++++++++++
> >  kas/board/qemu-arm.yml     | 16 ++++++++++++++++
> >  3 files changed, 49 insertions(+)
> >  create mode 100644 conf/machine/qemu-arm.conf
> >  create mode 100644 kas/board/qemu-arm.yml
> >
> > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> > index 01d9609..b53d9cc 100644
> > --- a/.gitlab-ci.yml
> > +++ b/.gitlab-ci.yml
> > @@ -84,6 +84,16 @@ build:qemu-arm64-base:
> >      wic_targz: disable
> >      targz: enable
> >
> > +build:qemu-arm-base:
> > +  extends:
> > +    - .build_base
> > +  variables:
> > +    target: qemu-arm
> > +    extention: security
> > +    use_rt: disable
> > +    wic_targz: disable
> > +    targz: enable
> > +
> >  # test
> >  build:simatic-ipc227e-test:
> >    extends:
> > @@ -124,3 +134,12 @@ build:qemu-arm64-test:
> >      extention: test
> >      wic_targz: disable
> >      targz: enable
> > +
> > +build:qemu-arm-test:
> > +  extends:
> > +    - .build_base
> > +  variables:
> > +    target:  qemu-arm
> > +    extention: test
> > +    wic_targz: disable
> > +    targz: enable
> > diff --git a/conf/machine/qemu-arm.conf b/conf/machine/qemu-arm.conf
> > new file mode 100644
> > index 0000000..81a22c1
> > --- /dev/null
> > +++ b/conf/machine/qemu-arm.conf
> > @@ -0,0 +1,14 @@
> > +#
> > +# CIP Core, generic profile
> > +#
> > +# Copyright (c) Siemens AG, 2019
> > +# Copyright (c) TOSHIBA CORPORATION, 2021
> > +#
> > +# SPDX-License-Identifier: MIT
> > +#
> > +
> > +DISTRO_ARCH = "armhf"
> > +
> > +IMAGE_TYPE ?= "ext4-img"
> > +USE_CIP_KERNEL_CONFIG = "1"
> > +KERNEL_DEFCONFIG ?= "cip-kernel-config/4.19.y-cip/arm/qemu_arm_defconfig"
> > diff --git a/kas/board/qemu-arm.yml b/kas/board/qemu-arm.yml
> > new file mode 100644
> > index 0000000..9bf9728
> > --- /dev/null
> > +++ b/kas/board/qemu-arm.yml
> > @@ -0,0 +1,16 @@
> > +#
> > +# CIP Core, generic profile
> > +#
> > +# Copyright (c) Siemens AG, 2019
> > +# Copyright (c) TOSHIBA CORPORATION, 2021
> > +#
> > +# Authors:
> > +#  Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> > +#
> > +# SPDX-License-Identifier: MIT
> > +#
> > +
> > +header:
> > +  version: 10
> > +
> > +machine: qemu-arm
> >
> 
> It looks to me we have some regressions in master (which does
> deployment), caused by these commits. Could you have a look at
> 
> https://gitlab.com/cip-project/cip-core/isar-cip-core/-/pipelines/294203272
> 

OK, this is a issue when uploading a built image. I have not looked into 
The featute in detail. I will fix this.

> TIA,
> Jan
> 

Best regards,
  Nobuhiro
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6438): https://lists.cip-project.org/g/cip-dev/message/6438
Mute This Topic: https://lists.cip-project.org/mt/81933310/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 01d9609..b53d9cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,6 +84,16 @@  build:qemu-arm64-base:
     wic_targz: disable
     targz: enable
 
+build:qemu-arm-base:
+  extends:
+    - .build_base
+  variables:
+    target: qemu-arm
+    extention: security
+    use_rt: disable
+    wic_targz: disable
+    targz: enable
+
 # test
 build:simatic-ipc227e-test:
   extends:
@@ -124,3 +134,12 @@  build:qemu-arm64-test:
     extention: test
     wic_targz: disable
     targz: enable
+
+build:qemu-arm-test:
+  extends:
+    - .build_base
+  variables:
+    target:  qemu-arm
+    extention: test
+    wic_targz: disable
+    targz: enable
diff --git a/conf/machine/qemu-arm.conf b/conf/machine/qemu-arm.conf
new file mode 100644
index 0000000..81a22c1
--- /dev/null
+++ b/conf/machine/qemu-arm.conf
@@ -0,0 +1,14 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+# Copyright (c) TOSHIBA CORPORATION, 2021
+#
+# SPDX-License-Identifier: MIT
+#
+
+DISTRO_ARCH = "armhf"
+
+IMAGE_TYPE ?= "ext4-img"
+USE_CIP_KERNEL_CONFIG = "1"
+KERNEL_DEFCONFIG ?= "cip-kernel-config/4.19.y-cip/arm/qemu_arm_defconfig"
diff --git a/kas/board/qemu-arm.yml b/kas/board/qemu-arm.yml
new file mode 100644
index 0000000..9bf9728
--- /dev/null
+++ b/kas/board/qemu-arm.yml
@@ -0,0 +1,16 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+# Copyright (c) TOSHIBA CORPORATION, 2021
+#
+# Authors:
+#  Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 10
+
+machine: qemu-arm