[isar-cip-core][PATCH 0/4] Version updates, snapshot-based RISC-V

[isar-cip-core][PATCH 0/4] Version updates, snapshot-based RISC-V

[Jan Kiszka]

See patches for details.

Jan

Jan Kiszka (4):
  linux-cip: Update to 4.19.306-cip107-rt35 and 6.1.80-cip16[-rt9]
  Switch sid-based riscv64 back to a snapshot
  Update Isar to release 0.10
  linux-cip: Update cip-kernel-config

 conf/distro/cip-core-sid.conf                                 | 3 +++
 conf/distro/cip-debian-sid-snapshot.list                      | 2 ++
 kas-cip.yml                                                   | 2 +-
 recipes-kernel/linux/cip-kernel-config.inc                    | 4 ++--
 ...99-cip105-rt34.bb => linux-cip-rt_4.19.306-cip107-rt35.bb} | 2 +-
 ...t_6.1.75-cip14-rt8.bb => linux-cip-rt_6.1.80-cip16-rt9.bb} | 2 +-
 .../{linux-cip_6.1.75-cip14.bb => linux-cip_6.1.80-cip16.bb}  | 2 +-
 7 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 conf/distro/cip-debian-sid-snapshot.list
 rename recipes-kernel/linux/{linux-cip-rt_4.19.299-cip105-rt34.bb => linux-cip-rt_4.19.306-cip107-rt35.bb} (68%)
 rename recipes-kernel/linux/{linux-cip-rt_6.1.75-cip14-rt8.bb => linux-cip-rt_6.1.80-cip16-rt9.bb} (59%)
 rename recipes-kernel/linux/{linux-cip_6.1.75-cip14.bb => linux-cip_6.1.80-cip16.bb} (59%)

-- 
2.35.3

[isar-cip-core][PATCH 1/4] linux-cip: Update to 4.19.306-cip107-rt35 and 6.1.80-cip16[-rt9]

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 ....299-cip105-rt34.bb => linux-cip-rt_4.19.306-cip107-rt35.bb} | 2 +-
 ...-rt_6.1.75-cip14-rt8.bb => linux-cip-rt_6.1.80-cip16-rt9.bb} | 2 +-
 .../{linux-cip_6.1.75-cip14.bb => linux-cip_6.1.80-cip16.bb}    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename recipes-kernel/linux/{linux-cip-rt_4.19.299-cip105-rt34.bb => linux-cip-rt_4.19.306-cip107-rt35.bb} (68%)
 rename recipes-kernel/linux/{linux-cip-rt_6.1.75-cip14-rt8.bb => linux-cip-rt_6.1.80-cip16-rt9.bb} (59%)
 rename recipes-kernel/linux/{linux-cip_6.1.75-cip14.bb => linux-cip_6.1.80-cip16.bb} (59%)

diff --git a/recipes-kernel/linux/linux-cip-rt_4.19.299-cip105-rt34.bb b/recipes-kernel/linux/linux-cip-rt_4.19.306-cip107-rt35.bb
similarity index 68%
rename from recipes-kernel/linux/linux-cip-rt_4.19.299-cip105-rt34.bb
rename to recipes-kernel/linux/linux-cip-rt_4.19.306-cip107-rt35.bb
index b5924013..cc95e0e0 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.19.299-cip105-rt34.bb
+++ b/recipes-kernel/linux/linux-cip-rt_4.19.306-cip107-rt35.bb
@@ -11,4 +11,4 @@
 
 require linux-cip-rt-common.inc
 
-SRC_URI[sha256sum] = "cbbaf945457a045fa5adafcc9206ffab26139d5ea9f21fb2f57f33923aaa24e1"
+SRC_URI[sha256sum] = "91feddff1eeb7cefe7099d3c2c5333d14287080885e82d396420226421f85711"
diff --git a/recipes-kernel/linux/linux-cip-rt_6.1.75-cip14-rt8.bb b/recipes-kernel/linux/linux-cip-rt_6.1.80-cip16-rt9.bb
similarity index 59%
rename from recipes-kernel/linux/linux-cip-rt_6.1.75-cip14-rt8.bb
rename to recipes-kernel/linux/linux-cip-rt_6.1.80-cip16-rt9.bb
index fd451452..3b690741 100644
--- a/recipes-kernel/linux/linux-cip-rt_6.1.75-cip14-rt8.bb
+++ b/recipes-kernel/linux/linux-cip-rt_6.1.80-cip16-rt9.bb
@@ -7,4 +7,4 @@
 
 require linux-cip-common.inc
 
-SRC_URI[sha256sum] = "5b03796de85dd71b0fc1c67ee0fb5071dae10f22c85ca7c502b5b21f141d16c3"
+SRC_URI[sha256sum] = "384369dbdd689831e69899c8c584feef6677382c1448a2e9195523c0594ba761"
diff --git a/recipes-kernel/linux/linux-cip_6.1.75-cip14.bb b/recipes-kernel/linux/linux-cip_6.1.80-cip16.bb
similarity index 59%
rename from recipes-kernel/linux/linux-cip_6.1.75-cip14.bb
rename to recipes-kernel/linux/linux-cip_6.1.80-cip16.bb
index 4fdc6069..10058ac2 100644
--- a/recipes-kernel/linux/linux-cip_6.1.75-cip14.bb
+++ b/recipes-kernel/linux/linux-cip_6.1.80-cip16.bb
@@ -7,4 +7,4 @@
 
 require linux-cip-common.inc
 
-SRC_URI[sha256sum] = "a820699d7342d8ad8a8f580da90e03ee4db37e9d5dac4cf8d14015ab3bae5f62"
+SRC_URI[sha256sum] = "70c9e7ea89951450885f33f8056f484e1197ec39ebe2b6d49fb9357bec4247a8"
-- 
2.35.3

[isar-cip-core][PATCH 2/4] Switch sid-based riscv64 back to a snapshot

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

It's broken once again, now even the bootstrapping. At the same time, we
found a more performant snapshot source that can make this way of
building more reliable than in the past, so switch over.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 conf/distro/cip-core-sid.conf            | 3 +++
 conf/distro/cip-debian-sid-snapshot.list | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 conf/distro/cip-debian-sid-snapshot.list

diff --git a/conf/distro/cip-core-sid.conf b/conf/distro/cip-core-sid.conf
index 028b6c00..aff45726 100644
--- a/conf/distro/cip-core-sid.conf
+++ b/conf/distro/cip-core-sid.conf
@@ -12,6 +12,9 @@
 require conf/distro/debian-sid.conf
 require cip-core-common.inc
 
+DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list"
+HOST_DISTRO_APT_SOURCES = "${DISTRO_APT_SOURCES}"
+
 PREFERRED_VERSION_swupdate ?= "2023.05%"
 PREFERRED_VERSION_linux-cip ?= "6.1.%"
 PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
diff --git a/conf/distro/cip-debian-sid-snapshot.list b/conf/distro/cip-debian-sid-snapshot.list
new file mode 100644
index 00000000..874047bf
--- /dev/null
+++ b/conf/distro/cip-debian-sid-snapshot.list
@@ -0,0 +1,2 @@
+deb	[check-valid-until=no trusted=yes] https://snapshot-cloudflare.debian.org/archive/debian/20240211T000000Z sid main
+deb-src	[check-valid-until=no trusted=yes] https://snapshot-cloudflare.debian.org/archive/debian/20240211T000000Z sid main
-- 
2.35.3

[isar-cip-core][PATCH 3/4] Update Isar to release 0.10

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kas-cip.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kas-cip.yml b/kas-cip.yml
index 0b209141..d10161fa 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -22,7 +22,7 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    commit: 07573d7a6030b8b381518387867b6406b1441f09
+    commit: 9dc362cd7115074c0f60843e687ed89db5c9339a
     layers:
       meta:
 
-- 
2.35.3

[isar-cip-core][PATCH 4/4] linux-cip: Update cip-kernel-config

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

This specifically brings the config switches needed for RISC-V in order
to use our SWUpdate integration.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 recipes-kernel/linux/cip-kernel-config.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/cip-kernel-config.inc b/recipes-kernel/linux/cip-kernel-config.inc
index 5013eb95..40c378bf 100644
--- a/recipes-kernel/linux/cip-kernel-config.inc
+++ b/recipes-kernel/linux/cip-kernel-config.inc
@@ -1,7 +1,7 @@
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2022-2023
+# Copyright (c) Siemens AG, 2022-2024
 #
 # Authors:
 #  Jan Kiszka <jan.kiszka@siemens.com>
@@ -14,4 +14,4 @@ SRC_URI:append = " ${@ \
     if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
     }"
 
-SRCREV_cip-kernel-config ?= "8133457d8e156c34eebe52d9affab9df3f7b597f"
+SRCREV_cip-kernel-config ?= "ee86aca8abbe7a41536bcb53142fbf0f57b1c9b7"
-- 
2.35.3