diff mbox series

[isar-cip-core] linux-cip: Derive PREFERRED_VERSION for native and kbuildtarget from base target

Message ID 5bf62a03-889a-46c4-a93b-0dc7ea159c98@siemens.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core] linux-cip: Derive PREFERRED_VERSION for native and kbuildtarget from base target | expand

Commit Message

Jan Kiszka May 27, 2024, 12:37 p.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

Less code, easier to maintain with kernel versions coming and going.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 conf/distro/cip-core-bookworm.conf | 4 ----
 conf/distro/cip-core-bullseye.conf | 4 ----
 conf/distro/cip-core-buster.conf   | 4 ----
 conf/distro/cip-core-common.inc    | 6 ++++++
 conf/distro/cip-core-sid.conf      | 4 ----
 kas/opt/4.19.yml                   | 4 ----
 kas/opt/4.4.yml                    | 4 ----
 kas/opt/5.10.yml                   | 4 ----
 kas/opt/6.1.yml                    | 4 ----
 9 files changed, 6 insertions(+), 32 deletions(-)
diff mbox series

Patch

diff --git a/conf/distro/cip-core-bookworm.conf b/conf/distro/cip-core-bookworm.conf
index 16fce25e..61b3faf9 100644
--- a/conf/distro/cip-core-bookworm.conf
+++ b/conf/distro/cip-core-bookworm.conf
@@ -14,8 +14,4 @@  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 fc8981f9..b5501694 100644
--- a/conf/distro/cip-core-bullseye.conf
+++ b/conf/distro/cip-core-bullseye.conf
@@ -17,8 +17,4 @@  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 e30603fd..63a2dd85 100644
--- a/conf/distro/cip-core-buster.conf
+++ b/conf/distro/cip-core-buster.conf
@@ -14,8 +14,4 @@  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-common.inc b/conf/distro/cip-core-common.inc
index dfee24a0..4bd4b840 100644
--- a/conf/distro/cip-core-common.inc
+++ b/conf/distro/cip-core-common.inc
@@ -17,3 +17,9 @@  CIP_IMAGE_OPTIONS ?= ""
 
 IMAGER_BUILD_DEPS:append = " dosfstools-native"
 IMAGER_BUILD_DEPS:remove:buster = "dosfstools-native"
+
+PREFERRED_VERSION_linux-cip-native ?= "${PREFERRED_VERSION_linux-cip}"
+PREFERRED_VERSION_linux-cip-kbuildtarget ?= "${PREFERRED_VERSION_linux-cip}"
+
+PREFERRED_VERSION_linux-cip-rt-native ?= "${PREFERRED_VERSION_linux-cip-rt}"
+PREFERRED_VERSION_linux-cip-rt-kbuildtarget ?= "${PREFERRED_VERSION_linux-cip-rt}"
diff --git a/conf/distro/cip-core-sid.conf b/conf/distro/cip-core-sid.conf
index 6d3cf088..eefcbb59 100644
--- a/conf/distro/cip-core-sid.conf
+++ b/conf/distro/cip-core-sid.conf
@@ -17,8 +17,4 @@  ISAR_APT_SNAPSHOT_TIMESTAMP ?= "1707606000"
 ISAR_USE_APT_SNAPSHOT ?= "1"
 
 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/opt/4.19.yml b/kas/opt/4.19.yml
index 799b890e..708562b3 100644
--- a/kas/opt/4.19.yml
+++ b/kas/opt/4.19.yml
@@ -15,8 +15,4 @@  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 3b9239c1..db9bbdce 100644
--- a/kas/opt/4.4.yml
+++ b/kas/opt/4.4.yml
@@ -16,8 +16,4 @@  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 a9cbe25b..d76d056f 100644
--- a/kas/opt/5.10.yml
+++ b/kas/opt/5.10.yml
@@ -15,8 +15,4 @@  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 f140c273..caca83d5 100644
--- a/kas/opt/6.1.yml
+++ b/kas/opt/6.1.yml
@@ -15,8 +15,4 @@  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.%"