diff mbox series

[isar-cip-core,v5] Update ISAR to latest version

Message ID 2f21e81b-a87c-4d15-af8a-d50c201461c7@siemens.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core,v5] Update ISAR to latest version | expand

Commit Message

Jan Kiszka May 14, 2024, 1:26 p.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

This update requires to resolve duplicate "Provides:" statements in
secrets/certificates recipes (based on original patch by Rakesh Kumar).

We furthermore need to drop the now obsolete SOURCE_DATE_EPOCH variable
injection in squashfs.bbclass and define SOURCE_DATE_EPOCH_FALLBACK,
rather than SOURCE_DATE_EPOCH directly as this is now handled by isar
itself.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Changes in v5:
 - added new linux-cip targets to PREFERRED_VERSION definitions
   (reported by Quirin)

Note that upstream isar still has a few open issues with the new kbuild 
model. We are trying to sort them out, and I will likely have to wait 
with the v1.4 release on them.

 classes/squashfs.bbclass                                    | 6 ------
 conf/distro/cip-core-bookworm.conf                          | 6 +++++-
 conf/distro/cip-core-bullseye.conf                          | 6 +++++-
 conf/distro/cip-core-buster.conf                            | 6 +++++-
 conf/distro/cip-core-sid.conf                               | 4 ++++
 kas-cip.yml                                                 | 4 ++--
 kas/opt/4.19.yml                                            | 6 +++++-
 kas/opt/4.4.yml                                             | 5 +++++
 kas/opt/5.10.yml                                            | 6 +++++-
 kas/opt/6.1.yml                                             | 6 +++++-
 .../secure-boot-secrets/secure-boot-secrets.inc             | 4 +---
 .../swupdate-certificates/swupdate-certificates-key.inc     | 4 +---
 .../swupdate-certificates/swupdate-certificates.inc         | 4 +---
 13 files changed, 44 insertions(+), 23 deletions(-)
diff mbox series

Patch

diff --git a/classes/squashfs.bbclass b/classes/squashfs.bbclass
index bf72133e..b39be0cd 100644
--- a/classes/squashfs.bbclass
+++ b/classes/squashfs.bbclass
@@ -31,12 +31,6 @@  SQUASHFS_MEMLIMIT ?= "${@int(get_free_mem() * 3/4)}"
 SQUASHFS_CREATION_LIMITS = "-mem ${SQUASHFS_MEMLIMIT} -processors ${SQUASHFS_THREADS}"
 
 python __anonymous() {
-    # Set file timestamps for reproducible builds
-    source_date_epoch = d.getVar('SOURCE_DATE_EPOCH')
-    if source_date_epoch:
-        args = " -fstime {time}".format(time=source_date_epoch)
-        d.appendVar('SQUASHFS_CREATION_ARGS', args)
-
     exclude_directories = d.getVar('SQUASHFS_EXCLUDE_DIRS').split()
     if len(exclude_directories) == 0:
         return
diff --git a/conf/distro/cip-core-bookworm.conf b/conf/distro/cip-core-bookworm.conf
index a827c254..16fce25e 100644
--- a/conf/distro/cip-core-bookworm.conf
+++ b/conf/distro/cip-core-bookworm.conf
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2023
+# Copyright (c) Siemens AG, 2023-2024
 #
 # Authors:
 #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -14,4 +14,8 @@  require cip-core-common.inc
 
 PREFERRED_VERSION_swupdate ?= "2023.12%"
 PREFERRED_VERSION_linux-cip ?= "6.1.%"
+PREFERRED_VERSION_linux-cip-native ?= "6.1.%"
+PREFERRED_VERSION_linux-cip-kbuildtarget ?= "6.1.%"
 PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
+PREFERRED_VERSION_linux-cip-rt-native ?= "6.1.%"
+PREFERRED_VERSION_linux-cip-rt-kbuildtarget ?= "6.1.%"
diff --git a/conf/distro/cip-core-bullseye.conf b/conf/distro/cip-core-bullseye.conf
index 110f3343..fc8981f9 100644
--- a/conf/distro/cip-core-bullseye.conf
+++ b/conf/distro/cip-core-bullseye.conf
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2021-2022
+# Copyright (c) Siemens AG, 2021-2024
 #
 # Authors:
 #  Jan Kiszka <jan.kiszka@siemens.com>
@@ -17,4 +17,8 @@  DISTRO_APT_PREFERENCES:append:swupdate = " conf/distro/preferences.swupdate-bull
 
 PREFERRED_VERSION_swupdate ?= "2023.12%"
 PREFERRED_VERSION_linux-cip ?= "5.10.%"
+PREFERRED_VERSION_linux-cip-native ?= "5.10.%"
+PREFERRED_VERSION_linux-cip-kbuildtarget ?= "5.10.%"
 PREFERRED_VERSION_linux-cip-rt ?= "5.10.%"
+PREFERRED_VERSION_linux-cip-rt-native ?= "5.10.%"
+PREFERRED_VERSION_linux-cip-rt-kbuildtarget ?= "5.10.%"
diff --git a/conf/distro/cip-core-buster.conf b/conf/distro/cip-core-buster.conf
index 4e9a4a73..e30603fd 100644
--- a/conf/distro/cip-core-buster.conf
+++ b/conf/distro/cip-core-buster.conf
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019-2024
 #
 # Authors:
 #  Jan Kiszka <jan.kiszka@siemens.com>
@@ -14,4 +14,8 @@  require cip-core-common.inc
 
 PREFERRED_VERSION_swupdate ?= "2021.11%"
 PREFERRED_VERSION_linux-cip ?= "4.19.%"
+PREFERRED_VERSION_linux-cip-native ?= "4.19.%"
+PREFERRED_VERSION_linux-cip-kbuildtarget ?= "4.19.%"
 PREFERRED_VERSION_linux-cip-rt ?= "4.19.%"
+PREFERRED_VERSION_linux-cip-rt-native ?= "4.19.%"
+PREFERRED_VERSION_linux-cip-rt-kbuildtarget ?= "4.19.%"
diff --git a/conf/distro/cip-core-sid.conf b/conf/distro/cip-core-sid.conf
index 48f26ff5..42eb311c 100644
--- a/conf/distro/cip-core-sid.conf
+++ b/conf/distro/cip-core-sid.conf
@@ -16,4 +16,8 @@  DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list"
 HOST_DISTRO_APT_SOURCES = "${DISTRO_APT_SOURCES}"
 
 PREFERRED_VERSION_linux-cip ?= "6.1.%"
+PREFERRED_VERSION_linux-cip-native ?= "6.1.%"
+PREFERRED_VERSION_linux-cip-kbuildtarget ?= "6.1.%"
 PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
+PREFERRED_VERSION_linux-cip-rt-native ?= "6.1.%"
+PREFERRED_VERSION_linux-cip-rt-kbuildtarget ?= "6.1.%"
diff --git a/kas-cip.yml b/kas-cip.yml
index 2c3c8b0b..52e53061 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -22,7 +22,7 @@  repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    commit: 9dc362cd7115074c0f60843e687ed89db5c9339a
+    commit: 3d863aad5e12c7bef382cb6fb3f1f5e18b236156
     layers:
       meta:
 
@@ -42,7 +42,7 @@  local_conf_header:
     USER_root[password] = "root"
     USER_root[flags] = "clear-text-password"
   source_epoch: |
-    SOURCE_DATE_EPOCH := "${@bb.process.run("git -C ${LAYERDIR_cip-core} log -1 --pretty=%ct | tr -d '\n'")[0]}"
+    SOURCE_DATE_EPOCH_FALLBACK := "${@bb.process.run("git -C ${LAYERDIR_cip-core} log -1 --pretty=%ct | tr -d '\n'")[0]}"
 
 env:
   DISTRO_APT_PREMIRRORS: ""
diff --git a/kas/opt/4.19.yml b/kas/opt/4.19.yml
index bad4293d..799b890e 100644
--- a/kas/opt/4.19.yml
+++ b/kas/opt/4.19.yml
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2021
+# Copyright (c) Siemens AG, 2021-2024
 #
 # Authors:
 #  Jan Kiszka <jan.kiszka@siemens.com>
@@ -15,4 +15,8 @@  header:
 local_conf_header:
   kernel-version: |
     PREFERRED_VERSION_linux-cip = "4.19.%"
+    PREFERRED_VERSION_linux-cip-native = "4.19.%"
+    PREFERRED_VERSION_linux-cip-kbuildtarget = "4.19.%"
     PREFERRED_VERSION_linux-cip-rt = "4.19.%"
+    PREFERRED_VERSION_linux-cip-rt-native = "4.19.%"
+    PREFERRED_VERSION_linux-cip-rt-kbuildtarget = "4.19.%"
diff --git a/kas/opt/4.4.yml b/kas/opt/4.4.yml
index c0c5c055..3b9239c1 100644
--- a/kas/opt/4.4.yml
+++ b/kas/opt/4.4.yml
@@ -2,6 +2,7 @@ 
 # CIP Core, generic profile
 #
 # Copyright (c) Toshiba corp., 2019
+# Copyright (c) Siemens AG, 2024
 #
 # Authors:
 #  Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
@@ -15,4 +16,8 @@  header:
 local_conf_header:
   kernel-version: |
     PREFERRED_VERSION_linux-cip = "4.4.%"
+    PREFERRED_VERSION_linux-cip-native = "4.4.%"
+    PREFERRED_VERSION_linux-cip-kbuildtarget = "4.4.%"
     PREFERRED_VERSION_linux-cip-rt = "4.4.%"
+    PREFERRED_VERSION_linux-cip-rt-native = "4.4.%"
+    PREFERRED_VERSION_linux-cip-rt-kbuildtarget = "4.4.%"
diff --git a/kas/opt/5.10.yml b/kas/opt/5.10.yml
index f3a6d86b..a9cbe25b 100644
--- a/kas/opt/5.10.yml
+++ b/kas/opt/5.10.yml
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2021
+# Copyright (c) Siemens AG, 2021-2024
 #
 # Authors:
 #  Jan Kiszka <jan.kiszka@siemens.com>
@@ -15,4 +15,8 @@  header:
 local_conf_header:
   kernel-version: |
     PREFERRED_VERSION_linux-cip = "5.10.%"
+    PREFERRED_VERSION_linux-cip-native = "5.10.%"
+    PREFERRED_VERSION_linux-cip-kbuildtarget = "5.10.%"
     PREFERRED_VERSION_linux-cip-rt = "5.10.%"
+    PREFERRED_VERSION_linux-cip-rt-native = "5.10.%"
+    PREFERRED_VERSION_linux-cip-rt-kbuildtarget = "5.10.%"
diff --git a/kas/opt/6.1.yml b/kas/opt/6.1.yml
index 7ac27359..f140c273 100644
--- a/kas/opt/6.1.yml
+++ b/kas/opt/6.1.yml
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2023
+# Copyright (c) Siemens AG, 2023-2024
 #
 # Authors:
 #  Felix Moessbauer <felix.moessbauer@siemens.com>
@@ -15,4 +15,8 @@  header:
 local_conf_header:
   kernel-version: |
     PREFERRED_VERSION_linux-cip = "6.1.%"
+    PREFERRED_VERSION_linux-cip-native = "6.1.%"
+    PREFERRED_VERSION_linux-cip-kbuildtarget = "6.1.%"
     PREFERRED_VERSION_linux-cip-rt = "6.1.%"
+    PREFERRED_VERSION_linux-cip-rt-native = "6.1.%"
+    PREFERRED_VERSION_linux-cip-rt-kbuildtarget = "6.1.%"
diff --git a/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc b/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
index 2164b121..f11e93d2 100644
--- a/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
+++ b/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
@@ -14,6 +14,7 @@  inherit dpkg-raw
 DPKG_ARCH = "all"
 DEBIAN_MULTI_ARCH = "foreign"
 PROVIDES += "secure-boot-secrets"
+DEBIAN_PROVIDES = "secure-boot-secrets"
 
 SB_KEY ??= ""
 SB_CERT ??= ""
@@ -31,6 +32,3 @@  do_install() {
     install -m 0700 ${WORKDIR}/${SB_CERT} ${TARGET}/secure-boot.pem
 }
 
-do_prepare_build:append() {
-    echo "Provides: secure-boot-secrets" >> ${S}/debian/control
-}
diff --git a/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc b/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc
index 944c2dce..93cf255e 100644
--- a/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc
+++ b/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc
@@ -15,6 +15,7 @@  FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:"
 
 DPKG_ARCH = "all"
 PROVIDES += "swupdate-certificates-key"
+DEBIAN_PROVIDES = "swupdate-certificates-key"
 
 SWU_SIGN_KEY ??= ""
 SWU_SIGN_SCRIPT ??= "sign-swu-cms"
@@ -35,6 +36,3 @@  do_install() {
     install -m 0600 ${WORKDIR}/${SWU_SIGN_KEY} ${TARGET}/swupdate-sign.key
 }
 
-do_prepare_build:append() {
-    echo "Provides: swupdate-certificates-key" >> ${S}/debian/control
-}
diff --git a/recipes-devtools/swupdate-certificates/swupdate-certificates.inc b/recipes-devtools/swupdate-certificates/swupdate-certificates.inc
index dec9a836..2532de6d 100644
--- a/recipes-devtools/swupdate-certificates/swupdate-certificates.inc
+++ b/recipes-devtools/swupdate-certificates/swupdate-certificates.inc
@@ -16,6 +16,7 @@  FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:"
 DPKG_ARCH = "all"
 DEBIAN_MULTI_ARCH = "foreign"
 PROVIDES += "swupdate-certificates"
+DEBIAN_PROVIDES = "swupdate-certificates"
 
 SWU_SIGN_CERT ??= ""
 
@@ -30,6 +31,3 @@  do_install() {
     install -m 0700 ${WORKDIR}/${SWU_SIGN_CERT} ${TARGET}/swupdate-sign.crt
 }
 
-do_prepare_build:append() {
-    echo "Provides: swupdate-certificates" >> ${S}/debian/control
-}