Skip to contentSkip to conversation

Varions Updates: bullseye, kernel, kas, isar

PATCH New Jan Kiszka 1 participant 10 messages Jul 7, 2021

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

cover Varions Updates: bullseye, kernel, kas, isar

See patches for Details.

Jan

CC Quirin Gylstorff <[email protected]>

Jan Kiszka (9):
ci: Select large runner
Update to kas 2.5
swupdate: Do not add .ini file to SRC_URI if SWUPDATE_BOOTLOADER is
not set
Update Isar revision
conf: Drop no longer needed DISTRO_APT_SOURCES settings Add bullseye image option
ci: Add bullseye targets
linux-cip: Update to latest releases
wic: Address y2038 warnings of latest Isar

 .gitlab-ci.yml                                | 39 ++++++++++++++++++-
 README.md                                     |  2 +-
 ...ore-buster.conf => cip-core-bullseye.conf} |  6 +--
 conf/distro/cip-core-buster.conf              |  2 -
 conf/distro/cip-core-stretch.conf             |  2 -
 kas-cip.yml                                   |  2 +-
 kas/opt/bullseye.yml                          | 15 +++++++
 recipes-core/swupdate/swupdate.bb             |  2 +-
 ...bb => linux-cip-rt_4.19.195-cip52-rt20.bb} |  2 +-
 ....bb => linux-cip-rt_4.4.262-cip55-rt34.bb} |  2 +-
 ...9-cip53.bb => linux-cip_4.19.195-cip52.bb} |  2 +-
 ...65-cip41.bb => linux-cip_4.4.272-cip58.bb} |  2 +-
 wic/bbb.wks                                   |  2 +-
 wic/simatic-ipc227e.wks                       |  2 +-
 wic/swupdate-partition.inc                    |  4 +-
 15 files changed, 66 insertions(+), 20 deletions(-)
 copy conf/distro/{cip-core-buster.conf => cip-core-bullseye.conf} (64%)
 create mode 100644 kas/opt/bullseye.yml
 rename recipes-kernel/linux/{linux-cip-rt_4.19.160-cip39-rt17.bb => linux-cip-rt_4.19.195-cip52-rt20.bb} (68%)
 rename recipes-kernel/linux/{linux-cip-rt_4.4.244-cip51-rt32.bb => linux-cip-rt_4.4.262-cip55-rt34.bb} (68%)
 rename recipes-kernel/linux/{linux-cip_4.4.249-cip53.bb => linux-cip_4.19.195-cip52.bb} (68%)
 rename recipes-kernel/linux/{linux-cip_4.19.165-cip41.bb => linux-cip_4.4.272-cip58.bb} (68%)
Signature · 1 line
2.26.2

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

author
#1 lore raw

PATCH 1/9 ci: Select large runner

From: Jan Kiszka <[email protected]>

Needed since we now have multiple options, and the smaller one is not even compatible with Isar.

Signed-off-by Jan Kiszka <[email protected]>
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)
.gitlab-ci.yml +2 -0
index 9d9ced0..823160f 100644
@@ -24,6 +24,8 @@ default:
 
 .build_base:
   stage: build
+  tags:
+    - large
   variables:
     base_yaml: "kas-cip.yml:kas/board/${target}.yml"
   script:
Signature · 1 line
2.26.2

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

author
#2 lore raw

PATCH 2/9 Update to kas 2.5

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Signed-off-by Jan Kiszka <[email protected]>
---
 .gitlab-ci.yml | 2 +-
 README.md      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
.gitlab-ci.yml +1 -1
index 823160f..2a9ae22 100644
@@ -1,4 +1,4 @@
-image: ghcr.io/siemens/kas/kas-isar:2.3.3
+image: ghcr.io/siemens/kas/kas-isar:2.5
 
 variables:
   GIT_STRATEGY: clone
README.md +1 -1
index f038db3..32812a2 100644
@@ -12,7 +12,7 @@ from scratch.
 
 Install `kas-container` from the [kas project](https://github.com/siemens/kas):
 
-    wget https://raw.githubusercontent.com/siemens/kas/2.3.3/kas-container
+    wget https://raw.githubusercontent.com/siemens/kas/2.5/kas-container
     chmod a+x kas-container
 
 Furthermore, install docker and make sure you have required permissions to
Signature · 1 line
2.26.2

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

author
#3 lore raw

PATCH 3/9 swupdate: Do not add .ini file to SRC_URI if SWUPDATE_BOOTLOADER is not set

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

This prevents false warning during the parsing stage when swupdate is not used, thus SWUPDATE_BOOTLOADER is not configured.

Signed-off-by Jan Kiszka <[email protected]>
---
 recipes-core/swupdate/swupdate.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-core/swupdate/swupdate.bb +1 -1
index 4984a63..8bef9ab 100644
@@ -30,7 +30,7 @@ inherit dpkg
 inherit swupdate-config
 
 SWUPDATE_ROUND_ROBIN_HANDLER_CONFIG ?= "swupdate.handler.${SWUPDATE_BOOTLOADER}.ini"
-SRC_URI += "file://${SWUPDATE_ROUND_ROBIN_HANDLER_CONFIG}"
+SRC_URI += "${@('file://' + d.getVar('SWUPDATE_ROUND_ROBIN_HANDLER_CONFIG')) if d.getVar('SWUPDATE_BOOTLOADER') else ''}"
 KFEATURES += "luahandler"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.26.2

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

author
#4 lore raw

PATCH 4/9 Update Isar revision

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Move to latest master. The only patch we have still applied, could be replaced by an upstream mechanism now, but that can come separately.

Signed-off-by Jan Kiszka <[email protected]>
---
 kas-cip.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kas-cip.yml +1 -1
index 9514083..8fb9004 100644
@@ -22,7 +22,7 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    refspec: cd1327a47a7b00df98eded582aaf5b1ebdd45628
+    refspec: 03124cca669f50b682336a0bdf4ede5a4238e144
     layers:
       meta:
     patches:
Signature · 1 line
2.26.2

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

author
#5 lore raw

PATCH 5/9 conf: Drop no longer needed DISTRO_APT_SOURCES settings

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Isar changed its debian.conf files again to make this obsolete.

Signed-off-by Jan Kiszka <[email protected]>
---
 conf/distro/cip-core-buster.conf  | 2 --
 conf/distro/cip-core-stretch.conf | 2 --
 2 files changed, 4 deletions(-)
conf/distro/cip-core-buster.conf +0 -2
index ef60d24..c5cb39c 100644
@@ -12,7 +12,5 @@
 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 +0 -2
index ad185dd..31900fa 100644
@@ -12,7 +12,5 @@
 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.%"
Signature · 1 line
2.26.2

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

author
#6 lore raw

PATCH 6/9 Add bullseye image option

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

This allows to build isar-cip-core for upcoming Debian 11. Default remains Debian 10 for now.

Signed-off-by Jan Kiszka <[email protected]>
---
 conf/distro/cip-core-bullseye.conf | 16 ++++++++++++++++
 kas/opt/bullseye.yml               | 15 +++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 conf/distro/cip-core-bullseye.conf
 create mode 100644 kas/opt/bullseye.yml
conf/distro/cip-core-bullseye.conf new file +16 -0
new file mode 100644
index 0000000..38014b4
@@ -0,0 +1,16 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2021
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+require conf/distro/debian-bullseye.conf
+require cip-core-common.inc
+
+PREFERRED_VERSION_linux-cip ?= "4.19.%"
+PREFERRED_VERSION_linux-cip-rt ?= "4.19.%"
kas/opt/bullseye.yml new file +15 -0
new file mode 100644
index 0000000..24a4c84
@@ -0,0 +1,15 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2021
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 10
+
+distro: cip-core-bullseye
Signature · 1 line
2.26.2

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

author
#7 lore raw

PATCH 7/9 ci: Add bullseye targets

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Build the physical targets for bullseye as well in order to test this early.

Signed-off-by Jan Kiszka <[email protected]>
---
 .gitlab-ci.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
.gitlab-ci.yml +35 -0
index 2a9ae22..161916f 100644
@@ -8,6 +8,7 @@ variables:
   wic_targz: enable
   targz: disable
   dtb: none
+  bullseye: disable
   deploy: enable
 
 stages:

@@ -34,6 +35,7 @@ default:
     - 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;
+    - if [ "${bullseye}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
     - kas build ${base_yaml}
     - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi
 

@@ -154,6 +156,7 @@ build:qemu-arm-test:
     wic_targz: disable
     targz: enable
 
+# secure boot images
 build:qemu-amd64-secure-boot:
   extends:
     - .build_base

@@ -186,3 +189,35 @@ build:qemu-amd64-secure-boot-swu:
     wic_targz: disable
     targz: disable
     deploy: disable
+
+# bullseye images
+build:simatic-ipc227e-bullseye:
+  extends:
+    - .build_base
+  variables:
+    target: simatic-ipc227e
+    bullseye: enable
+
+build:bbb-bullseye:
+  extends:
+    - .build_base
+  variables:
+    target: bbb
+    dtb: am335x-boneblack.dtb
+    bullseye: enable
+
+build:iwg20m-bullseye:
+  extends:
+    - .build_base
+  variables:
+    target: iwg20m
+    dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb
+    bullseye: enable
+
+build:hihope-rzg2m-bullseye:
+  extends:
+    - .build_base
+  variables:
+    target: hihope-rzg2m
+    dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb
+    bullseye: enable
Signature · 1 line
2.26.2

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

author
#8 lore raw

PATCH 8/9 linux-cip: Update to latest releases

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Signed-off-by Jan Kiszka <[email protected]>
---
 ...19.160-cip39-rt17.bb => linux-cip-rt_4.19.195-cip52-rt20.bb} | 2 +-
 ...4.4.244-cip51-rt32.bb => linux-cip-rt_4.4.262-cip55-rt34.bb} | 2 +-
 ...{linux-cip_4.19.165-cip41.bb => linux-cip_4.19.195-cip52.bb} | 2 +-
 .../{linux-cip_4.4.249-cip53.bb => linux-cip_4.4.272-cip58.bb}  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename recipes-kernel/linux/{linux-cip-rt_4.19.160-cip39-rt17.bb => linux-cip-rt_4.19.195-cip52-rt20.bb} (68%)
 rename recipes-kernel/linux/{linux-cip-rt_4.4.244-cip51-rt32.bb => linux-cip-rt_4.4.262-cip55-rt34.bb} (68%)
 rename recipes-kernel/linux/{linux-cip_4.19.165-cip41.bb => linux-cip_4.19.195-cip52.bb} (68%)
 rename recipes-kernel/linux/{linux-cip_4.4.249-cip53.bb => linux-cip_4.4.272-cip58.bb} (68%)
recipes-kernel/linux/linux-cip-rt_4.19.195-cip52-rt20.bb renamed from recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb +1 -1
similarity index 68%
rename from recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb
rename to recipes-kernel/linux/linux-cip-rt_4.19.195-cip52-rt20.bb
index 3c0aea5..4c9a735 100644
@@ -11,4 +11,4 @@
 
 require linux-cip-rt-common.inc
 
-SRC_URI[sha256sum] = "c2e0f50670c298aed94c35628caf4ddf0eefc20d2f17e0a5f024bf4d99a38460"
+SRC_URI[sha256sum] = "fee95d77599f5a0321ae818f63bf595f5e3015e674f2f428503267b8471379fb"
recipes-kernel/linux/linux-cip-rt_4.4.262-cip55-rt34.bb renamed from recipes-kernel/linux/linux-cip-rt_4.4.244-cip51-rt32.bb +1 -1
similarity index 68%
rename from recipes-kernel/linux/linux-cip-rt_4.4.244-cip51-rt32.bb
rename to recipes-kernel/linux/linux-cip-rt_4.4.262-cip55-rt34.bb
index 6679144..37f2018 100644
@@ -11,4 +11,4 @@
 
 require linux-cip-rt-common.inc
 
-SRC_URI[sha256sum] = "070dc2084d2a64c1c8d64382978ec01ed7875b012401d09f37428a9c8c52b9c3"
+SRC_URI[sha256sum] = "5f8c3fe1ec1cb82e12a6929945f29bfd7dd432a81ad9891cd7490e86d7d91d7a"
recipes-kernel/linux/linux-cip_4.19.195-cip52.bb renamed from recipes-kernel/linux/linux-cip_4.19.165-cip41.bb +1 -1
similarity index 68%
rename from recipes-kernel/linux/linux-cip_4.19.165-cip41.bb
rename to recipes-kernel/linux/linux-cip_4.19.195-cip52.bb
index f19b4c3..05dc765 100644
@@ -11,4 +11,4 @@
 
 require linux-cip-common.inc
 
-SRC_URI[sha256sum] = "c1404d0a0a1ba71656c237d6d606714d34364814dc9a3998add93fe1749cb27d"
+SRC_URI[sha256sum] = "9eb4fb2a9b0065e3c8ac2a1045da7bc6377309dd7c01292985c3e978b8d61d8f"
recipes-kernel/linux/linux-cip_4.4.272-cip58.bb renamed from recipes-kernel/linux/linux-cip_4.4.249-cip53.bb +1 -1
similarity index 68%
rename from recipes-kernel/linux/linux-cip_4.4.249-cip53.bb
rename to recipes-kernel/linux/linux-cip_4.4.272-cip58.bb
index 03b1a04..e883794 100644
@@ -11,4 +11,4 @@
 
 require linux-cip-common.inc
 
-SRC_URI[sha256sum] = "f8a6eba35572da13c81fec6c2d451db8f75b0ab4a5b6b80113523fbb035bf384"
+SRC_URI[sha256sum] = "e8300f194bd99866d5d1b467475270f2739aaf1e87536097465f636d37437ff9"
Signature · 1 line
2.26.2

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

author
#9 lore raw

PATCH 9/9 wic: Address y2038 warnings of latest Isar

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Set ext4 defaults that prevent generating y2038-affected filesystems.

Signed-off-by Jan Kiszka <[email protected]>
---
 wic/bbb.wks                | 2 +-
 wic/simatic-ipc227e.wks    | 2 +-
 wic/swupdate-partition.inc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
wic/bbb.wks +1 -1
index 12930a3..17b85f1 100644
@@ -9,6 +9,6 @@
 part --source rawcopy --sourceparams "file=/usr/lib/u-boot/am335x_boneblack/MLO" --no-table --align 128
 part --source rawcopy --sourceparams "file=/usr/lib/u-boot/am335x_boneblack/u-boot.img" --no-table --align 384
 
-part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --label platform --align 1024 --active
+part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --active
 
 bootloader --append "rootwait console=ttyO,115200"
wic/simatic-ipc227e.wks +1 -1
index 5d335a1..d0081f7 100644
@@ -8,6 +8,6 @@
 
 part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk sda --label efi --part-type EF00 --align 1024
 
-part / --source rootfs --ondisk sda --fstype ext4 --label platform --align 1024 --use-uuid
+part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid
 
 bootloader --ptable gpt --timeout 2 --append "console=ttyS0,115200"
wic/swupdate-partition.inc +2 -2
index 7bec9d7..6912542 100644
@@ -1,2 +1,2 @@
-part --source rootfs --uuid "fedcba98-7654-3210-cafe-5e0710000001" --size 1000M   --extra-space 128M --overhead-factor 1 --label systema --align 1024 --fstype=ext4
-part  --source rootfs --uuid "fedcba98-7654-3210-cafe-5e0710000002" --size 1000M   --extra-space 128M --overhead-factor 1 --label systemb --align 1024 --fstype=ext4
+part --source rootfs --uuid "fedcba98-7654-3210-cafe-5e0710000001" --size 1000M   --extra-space 128M --overhead-factor 1 --label systema --align 1024 --fstype=ext4 --mkfs-extraopts "-T default"
+part  --source rootfs --uuid "fedcba98-7654-3210-cafe-5e0710000002" --size 1000M   --extra-space 128M --overhead-factor 1 --label systemb --align 1024 --fstype=ext4 --mkfs-extraopts "-T default"
Signature · 1 line
2.26.2

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