From: "Jan Kiszka" <jan.kiszka@siemens.com>
To: cip-dev@lists.cip-project.org
Subject: [cip-dev] [isar-cip-core][PATCH 3/3] Update to kas 2.3.3
Date: Mon, 30 Nov 2020 20:32:16 +0100 [thread overview]
Message-ID: <b3717fe32f6ba1c1f6a5475d0def199a0806cdea.1606764736.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1606764736.git.jan.kiszka@siemens.com>
[-- Attachment #1: Type: text/plain, Size: 8781 bytes --]
From: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.gitignore | 3 ++-
.gitlab-ci.yml | 2 +-
README.md | 12 ++++++------
doc/README.secureboot.md | 4 ++--
doc/README_iwg20m.md | 11 +++++------
kas-cip.yml | 4 +++-
kas/board/bbb.yml | 2 +-
kas/board/hihope-rzg2m.yml | 2 +-
kas/board/iwg20m.yml | 2 +-
kas/board/qemu-amd64.yml | 2 +-
kas/board/simatic-ipc227e.yml | 2 +-
kas/opt/4.4.yml | 2 +-
kas/opt/ebg-secure-boot-base.yml | 2 +-
kas/opt/ebg-secure-boot-snakeoil.yml | 2 +-
kas/opt/ebg-swu.yml | 2 +-
kas/opt/qemu-swupdate.yml | 2 +-
kas/opt/rt.yml | 2 +-
kas/opt/security.yml | 2 +-
kas/opt/stretch.yml | 2 +-
kas/opt/targz-img.yml | 2 +-
kas/opt/test.yml | 2 +-
21 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/.gitignore b/.gitignore
index bfedb76..5142933 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
build/
isar/
-kas-docker
\ No newline at end of file
+kas-docker
+kas-container
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b0a771..77d361c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: kasproject/kas-isar:2.2
+image: ghcr.io/siemens/kas/kas-isar:2.3.3
variables:
GIT_STRATEGY: clone
diff --git a/README.md b/README.md
index 0d2374f..f038db3 100644
--- a/README.md
+++ b/README.md
@@ -10,18 +10,18 @@ from scratch.
## Building Target Images
-Install `kas-docker` from the [kas project](https://github.com/siemens/kas):
+Install `kas-container` from the [kas project](https://github.com/siemens/kas):
- wget https://raw.githubusercontent.com/siemens/kas/2.2/kas-docker
- chmod a+x kas-docker
+ wget https://raw.githubusercontent.com/siemens/kas/2.3.3/kas-container
+ chmod a+x kas-container
Furthermore, install docker and make sure you have required permissions to
start containers.
-To build, e.g., the QEMU AMD64 target inside Docker, invoke kas-docker like
+To build, e.g., the QEMU AMD64 target inside Docker, invoke kas-container like
this:
- ./kas-docker --isar build kas-cip.yml:kas/board/qemu-amd64.yml
+ ./kas-container build kas-cip.yml:kas/board/qemu-amd64.yml
This image can be run using `start-qemu.sh x86`.
@@ -39,7 +39,7 @@ card, run
## Building Security target images
Building images for QEMU x86-64bit machine
- ./kas-docker --isar build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/security.yml
+ ./kas-container build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/security.yml
Run the generated securiy images on QEMU (x86-64bit)
diff --git a/doc/README.secureboot.md b/doc/README.secureboot.md
index f365ab6..84131bb 100644
--- a/doc/README.secureboot.md
+++ b/doc/README.secureboot.md
@@ -139,13 +139,13 @@ scripts/start-efishell.sh secureboot-tools
Build the image with a signed efibootguard and unified kernel image
with the snakeoil keys by executing:
```
-kas-docker --isar build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/ebg-swu.yml:kas/opt/ebg-secure-boot-snakeoil.yml
+kas-container build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/ebg-swu.yml:kas/opt/ebg-secure-boot-snakeoil.yml
```
For user-generated keys, create a new option file. This option file could look like this:
```
header:
- version: 8
+ version: 10
includes:
- opt/ebg-swu.yml
- opt/ebg-secure-boot-initramfs.yml
diff --git a/doc/README_iwg20m.md b/doc/README_iwg20m.md
index 20e4bf6..317d240 100644
--- a/doc/README_iwg20m.md
+++ b/doc/README_iwg20m.md
@@ -5,16 +5,15 @@ Copyright: Toshiba corp.
## Build the CIP Core image
-Use [kas-docker](https://github.com/siemens/kas/blob/master/kas-docker) to build the image. Currently this board is only supported by the CIP kernel version `4.4.y`.
+Set up `kas-container` as described in the [top-level README](../README.md).
+Then build the image:
```
-$ git clone https://gitlab.com/cip-project/cip-core/isar-cip-core.git
-$ cd isar-cip-core
-$ wget https://raw.githubusercontent.com/siemens/kas/master/kas-docker
-$ chmod a+x kas-docker
-$ ./kas-docker --isar build kas-cip.yml:kas/board/iwg20m.yml
+$ ./kas-container build kas-cip.yml:kas/board/iwg20m.yml
```
+Note: Currently this board is only supported by the CIP kernel version `4.4.y`.
+
After the build is finished, insert a micro SDCard and flash the image with `bmaptool` (a better `dd`). Make sure you substitute `/dev/sdX` by the device file corresponding to your SDCard.
```
diff --git a/kas-cip.yml b/kas-cip.yml
index 922ee7e..f50cd6c 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -10,11 +10,13 @@
#
header:
- version: 8
+ version: 10
distro: cip-core-buster
target: cip-core-image
+build_system: isar
+
repos:
cip-core:
diff --git a/kas/board/bbb.yml b/kas/board/bbb.yml
index fc8dbbe..13f0a7f 100644
--- a/kas/board/bbb.yml
+++ b/kas/board/bbb.yml
@@ -10,6 +10,6 @@
#
header:
- version: 8
+ version: 10
machine: bbb
diff --git a/kas/board/hihope-rzg2m.yml b/kas/board/hihope-rzg2m.yml
index bbef122..9d11bb6 100644
--- a/kas/board/hihope-rzg2m.yml
+++ b/kas/board/hihope-rzg2m.yml
@@ -10,6 +10,6 @@
#
header:
- version: 8
+ version: 10
machine: hihope-rzg2m
diff --git a/kas/board/iwg20m.yml b/kas/board/iwg20m.yml
index 3def3af..2e74ad1 100644
--- a/kas/board/iwg20m.yml
+++ b/kas/board/iwg20m.yml
@@ -10,6 +10,6 @@
#
header:
- version: 8
+ version: 10
machine: iwg20m
diff --git a/kas/board/qemu-amd64.yml b/kas/board/qemu-amd64.yml
index 02e99ba..06e9e18 100644
--- a/kas/board/qemu-amd64.yml
+++ b/kas/board/qemu-amd64.yml
@@ -10,6 +10,6 @@
#
header:
- version: 8
+ version: 10
machine: qemu-amd64
diff --git a/kas/board/simatic-ipc227e.yml b/kas/board/simatic-ipc227e.yml
index a2c6965..70cf88e 100644
--- a/kas/board/simatic-ipc227e.yml
+++ b/kas/board/simatic-ipc227e.yml
@@ -10,6 +10,6 @@
#
header:
- version: 8
+ version: 10
machine: simatic-ipc227e
diff --git a/kas/opt/4.4.yml b/kas/opt/4.4.yml
index 87be777..65a4775 100644
--- a/kas/opt/4.4.yml
+++ b/kas/opt/4.4.yml
@@ -10,7 +10,7 @@
#
header:
- version: 8
+ version: 10
local_conf_header:
kernel-version: |
diff --git a/kas/opt/ebg-secure-boot-base.yml b/kas/opt/ebg-secure-boot-base.yml
index c1d98b1..30ca35a 100644
--- a/kas/opt/ebg-secure-boot-base.yml
+++ b/kas/opt/ebg-secure-boot-base.yml
@@ -10,7 +10,7 @@
#
header:
- version: 8
+ version: 10
local_conf_header:
initramfs: |
diff --git a/kas/opt/ebg-secure-boot-snakeoil.yml b/kas/opt/ebg-secure-boot-snakeoil.yml
index cda8177..8a72084 100644
--- a/kas/opt/ebg-secure-boot-snakeoil.yml
+++ b/kas/opt/ebg-secure-boot-snakeoil.yml
@@ -10,7 +10,7 @@
#
header:
- version: 8
+ version: 10
includes:
- ebg-secure-boot-base.yml
diff --git a/kas/opt/ebg-swu.yml b/kas/opt/ebg-swu.yml
index 304fa4d..aa3aed1 100644
--- a/kas/opt/ebg-swu.yml
+++ b/kas/opt/ebg-swu.yml
@@ -10,7 +10,7 @@
#
header:
- version: 8
+ version: 10
local_conf_header:
swupdate: |
diff --git a/kas/opt/qemu-swupdate.yml b/kas/opt/qemu-swupdate.yml
index 99b4547..3f5fedf 100644
--- a/kas/opt/qemu-swupdate.yml
+++ b/kas/opt/qemu-swupdate.yml
@@ -11,7 +11,7 @@
header:
- version: 8
+ version: 10
local_conf_header:
qemu-wic: |
diff --git a/kas/opt/rt.yml b/kas/opt/rt.yml
index b52774a..b8fe6bb 100644
--- a/kas/opt/rt.yml
+++ b/kas/opt/rt.yml
@@ -10,7 +10,7 @@
#
header:
- version: 8
+ version: 10
local_conf_header:
preempt-rt: |
diff --git a/kas/opt/security.yml b/kas/opt/security.yml
index 237cbeb..3cf88af 100644
--- a/kas/opt/security.yml
+++ b/kas/opt/security.yml
@@ -9,6 +9,6 @@
# SPDX-License-Identifier: MIT
#
header:
- version: 8
+ version: 10
target: cip-core-image-security
diff --git a/kas/opt/stretch.yml b/kas/opt/stretch.yml
index 29a497a..8e854c2 100644
--- a/kas/opt/stretch.yml
+++ b/kas/opt/stretch.yml
@@ -10,6 +10,6 @@
#
header:
- version: 8
+ version: 10
distro: cip-core-stretch
diff --git a/kas/opt/targz-img.yml b/kas/opt/targz-img.yml
index 1a73024..7e9081f 100644
--- a/kas/opt/targz-img.yml
+++ b/kas/opt/targz-img.yml
@@ -10,7 +10,7 @@
#
header:
- version: 8
+ version: 10
# lava uses nfs to deploy the image. For this we need a tarball instead of
# full image
diff --git a/kas/opt/test.yml b/kas/opt/test.yml
index 4238f0b..ee48196 100644
--- a/kas/opt/test.yml
+++ b/kas/opt/test.yml
@@ -9,7 +9,7 @@
#
header:
- version: 8
+ version: 10
local_conf_header:
testing: |
--
2.26.2
[-- Attachment #2: Type: text/plain, Size: 420 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5907): https://lists.cip-project.org/g/cip-dev/message/5907
Mute This Topic: https://lists.cip-project.org/mt/78616511/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2020-11-30 19:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 19:32 [cip-dev] [isar-cip-core][PATCH 0/3] Some updates Jan Kiszka
2020-11-30 19:32 ` [cip-dev] [isar-cip-core][PATCH 1/3] README: Add some community resources Jan Kiszka
2020-11-30 19:32 ` [cip-dev] [isar-cip-core][PATCH 2/3] Update Isar revision Jan Kiszka
2020-11-30 19:32 ` Jan Kiszka [this message]
2020-12-01 16:35 ` [cip-dev] [isar-cip-core][PATCH 0/3] Some updates Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b3717fe32f6ba1c1f6a5475d0def199a0806cdea.1606764736.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=cip-dev@lists.cip-project.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.