* [cip-dev] [isar-cip-core][PATCH 1/3] README: Add some community resources
2020-11-30 19:32 [cip-dev] [isar-cip-core][PATCH 0/3] Some updates Jan Kiszka
@ 2020-11-30 19:32 ` Jan Kiszka
2020-11-30 19:32 ` [cip-dev] [isar-cip-core][PATCH 2/3] Update Isar revision Jan Kiszka
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Jan Kiszka @ 2020-11-30 19:32 UTC (permalink / raw)
To: cip-dev
[-- Attachment #1: Type: text/plain, Size: 852 bytes --]
From: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
README.md | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 4f74af7..0d2374f 100644
--- a/README.md
+++ b/README.md
@@ -48,8 +48,23 @@ Run the generated securiy images on QEMU (x86-64bit)
## Community Resources
-TBD
+Mailing list:
+ - cip-dev@lists.cip-project.org
+
+ - Subscription:
+ - cip-dev+subscribe@lists.cip-project.org
+ - 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
--
2.26.2
[-- Attachment #2: Type: text/plain, Size: 420 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
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: 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]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 5+ messages in thread* [cip-dev] [isar-cip-core][PATCH 2/3] Update Isar revision
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 ` Jan Kiszka
2020-11-30 19:32 ` [cip-dev] [isar-cip-core][PATCH 3/3] Update to kas 2.3.3 Jan Kiszka
2020-12-01 16:35 ` [cip-dev] [isar-cip-core][PATCH 0/3] Some updates Jan Kiszka
3 siblings, 0 replies; 5+ messages in thread
From: Jan Kiszka @ 2020-11-30 19:32 UTC (permalink / raw)
To: cip-dev
[-- Attachment #1: Type: text/plain, Size: 10129 bytes --]
From: Jan Kiszka <jan.kiszka@siemens.com>
Allows to drop one patch, needs explicit setting of DISTRO_APT_SOURCES.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
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
diff --git a/conf/distro/cip-core-buster.conf b/conf/distro/cip-core-buster.conf
index c5cb39c..ef60d24 100644
--- a/conf/distro/cip-core-buster.conf
+++ b/conf/distro/cip-core-buster.conf
@@ -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.%"
diff --git a/conf/distro/cip-core-stretch.conf b/conf/distro/cip-core-stretch.conf
index 31900fa..ad185dd 100644
--- a/conf/distro/cip-core-stretch.conf
+++ b/conf/distro/cip-core-stretch.conf
@@ -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.%"
diff --git a/isar-patches/0001-u-boot-add-libubootenv.patch b/isar-patches/0001-u-boot-add-libubootenv.patch
deleted file mode 100644
index 6002cf1..0000000
--- a/isar-patches/0001-u-boot-add-libubootenv.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From dda00e6addc7c51862b8175d473a1ea42dcd5c9e Mon Sep 17 00:00:00 2001
-From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
-Date: Fri, 19 Jun 2020 17:00:36 +0200
-Subject: [PATCH v2] u-boot: add libubootenv
-
-Add the new library libubootenv and remove fw_printenv and fw_setenv
-form u-boot-tools as the are now part of the new library.
-
-libubootenv is a library that provides a hardware independent
-way to access to U-Boot environment. U-Boot has its default environment
-compiled board-dependently and this means that tools to access the environment
-are also board specific, too.
-
-libubootenv conflicts with u-boot-tools from Debian 10
-as both try to install fw_printenv and fw_sentenv. This conflict is not
-part of the control file as it breaks the installation of custom u-boot-tools
-from the u-boot-sources.
-
-This patch uses dpkg-gdb to build the package from salsa.debian.org and adds
-a fix for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=967487.
-
-Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
----
-
-Changes V2:
-- use dpkg-gbd instead dpkg
-- use salsa.debian.org as source
-- add fix for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=967487
-
- meta-isar/conf/machine/de0-nano-soc.conf | 2 +-
- .../0002-Add-support-GNUInstallDirs.patch | 48 +++++++++++++++++++
- .../libubootenv/libubootenv_0.2.bb | 30 ++++++++++++
- .../files/debian/u-boot-tools.conffiles | 1 -
- .../u-boot/files/debian/u-boot-tools.install | 2 -
- .../u-boot/files/debian/u-boot-tools.links | 1 -
- 6 files changed, 79 insertions(+), 5 deletions(-)
- create mode 100644 meta/recipes-bsp/libubootenv/files/0002-Add-support-GNUInstallDirs.patch
- create mode 100644 meta/recipes-bsp/libubootenv/libubootenv_0.2.bb
- delete mode 100644 meta/recipes-bsp/u-boot/files/debian/u-boot-tools.conffiles
- delete mode 100644 meta/recipes-bsp/u-boot/files/debian/u-boot-tools.links
-
-diff --git a/meta-isar/conf/machine/de0-nano-soc.conf b/meta-isar/conf/machine/de0-nano-soc.conf
-index 3a2c009..6558d90 100644
---- a/meta-isar/conf/machine/de0-nano-soc.conf
-+++ b/meta-isar/conf/machine/de0-nano-soc.conf
-@@ -15,4 +15,4 @@ WKS_FILE ?= "de0-nano-soc.wks.in"
- IMAGER_INSTALL += "u-boot-de0-nano-soc"
- IMAGER_BUILD_DEPS += "u-boot-de0-nano-soc"
-
--IMAGE_INSTALL += "u-boot-tools u-boot-script"
-+IMAGE_INSTALL += "u-boot-tools libubootenv u-boot-script"
-diff --git a/meta/recipes-bsp/libubootenv/files/0002-Add-support-GNUInstallDirs.patch b/meta/recipes-bsp/libubootenv/files/0002-Add-support-GNUInstallDirs.patch
-new file mode 100644
-index 0000000..f8c3038
---- /dev/null
-+++ b/meta/recipes-bsp/libubootenv/files/0002-Add-support-GNUInstallDirs.patch
-@@ -0,0 +1,48 @@
-+From b17d194bd8285a19382a902a0bec9e5e042df064 Mon Sep 17 00:00:00 2001
-+From: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
-+Date: Tue, 16 Apr 2019 08:52:01 +0900
-+Subject: [PATCH 2/4] Add support GNUInstallDirs
-+
-+This adds the functionality of the module "GNUInstallDirs" to make the
-+installation compatible with GNU.
-+
-+https://cmake.org/cmake/help/v3.14/module/GNUInstallDirs.html
-+
-+Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
-+---
-+ CMakeLists.txt | 2 ++
-+ src/CMakeLists.txt | 8 ++++----
-+ 2 files changed, 6 insertions(+), 4 deletions(-)
-+
-+diff --git a/CMakeLists.txt b/CMakeLists.txt
-+index 104969e..57477fc 100644
-+--- a/CMakeLists.txt
-++++ b/CMakeLists.txt
-+@@ -10,6 +10,8 @@ add_definitions(-DVERSION="${VERSION}")
-+
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-+
-++include("GNUInstallDirs")
-++
-+ #set(CMAKE_C_FLAGS_DEBUG "-g")
-+ include_directories ("${PROJECT_SOURCE_DIR}/src")
-+ add_subdirectory (src)
-+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-+index ea5979c..d97f221 100644
-+--- a/src/CMakeLists.txt
-++++ b/src/CMakeLists.txt
-+@@ -19,7 +19,7 @@ add_executable(fw_setenv fw_setenv.c)
-+ target_link_libraries(fw_printenv ubootenv z)
-+ target_link_libraries(fw_setenv ubootenv z)
-+
-+-install (TARGETS ubootenv DESTINATION lib)
-+-install (FILES libuboot.h DESTINATION include)
-+-install (TARGETS fw_printenv DESTINATION bin)
-+-install (TARGETS fw_setenv DESTINATION bin)
-++install (TARGETS ubootenv DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-++install (FILES libuboot.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-++install (TARGETS fw_printenv DESTINATION "${CMAKE_INSTALL_BINDIR}")
-++install (TARGETS fw_setenv DESTINATION "${CMAKE_INSTALL_BINDIR}")
-+--
-+2.20.1
-+
-diff --git a/meta/recipes-bsp/libubootenv/libubootenv_0.2.bb b/meta/recipes-bsp/libubootenv/libubootenv_0.2.bb
-new file mode 100644
-index 0000000..995e581
---- /dev/null
-+++ b/meta/recipes-bsp/libubootenv/libubootenv_0.2.bb
-@@ -0,0 +1,30 @@
-+# libubootenv
-+#
-+# This software is a part of ISAR.
-+# Copyright (c) Siemens AG, 2020
-+#
-+# SPDX-License-Identifier: MIT
-+
-+DESCRIPTION = "swupdate utility for software updates"
-+HOMEPAGE= "https://github.com/sbabic/swupdate"
-+LICENSE = "GPL-2.0"
-+LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
-+
-+inherit dpkg-gbp
-+
-+SRC_URI = "git://salsa.debian.org/debian/libubootenv.git;protocol=https \
-+ file://0002-Add-support-GNUInstallDirs.patch;apply=no "
-+SRCREV = "2c7cb6d941d906dcc1d2e447cc17e418485dff12"
-+
-+S = "${WORKDIR}/git"
-+
-+do_prepare_build() {
-+ cd ${S}
-+ export QUILT_PATCHES=debian/patches
-+ quilt import -f ${WORKDIR}/*.patch
-+ quilt push -a
-+}
-+
-+dpkg_runbuild_prepend() {
-+ export DEB_BUILD_OPTIONS="nocheck"
-+}
-diff --git a/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.conffiles b/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.conffiles
-deleted file mode 100644
-index d49a8fb..0000000
---- a/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.conffiles
-+++ /dev/null
-@@ -1 +0,0 @@
--/etc/fw_env.config
-diff --git a/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.install b/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.install
-index d1ae3e0..2893b9a 100644
---- a/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.install
-+++ b/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.install
-@@ -1,5 +1,3 @@
- tools/dumpimage /usr/bin/
--tools/env/fw_printenv /usr/bin/
- tools/mkenvimage /usr/bin/
- tools/mkimage /usr/bin/
--tools/env/fw_env.config /etc
-diff --git a/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.links b/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.links
-deleted file mode 100644
-index 92f5a6c..0000000
---- a/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.links
-+++ /dev/null
-@@ -1 +0,0 @@
--/usr/bin/fw_printenv /usr/bin/fw_setenv
---
-2.20.1
-
diff --git a/kas-cip.yml b/kas-cip.yml
index 66a58f1..922ee7e 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -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
diff --git a/scripts/lib/wic/plugins/source/efibootguard-boot.py b/scripts/lib/wic/plugins/source/efibootguard-boot.py
index d291f75..b85cfca 100644
--- a/scripts/lib/wic/plugins/source/efibootguard-boot.py
+++ b/scripts/lib/wic/plugins/source/efibootguard-boot.py
@@ -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):
"""
diff --git a/scripts/lib/wic/plugins/source/efibootguard-efi.py b/scripts/lib/wic/plugins/source/efibootguard-efi.py
index 6647212..9eb2353 100644
--- a/scripts/lib/wic/plugins/source/efibootguard-efi.py
+++ b/scripts/lib/wic/plugins/source/efibootguard-efi.py
@@ -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):
"""
--
2.26.2
[-- Attachment #2: Type: text/plain, Size: 420 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
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: 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]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 5+ messages in thread* [cip-dev] [isar-cip-core][PATCH 3/3] Update to kas 2.3.3
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
2020-12-01 16:35 ` [cip-dev] [isar-cip-core][PATCH 0/3] Some updates Jan Kiszka
3 siblings, 0 replies; 5+ messages in thread
From: Jan Kiszka @ 2020-11-30 19:32 UTC (permalink / raw)
To: cip-dev
[-- 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]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [cip-dev] [isar-cip-core][PATCH 0/3] Some updates
2020-11-30 19:32 [cip-dev] [isar-cip-core][PATCH 0/3] Some updates Jan Kiszka
` (2 preceding siblings ...)
2020-11-30 19:32 ` [cip-dev] [isar-cip-core][PATCH 3/3] Update to kas 2.3.3 Jan Kiszka
@ 2020-12-01 16:35 ` Jan Kiszka
3 siblings, 0 replies; 5+ messages in thread
From: Jan Kiszka @ 2020-12-01 16:35 UTC (permalink / raw)
To: cip-dev
[-- Attachment #1: Type: text/plain, Size: 2153 bytes --]
On 30.11.20 20:32, Jan Kiszka wrote:
> 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
> 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
>
>
>
>
>
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
[-- Attachment #2: Type: text/plain, Size: 420 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
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: 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]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 5+ messages in thread