Some updates

PATCH In review Jan Kiszka 1 participant 5 messages Nov 30, 2020 – Dec 1, 2020

lore

Share & tools

lore

Jan Kiszka

author

2020-11-30 19:32 UTC #0 lore raw

cover Some updates

The last patch has to wait until [1] is rolled out to our CI infrastructure.

Jan

[1] https://gitlab.com/cip-project/cip-testing/gitlab-cloud-ci/-/commit/1cd85bec680587b9410c56cdfebc3a4d6ba1bd8b

Jan Kiszka (3):
README: Add some community resources
Update Isar revision
Update to kas 2.3.3

 .gitignore                                    |   3 +-
 .gitlab-ci.yml                                |   2 +-
 README.md                                     |  29 ++-
 conf/distro/cip-core-buster.conf              |   2 +
 conf/distro/cip-core-stretch.conf             |   2 +
 doc/README.secureboot.md                      |   4 +-
 doc/README_iwg20m.md                          |  11 +-
 .../0001-u-boot-add-libubootenv.patch         | 168 ------------------
 kas-cip.yml                                   |   9 +-
 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 +-
 .../wic/plugins/source/efibootguard-boot.py   |   2 +-
 .../wic/plugins/source/efibootguard-efi.py    |   2 +-
 26 files changed, 57 insertions(+), 207 deletions(-)
 delete mode 100644 isar-patches/0001-u-boot-add-libubootenv.patch

Signature · 1 line

2.26.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5906): https://lists.cip-project.org/g/cip-dev/message/5906
Mute This Topic: https://lists.cip-project.org/mt/78616510/4520388
Group Owner: [email protected]
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Jan Kiszka

author

2020-11-30 19:32 UTC #1 lore raw

PATCH 1/3 README: Add some community resources

From: Jan Kiszka <[email protected]>

Signed-off-by Jan Kiszka <[email protected]>

---
 README.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

README.md +16 -1

index 4f74af7..0d2374f 100644
@@ -48,8 +48,23 @@ Run the generated securiy images on QEMU (x86-64bit)
 
 ## Community Resources
 
-TBD
+Mailing list:
 
+ - [email protected]
+
+ - Subscription:
+   - [email protected]
+   - https://lists.cip-project.org/g/cip-dev
+
+ - Archives:
+   - https://lore.kernel.org/cip-dev/
+   - https://lists.cip-project.org/g/cip-dev
+
+Continuous integration:
+
+  - https://gitlab.com/cip-project/cip-core/isar-cip-core/-/pipelines
+
+ 
 ## License
 
 Unless otherwise stated in the respective file, files in this layer are

Signature · 1 line

2.26.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5908): https://lists.cip-project.org/g/cip-dev/message/5908
Mute This Topic: https://lists.cip-project.org/mt/78616512/4520388
Group Owner: [email protected]
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Jan Kiszka

author

2020-11-30 19:32 UTC #2 lore raw

PATCH 2/3 Update Isar revision

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Allows to drop one patch, needs explicit setting of DISTRO_APT_SOURCES.

Signed-off-by Jan Kiszka <[email protected]>

---
 conf/distro/cip-core-buster.conf              |   2 +
 conf/distro/cip-core-stretch.conf             |   2 +
 .../0001-u-boot-add-libubootenv.patch         | 168 ------------------
 kas-cip.yml                                   |   5 +-
 .../wic/plugins/source/efibootguard-boot.py   |   2 +-
 .../wic/plugins/source/efibootguard-efi.py    |   2 +-
 6 files changed, 7 insertions(+), 174 deletions(-)
 delete mode 100644 isar-patches/0001-u-boot-add-libubootenv.patch

conf/distro/cip-core-buster.conf +2 -0

index c5cb39c..ef60d24 100644
@@ -12,5 +12,7 @@
 require conf/distro/debian-buster.conf
 require cip-core-common.inc
 
+DISTRO_APT_SOURCES = "conf/distro/debian-buster.list"
+
 PREFERRED_VERSION_linux-cip ?= "4.19.%"
 PREFERRED_VERSION_linux-cip-rt ?= "4.19.%"

conf/distro/cip-core-stretch.conf +2 -0

index 31900fa..ad185dd 100644
@@ -12,5 +12,7 @@
 require conf/distro/debian-stretch.conf
 require cip-core-common.inc
 
+DISTRO_APT_SOURCES = "conf/distro/debian-stretch.list"
+
 PREFERRED_VERSION_linux-cip ?= "4.19.%"
 PREFERRED_VERSION_linux-cip-rt ?= "4.19.%"

isar-patches/0001-u-boot-add-libubootenv.patch deleted +0 ~~-168~~

168 lines not on this page · raw message

kas-cip.yml +1 -4

index 66a58f1..922ee7e 100644
@@ -20,13 +20,10 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    refspec: 351af175bc54a201c6f44307d4e998bd6c0afdb8
+    refspec: 76eac233f1b1d0d117b3f05b3dec8a6da1cdf4c7
     layers:
       meta:
     patches:
-      01-libubootenv:
-        path: isar-patches/0001-u-boot-add-libubootenv.patch
-        repo: cip-core
       02-initramfs:
         path: isar-patches/v7-0001-meta-support-Generate-a-custom-initramfs.patch
         repo: cip-core

scripts/lib/wic/plugins/source/efibootguard-boot.py +1 -1

index d291f75..b85cfca 100644
@@ -35,7 +35,7 @@ import logging
 msger = logging.getLogger('wic')
 
 from wic.pluginbase import SourcePlugin
-from wic.utils.misc import exec_cmd, get_bitbake_var, BOOTDD_EXTRA_SPACE
+from wic.misc import exec_cmd, get_bitbake_var, BOOTDD_EXTRA_SPACE
 
 class EfibootguardBootPlugin(SourcePlugin):
     """

scripts/lib/wic/plugins/source/efibootguard-efi.py +1 -1

index 6647212..9eb2353 100644
@@ -33,7 +33,7 @@ import os
 msger = logging.getLogger('wic')
 
 from wic.pluginbase import SourcePlugin
-from wic.utils.misc import exec_cmd, get_bitbake_var, BOOTDD_EXTRA_SPACE
+from wic.misc import exec_cmd, get_bitbake_var, BOOTDD_EXTRA_SPACE
 
 class EfibootguardEFIPlugin(SourcePlugin):
     """

Signature · 1 line

2.26.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5909): https://lists.cip-project.org/g/cip-dev/message/5909
Mute This Topic: https://lists.cip-project.org/mt/78616513/4520388
Group Owner: [email protected]
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Jan Kiszka

author

2020-11-30 19:32 UTC #3 lore raw

PATCH 3/3 Update to kas 2.3.3

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Signed-off-by Jan Kiszka <[email protected]>

---
 .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(-)

.gitignore +2 -1

index bfedb76..5142933 100644
@@ -1,3 +1,4 @@
 build/
 isar/
-kas-docker
\ No newline at end of file
+kas-docker
+kas-container

.gitlab-ci.yml +1 -1

index 0b0a771..77d361c 100644
@@ -1,4 +1,4 @@
-image: kasproject/kas-isar:2.2
+image: ghcr.io/siemens/kas/kas-isar:2.3.3
 
 variables:
   GIT_STRATEGY: clone

README.md +6 -6

index 0d2374f..f038db3 100644
@@ -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)

doc/README.secureboot.md +2 -2

index f365ab6..84131bb 100644
@@ -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

doc/README_iwg20m.md +5 -6

index 20e4bf6..317d240 100644
@@ -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.
 
 ```

kas-cip.yml +3 -1

index 922ee7e..f50cd6c 100644
@@ -10,11 +10,13 @@
 #
 
 header:
-  version: 8
+  version: 10
 
 distro: cip-core-buster
 target: cip-core-image
 
+build_system: isar
+
 repos:
   cip-core:

kas/board/bbb.yml +1 -1

index fc8dbbe..13f0a7f 100644
@@ -10,6 +10,6 @@
 #
 
 header:
-  version: 8
+  version: 10
 
 machine: bbb

kas/board/hihope-rzg2m.yml +1 -1

index bbef122..9d11bb6 100644
@@ -10,6 +10,6 @@
 #
 
 header:
-  version: 8
+  version: 10
 
 machine: hihope-rzg2m

kas/board/iwg20m.yml +1 -1

index 3def3af..2e74ad1 100644
@@ -10,6 +10,6 @@
 #
 
 header:
-  version: 8
+  version: 10
 
 machine: iwg20m

kas/board/qemu-amd64.yml +1 -1

index 02e99ba..06e9e18 100644
@@ -10,6 +10,6 @@
 #
 
 header:
-  version: 8
+  version: 10
 
 machine: qemu-amd64

kas/board/simatic-ipc227e.yml +1 -1

index a2c6965..70cf88e 100644
@@ -10,6 +10,6 @@
 #
 
 header:
-  version: 8
+  version: 10
 
 machine: simatic-ipc227e

kas/opt/4.4.yml +1 -1

index 87be777..65a4775 100644
@@ -10,7 +10,7 @@
 #
 
 header:
-  version: 8
+  version: 10
 
 local_conf_header:
   kernel-version: |

kas/opt/ebg-secure-boot-base.yml +1 -1

index c1d98b1..30ca35a 100644
@@ -10,7 +10,7 @@
 #
 
 header:
-  version: 8
+  version: 10
 
 local_conf_header:
   initramfs: |

kas/opt/ebg-secure-boot-snakeoil.yml +1 -1

index cda8177..8a72084 100644
@@ -10,7 +10,7 @@
 #
 
 header:
-  version: 8
+  version: 10
   includes:
    - ebg-secure-boot-base.yml

kas/opt/ebg-swu.yml +1 -1

index 304fa4d..aa3aed1 100644
@@ -10,7 +10,7 @@
 #
 
 header:
-  version: 8
+  version: 10
 
 local_conf_header:
   swupdate: |

kas/opt/qemu-swupdate.yml +1 -1

index 99b4547..3f5fedf 100644
@@ -11,7 +11,7 @@
 
 
 header:
-  version: 8
+  version: 10
 
 local_conf_header:
   qemu-wic: |

kas/opt/rt.yml +1 -1

index b52774a..b8fe6bb 100644
@@ -10,7 +10,7 @@
 #
 
 header:
-  version: 8
+  version: 10
 
 local_conf_header:
   preempt-rt: |

kas/opt/security.yml +1 -1

index 237cbeb..3cf88af 100644
@@ -9,6 +9,6 @@
 # SPDX-License-Identifier: MIT
 #
 header:
-  version: 8
+  version: 10
 
 target: cip-core-image-security

kas/opt/stretch.yml +1 -1

index 29a497a..8e854c2 100644
@@ -10,6 +10,6 @@
 #
 
 header:
-  version: 8
+  version: 10
 
 distro: cip-core-stretch

kas/opt/targz-img.yml +1 -1

index 1a73024..7e9081f 100644
@@ -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

kas/opt/test.yml +1 -1

index 4238f0b..ee48196 100644
@@ -9,7 +9,7 @@
 #
 
 header:
-  version: 8
+  version: 10
 
 local_conf_header:
   testing: |

Signature · 1 line

2.26.2

-=-=-=-=-=-=-=-=-=-=-=-
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: [email protected]
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Jan Kiszka

author

2020-12-01 16:35 UTC #4 lore raw

In reply to Jan Kiszka

Quoted 3 lines · Jan Kiszka

The last patch has to wait until [1] is rolled out to our CI infrastructure.

All in next now, Michael updated our gitlab-cloud-ci.

Jan

Quoted 42 lines

Jan

[1] https://gitlab.com/cip-project/cip-testing/gitlab-cloud-ci/-/commit/1cd85bec680587b9410c56cdfebc3a4d6ba1bd8b

Jan Kiszka (3):
README: Add some community resources
Update Isar revision
Update to kas 2.3.3

 .gitignore                                    |   3 +-
 .gitlab-ci.yml                                |   2 +-
 README.md                                     |  29 ++-
 conf/distro/cip-core-buster.conf              |   2 +
 conf/distro/cip-core-stretch.conf             |   2 +
 doc/README.secureboot.md                      |   4 +-
 doc/README_iwg20m.md                          |  11 +-
 .../0001-u-boot-add-libubootenv.patch         | 168 ------------------
 kas-cip.yml                                   |   9 +-
 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 +-
 .../wic/plugins/source/efibootguard-boot.py   |   2 +-
 .../wic/plugins/source/efibootguard-efi.py    |   2 +-
 26 files changed, 57 insertions(+), 207 deletions(-)
 delete mode 100644 isar-patches/0001-u-boot-add-libubootenv.patch

Signature · 2 lines

Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5932): https://lists.cip-project.org/g/cip-dev/message/5932
Mute This Topic: https://lists.cip-project.org/mt/78616510/4520388
Group Owner: [email protected]
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-