* [isar-cip-core][PATCH 1/4] linux-cip: Fold rt-specific include into a single file
2025-05-20 12:43 [isar-cip-core][PATCH 0/4] Add support for 6.12 CIP kernel and more Jan Kiszka
@ 2025-05-20 12:43 ` Jan Kiszka
2025-05-20 12:43 ` [isar-cip-core][PATCH 2/4] linux-cip: Bump cip-kernel-config revision Jan Kiszka
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Jan Kiszka @ 2025-05-20 12:43 UTC (permalink / raw)
To: cip-dev
From: Jan Kiszka <jan.kiszka@siemens.com>
This will simplify the addition of the 6.12 kernel where there is no
need for a separate recipe as there is no separate code base anymore.
At this chance, it turned out that we never built the 6.1-cip-rt kernel
in isar-cip-core with RT settings. That is automatically fixed now as
well.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
recipes-kernel/linux/linux-cip-common.inc | 3 ++-
recipes-kernel/linux/linux-cip-rt-common.inc | 15 ---------------
.../linux/linux-cip-rt_4.19.325-cip118-rt41.bb | 4 ++--
.../linux/linux-cip-rt_4.4.302-cip98-rt55.bb | 4 ++--
.../linux/linux-cip-rt_5.10.237-cip60-rt26.bb | 4 ++--
5 files changed, 8 insertions(+), 22 deletions(-)
delete mode 100644 recipes-kernel/linux/linux-cip-rt-common.inc
diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc
index 5d1b8ac0..f20d6a06 100644
--- a/recipes-kernel/linux/linux-cip-common.inc
+++ b/recipes-kernel/linux/linux-cip-common.inc
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2022-2023
+# Copyright (c) Siemens AG, 2022-2025
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -21,6 +21,7 @@ require recipes-kernel/linux/cip-kernel-config.inc
SRC_URI += " \
https://cdn.kernel.org/pub/linux/kernel/projects/cip/${KERNEL_MAJOR_MINOR}/linux-cip-${PV}.tar.xz \
+ ${@'file://preempt-rt.cfg' if d.getVar('KERNEL_NAME') == 'cip-rt' else ''} \
"
S = "${WORKDIR}/linux-cip-${PV}"
diff --git a/recipes-kernel/linux/linux-cip-rt-common.inc b/recipes-kernel/linux/linux-cip-rt-common.inc
deleted file mode 100644
index 8e2c2939..00000000
--- a/recipes-kernel/linux/linux-cip-rt-common.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2019
-#
-# Authors:
-# Jan Kiszka <jan.kiszka@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-require linux-cip-common.inc
-
-SRC_URI += "file://preempt-rt.cfg"
-
diff --git a/recipes-kernel/linux/linux-cip-rt_4.19.325-cip118-rt41.bb b/recipes-kernel/linux/linux-cip-rt_4.19.325-cip118-rt41.bb
index 8d5c31e2..1d791669 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.19.325-cip118-rt41.bb
+++ b/recipes-kernel/linux/linux-cip-rt_4.19.325-cip118-rt41.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019 - 2023
+# Copyright (c) Siemens AG, 2019-2025
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -9,6 +9,6 @@
# SPDX-License-Identifier: MIT
#
-require linux-cip-rt-common.inc
+require linux-cip-common.inc
SRC_URI[sha256sum] = "ac71b31b34e89e7d6daf98a202806037e44203d5d79bc74da5c57f5c24ccf946"
diff --git a/recipes-kernel/linux/linux-cip-rt_4.4.302-cip98-rt55.bb b/recipes-kernel/linux/linux-cip-rt_4.4.302-cip98-rt55.bb
index f66c06ea..e5bfca91 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.4.302-cip98-rt55.bb
+++ b/recipes-kernel/linux/linux-cip-rt_4.4.302-cip98-rt55.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019 - 2023
+# Copyright (c) Siemens AG, 2019-2025
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -9,6 +9,6 @@
# SPDX-License-Identifier: MIT
#
-require linux-cip-rt-common.inc
+require linux-cip-common.inc
SRC_URI[sha256sum] = "70e223852d3a7f711dd511524243df512dcc7799010004b4d99e0acf1f95866a"
diff --git a/recipes-kernel/linux/linux-cip-rt_5.10.237-cip60-rt26.bb b/recipes-kernel/linux/linux-cip-rt_5.10.237-cip60-rt26.bb
index 212b0937..5440ae62 100644
--- a/recipes-kernel/linux/linux-cip-rt_5.10.237-cip60-rt26.bb
+++ b/recipes-kernel/linux/linux-cip-rt_5.10.237-cip60-rt26.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2021-2023
+# Copyright (c) Siemens AG, 2021-2025
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -9,6 +9,6 @@
# SPDX-License-Identifier: MIT
#
-require linux-cip-rt-common.inc
+require linux-cip-common.inc
SRC_URI[sha256sum] = "e2d8fae539c6429e1680b9875b6b6c16792ee20a85d47b6f8c8227ef679c9886"
--
2.43.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [isar-cip-core][PATCH 2/4] linux-cip: Bump cip-kernel-config revision
2025-05-20 12:43 [isar-cip-core][PATCH 0/4] Add support for 6.12 CIP kernel and more Jan Kiszka
2025-05-20 12:43 ` [isar-cip-core][PATCH 1/4] linux-cip: Fold rt-specific include into a single file Jan Kiszka
@ 2025-05-20 12:43 ` Jan Kiszka
2025-05-20 12:43 ` [isar-cip-core][PATCH 3/4] Add support for CIP kernel 6.12 Jan Kiszka
2025-05-20 12:43 ` [isar-cip-core][PATCH 4/4] trixie: Drop pinning on snapshot version Jan Kiszka
3 siblings, 0 replies; 6+ messages in thread
From: Jan Kiszka @ 2025-05-20 12:43 UTC (permalink / raw)
To: cip-dev
From: Jan Kiszka <jan.kiszka@siemens.com>
Brings support for new 6.12-cip but also some config regenerations
(hopefully without regressions).
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
recipes-kernel/linux/cip-kernel-config.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-kernel/linux/cip-kernel-config.inc b/recipes-kernel/linux/cip-kernel-config.inc
index 3f9078d5..0e44433a 100644
--- a/recipes-kernel/linux/cip-kernel-config.inc
+++ b/recipes-kernel/linux/cip-kernel-config.inc
@@ -14,7 +14,7 @@ SRC_URI:append = " ${@ \
if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
}"
-SRCREV_cip-kernel-config ?= "fb0a224685c6ffecfc2e45ec3e4d84eb98727c4a"
+SRCREV_cip-kernel-config ?= "4bebf19735a238f9e46e653751e8d47fb22f8c07"
do_fetch[vardeps] += "SRCREV_cip-kernel-config"
--
2.43.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [isar-cip-core][PATCH 3/4] Add support for CIP kernel 6.12
2025-05-20 12:43 [isar-cip-core][PATCH 0/4] Add support for 6.12 CIP kernel and more Jan Kiszka
2025-05-20 12:43 ` [isar-cip-core][PATCH 1/4] linux-cip: Fold rt-specific include into a single file Jan Kiszka
2025-05-20 12:43 ` [isar-cip-core][PATCH 2/4] linux-cip: Bump cip-kernel-config revision Jan Kiszka
@ 2025-05-20 12:43 ` Jan Kiszka
2025-05-23 14:02 ` [isar-cip-core][PATCH v2 " Jan Kiszka
2025-05-20 12:43 ` [isar-cip-core][PATCH 4/4] trixie: Drop pinning on snapshot version Jan Kiszka
3 siblings, 1 reply; 6+ messages in thread
From: Jan Kiszka @ 2025-05-20 12:43 UTC (permalink / raw)
To: cip-dev
From: Jan Kiszka <jan.kiszka@siemens.com>
One difference with 6.12 is that there are no longer two different code
bases for vanilla and RT. Therefore, simply establish a link from the RT
recipe to the regular one so that we can continue to control the
activation of RT kernel config by setting the KERNEL_NAME to "cip-rt".
As trixie upstream is heading for 6.12, lift our default for CIP images
built for it accordingly.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
Kconfig | 4 +++
conf/distro/cip-core-trixie.conf | 6 ++--
kas/opt/6.12.yml | 18 +++++++++++
.../linux/linux-cip-rt_6.12.29-cip1.bb | 1 +
.../linux/linux-cip_6.12.29-cip1.bb | 10 +++++++
scripts/update-linux-cip.sh | 30 +++++++++++--------
6 files changed, 54 insertions(+), 15 deletions(-)
create mode 100644 kas/opt/6.12.yml
create mode 120000 recipes-kernel/linux/linux-cip-rt_6.12.29-cip1.bb
create mode 100644 recipes-kernel/linux/linux-cip_6.12.29-cip1.bb
diff --git a/Kconfig b/Kconfig
index a726d262..f809f014 100644
--- a/Kconfig
+++ b/Kconfig
@@ -100,6 +100,9 @@ config KERNEL_5_10
config KERNEL_6_1
bool "Kernel 6.1.x-cip"
+config KERNEL_6_12
+ bool "Kernel 6.12.x-cip"
+
endchoice
config KAS_INCLUDE_KERNEL
@@ -108,6 +111,7 @@ config KAS_INCLUDE_KERNEL
default "kas/opt/4.19.yml" if KERNEL_4_19
default "kas/opt/5.10.yml" if KERNEL_5_10
default "kas/opt/6.1.yml" if KERNEL_6_1
+ default "kas/opt/6.12.yml" if KERNEL_6_12
config KERNEL_RT
bool "Real-time CIP kernel"
diff --git a/conf/distro/cip-core-trixie.conf b/conf/distro/cip-core-trixie.conf
index 723a3d70..e8eff746 100644
--- a/conf/distro/cip-core-trixie.conf
+++ b/conf/distro/cip-core-trixie.conf
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2024
+# Copyright (c) Siemens AG, 2024-2025
#
# Authors:
# Cedric Hombourger <cedric.hombourger@siemens.com>
@@ -12,8 +12,8 @@
require conf/distro/debian-trixie.conf
require cip-core-common.inc
-PREFERRED_VERSION_linux-cip ?= "6.1.%"
-PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
+PREFERRED_VERSION_linux-cip ?= "6.12.%"
+PREFERRED_VERSION_linux-cip-rt ?= "6.12.%"
# cross build currently broken, use working snapshot
ISAR_USE_APT_SNAPSHOT = "1"
diff --git a/kas/opt/6.12.yml b/kas/opt/6.12.yml
new file mode 100644
index 00000000..052b59cc
--- /dev/null
+++ b/kas/opt/6.12.yml
@@ -0,0 +1,18 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2025
+#
+# Authors:
+# Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+ version: 14
+
+local_conf_header:
+ kernel-version: |
+ PREFERRED_VERSION_linux-cip = "6.12.%"
+ PREFERRED_VERSION_linux-cip-rt = "6.12.%"
diff --git a/recipes-kernel/linux/linux-cip-rt_6.12.29-cip1.bb b/recipes-kernel/linux/linux-cip-rt_6.12.29-cip1.bb
new file mode 120000
index 00000000..4986a547
--- /dev/null
+++ b/recipes-kernel/linux/linux-cip-rt_6.12.29-cip1.bb
@@ -0,0 +1 @@
+linux-cip_6.12.29-cip1.bb
\ No newline at end of file
diff --git a/recipes-kernel/linux/linux-cip_6.12.29-cip1.bb b/recipes-kernel/linux/linux-cip_6.12.29-cip1.bb
new file mode 100644
index 00000000..5b8fbdbc
--- /dev/null
+++ b/recipes-kernel/linux/linux-cip_6.12.29-cip1.bb
@@ -0,0 +1,10 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2025
+#
+# SPDX-License-Identifier: MIT
+
+require linux-cip-common.inc
+
+SRC_URI[sha256sum] = "27bf5750e3ac4ed50b3cca0eb910e330eb3b24ec3d078af3d7d626123ba7b819"
diff --git a/scripts/update-linux-cip.sh b/scripts/update-linux-cip.sh
index e4e170f4..62af344b 100755
--- a/scripts/update-linux-cip.sh
+++ b/scripts/update-linux-cip.sh
@@ -2,7 +2,7 @@
REPO_ROOT=$(git rev-parse --show-toplevel)
pushd ${REPO_ROOT}/recipes-kernel/linux >/dev/null
-for MAJOR_VERSION in 4.4 4.19 5.10 6.1; do
+for MAJOR_VERSION in 4.4 4.19 5.10 6.1 6.12; do
rm -f sha256sums.asc
wget -q https://cdn.kernel.org/pub/linux/kernel/projects/cip/${MAJOR_VERSION}/sha256sums.asc
if ! gpg2 --verify sha256sums.asc 2>/dev/null; then
@@ -14,7 +14,7 @@ for MAJOR_VERSION in 4.4 4.19 5.10 6.1; do
VERSION=${LAST_ENTRY/*linux-cip-/}
VERSION=${VERSION/.tar.xz/}
RECIPE_FILE=linux-cip_${VERSION}.bb
- if [ ! -f ${RECIPE_FILE} ]; then
+ if [ ! -f "${RECIPE_FILE}" ]; then
echo "Updating recipe to ${VERSION}"
git mv linux-cip_${MAJOR_VERSION}*.bb ${RECIPE_FILE}
SHASUM=${LAST_ENTRY/ */}
@@ -22,16 +22,22 @@ for MAJOR_VERSION in 4.4 4.19 5.10 6.1; do
git add ${RECIPE_FILE}
fi
- LAST_ENTRY=$(grep "rt[0-9]\+\.tar\.xz" sha256sums.asc | sort -t p -k 3n | tail -1)
- VERSION=${LAST_ENTRY/*linux-cip-/}
- VERSION=${VERSION/.tar.xz/}
- RECIPE_FILE=linux-cip-rt_${VERSION}.bb
- if [ ! -f ${RECIPE_FILE} ]; then
- echo "Updating recipe to ${VERSION}"
- git mv linux-cip-rt_${MAJOR_VERSION}*.bb ${RECIPE_FILE}
- SHASUM=${LAST_ENTRY/ */}
- sed -i 's/\(SRC_URI\[sha256sum\] = "\).*/\1'${SHASUM}'"'/ ${RECIPE_FILE}
- git add ${RECIPE_FILE}
+ if [ "${MAJOR_VERSION}" == "6.12" ]; then
+ git rm linux-cip-rt_${MAJOR_VERSION}*.bb
+ ln -s ${RECIPE_FILE} linux-cip-rt_${VERSION}.bb
+ git add linux-cip-rt_${VERSION}.bb
+ else
+ LAST_ENTRY=$(grep "rt[0-9]\+\.tar\.xz" sha256sums.asc | sort -t p -k 3n | tail -1)
+ VERSION=${LAST_ENTRY/*linux-cip-/}
+ VERSION=${VERSION/.tar.xz/}
+ RECIPE_FILE=linux-cip-rt_${VERSION}.bb
+ if [ ! -f "${RECIPE_FILE}" ]; then
+ echo "Updating recipe to ${VERSION}"
+ git mv linux-cip-rt_${MAJOR_VERSION}*.bb ${RECIPE_FILE}
+ SHASUM=${LAST_ENTRY/ */}
+ sed -i 's/\(SRC_URI\[sha256sum\] = "\).*/\1'${SHASUM}'"'/ ${RECIPE_FILE}
+ git add ${RECIPE_FILE}
+ fi
fi
done
--
2.43.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [isar-cip-core][PATCH v2 3/4] Add support for CIP kernel 6.12
2025-05-20 12:43 ` [isar-cip-core][PATCH 3/4] Add support for CIP kernel 6.12 Jan Kiszka
@ 2025-05-23 14:02 ` Jan Kiszka
0 siblings, 0 replies; 6+ messages in thread
From: Jan Kiszka @ 2025-05-23 14:02 UTC (permalink / raw)
To: cip-dev
From: Jan Kiszka <jan.kiszka@siemens.com>
One difference with 6.12 is that there are no longer two different code
bases for vanilla and RT. Therefore, simply establish a link from the RT
recipe to the regular one so that we can continue to control the
activation of RT kernel config by setting the KERNEL_NAME to "cip-rt".
As trixie upstream is heading for 6.12, lift our default for CIP images
built for it accordingly.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
Changes in v2:
- improve update-linux-cip.sh to only update RT link on 6.12 changes
- drop unrelated change from update-linux-cip.sh
Kconfig | 4 +++
conf/distro/cip-core-trixie.conf | 6 ++--
kas/opt/6.12.yml | 18 ++++++++++++
.../linux/linux-cip-rt_6.12.29-cip1.bb | 1 +
.../linux/linux-cip_6.12.29-cip1.bb | 10 +++++++
scripts/update-linux-cip.sh | 29 ++++++++++++-------
6 files changed, 54 insertions(+), 14 deletions(-)
create mode 100644 kas/opt/6.12.yml
create mode 120000 recipes-kernel/linux/linux-cip-rt_6.12.29-cip1.bb
create mode 100644 recipes-kernel/linux/linux-cip_6.12.29-cip1.bb
diff --git a/Kconfig b/Kconfig
index a726d262..f809f014 100644
--- a/Kconfig
+++ b/Kconfig
@@ -100,6 +100,9 @@ config KERNEL_5_10
config KERNEL_6_1
bool "Kernel 6.1.x-cip"
+config KERNEL_6_12
+ bool "Kernel 6.12.x-cip"
+
endchoice
config KAS_INCLUDE_KERNEL
@@ -108,6 +111,7 @@ config KAS_INCLUDE_KERNEL
default "kas/opt/4.19.yml" if KERNEL_4_19
default "kas/opt/5.10.yml" if KERNEL_5_10
default "kas/opt/6.1.yml" if KERNEL_6_1
+ default "kas/opt/6.12.yml" if KERNEL_6_12
config KERNEL_RT
bool "Real-time CIP kernel"
diff --git a/conf/distro/cip-core-trixie.conf b/conf/distro/cip-core-trixie.conf
index 723a3d70..e8eff746 100644
--- a/conf/distro/cip-core-trixie.conf
+++ b/conf/distro/cip-core-trixie.conf
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2024
+# Copyright (c) Siemens AG, 2024-2025
#
# Authors:
# Cedric Hombourger <cedric.hombourger@siemens.com>
@@ -12,8 +12,8 @@
require conf/distro/debian-trixie.conf
require cip-core-common.inc
-PREFERRED_VERSION_linux-cip ?= "6.1.%"
-PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
+PREFERRED_VERSION_linux-cip ?= "6.12.%"
+PREFERRED_VERSION_linux-cip-rt ?= "6.12.%"
# cross build currently broken, use working snapshot
ISAR_USE_APT_SNAPSHOT = "1"
diff --git a/kas/opt/6.12.yml b/kas/opt/6.12.yml
new file mode 100644
index 00000000..052b59cc
--- /dev/null
+++ b/kas/opt/6.12.yml
@@ -0,0 +1,18 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2025
+#
+# Authors:
+# Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+ version: 14
+
+local_conf_header:
+ kernel-version: |
+ PREFERRED_VERSION_linux-cip = "6.12.%"
+ PREFERRED_VERSION_linux-cip-rt = "6.12.%"
diff --git a/recipes-kernel/linux/linux-cip-rt_6.12.29-cip1.bb b/recipes-kernel/linux/linux-cip-rt_6.12.29-cip1.bb
new file mode 120000
index 00000000..4986a547
--- /dev/null
+++ b/recipes-kernel/linux/linux-cip-rt_6.12.29-cip1.bb
@@ -0,0 +1 @@
+linux-cip_6.12.29-cip1.bb
\ No newline at end of file
diff --git a/recipes-kernel/linux/linux-cip_6.12.29-cip1.bb b/recipes-kernel/linux/linux-cip_6.12.29-cip1.bb
new file mode 100644
index 00000000..5b8fbdbc
--- /dev/null
+++ b/recipes-kernel/linux/linux-cip_6.12.29-cip1.bb
@@ -0,0 +1,10 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2025
+#
+# SPDX-License-Identifier: MIT
+
+require linux-cip-common.inc
+
+SRC_URI[sha256sum] = "27bf5750e3ac4ed50b3cca0eb910e330eb3b24ec3d078af3d7d626123ba7b819"
diff --git a/scripts/update-linux-cip.sh b/scripts/update-linux-cip.sh
index e4e170f4..df70fe2c 100755
--- a/scripts/update-linux-cip.sh
+++ b/scripts/update-linux-cip.sh
@@ -2,7 +2,7 @@
REPO_ROOT=$(git rev-parse --show-toplevel)
pushd ${REPO_ROOT}/recipes-kernel/linux >/dev/null
-for MAJOR_VERSION in 4.4 4.19 5.10 6.1; do
+for MAJOR_VERSION in 4.4 4.19 5.10 6.1 6.12; do
rm -f sha256sums.asc
wget -q https://cdn.kernel.org/pub/linux/kernel/projects/cip/${MAJOR_VERSION}/sha256sums.asc
if ! gpg2 --verify sha256sums.asc 2>/dev/null; then
@@ -20,18 +20,25 @@ for MAJOR_VERSION in 4.4 4.19 5.10 6.1; do
SHASUM=${LAST_ENTRY/ */}
sed -i 's/\(SRC_URI\[sha256sum\] = "\).*/\1'${SHASUM}'"'/ ${RECIPE_FILE}
git add ${RECIPE_FILE}
+ if [ "${MAJOR_VERSION}" == "6.12" ]; then
+ git rm linux-cip-rt_${MAJOR_VERSION}*.bb
+ ln -s ${RECIPE_FILE} linux-cip-rt_${VERSION}.bb
+ git add linux-cip-rt_${VERSION}.bb
+ fi
fi
- LAST_ENTRY=$(grep "rt[0-9]\+\.tar\.xz" sha256sums.asc | sort -t p -k 3n | tail -1)
- VERSION=${LAST_ENTRY/*linux-cip-/}
- VERSION=${VERSION/.tar.xz/}
- RECIPE_FILE=linux-cip-rt_${VERSION}.bb
- if [ ! -f ${RECIPE_FILE} ]; then
- echo "Updating recipe to ${VERSION}"
- git mv linux-cip-rt_${MAJOR_VERSION}*.bb ${RECIPE_FILE}
- SHASUM=${LAST_ENTRY/ */}
- sed -i 's/\(SRC_URI\[sha256sum\] = "\).*/\1'${SHASUM}'"'/ ${RECIPE_FILE}
- git add ${RECIPE_FILE}
+ if [ "${MAJOR_VERSION}" != "6.12" ]; then
+ LAST_ENTRY=$(grep "rt[0-9]\+\.tar\.xz" sha256sums.asc | sort -t p -k 3n | tail -1)
+ VERSION=${LAST_ENTRY/*linux-cip-/}
+ VERSION=${VERSION/.tar.xz/}
+ RECIPE_FILE=linux-cip-rt_${VERSION}.bb
+ if [ ! -f "${RECIPE_FILE}" ]; then
+ echo "Updating recipe to ${VERSION}"
+ git mv linux-cip-rt_${MAJOR_VERSION}*.bb ${RECIPE_FILE}
+ SHASUM=${LAST_ENTRY/ */}
+ sed -i 's/\(SRC_URI\[sha256sum\] = "\).*/\1'${SHASUM}'"'/ ${RECIPE_FILE}
+ git add ${RECIPE_FILE}
+ fi
fi
done
--
2.43.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [isar-cip-core][PATCH 4/4] trixie: Drop pinning on snapshot version
2025-05-20 12:43 [isar-cip-core][PATCH 0/4] Add support for 6.12 CIP kernel and more Jan Kiszka
` (2 preceding siblings ...)
2025-05-20 12:43 ` [isar-cip-core][PATCH 3/4] Add support for CIP kernel 6.12 Jan Kiszka
@ 2025-05-20 12:43 ` Jan Kiszka
3 siblings, 0 replies; 6+ messages in thread
From: Jan Kiszka @ 2025-05-20 12:43 UTC (permalink / raw)
To: cip-dev
From: Jan Kiszka <jan.kiszka@siemens.com>
Cross-build is working again, and trixie is in freeze now. Lift the
pinning to a specific snapshot. That also means to stop building a
patched dosfstools because our issue is now fixed upstream.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
conf/distro/cip-core-common.inc | 3 ++-
conf/distro/cip-core-trixie.conf | 4 ----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/conf/distro/cip-core-common.inc b/conf/distro/cip-core-common.inc
index d06eef05..0814b082 100644
--- a/conf/distro/cip-core-common.inc
+++ b/conf/distro/cip-core-common.inc
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019-2024
+# Copyright (c) Siemens AG, 2019-2025
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -17,6 +17,7 @@ CIP_IMAGE_OPTIONS ?= ""
IMAGER_BUILD_DEPS:append = " dosfstools-native"
IMAGER_BUILD_DEPS:remove:buster = "dosfstools-native"
+IMAGER_BUILD_DEPS:remove:trixie = "dosfstools-native"
PREFERRED_VERSION_linux-cip-native ?= "${PREFERRED_VERSION_linux-cip}"
PREFERRED_VERSION_linux-cip-kbuildtarget ?= "${PREFERRED_VERSION_linux-cip}"
diff --git a/conf/distro/cip-core-trixie.conf b/conf/distro/cip-core-trixie.conf
index e8eff746..b133bbbb 100644
--- a/conf/distro/cip-core-trixie.conf
+++ b/conf/distro/cip-core-trixie.conf
@@ -14,7 +14,3 @@ require cip-core-common.inc
PREFERRED_VERSION_linux-cip ?= "6.12.%"
PREFERRED_VERSION_linux-cip-rt ?= "6.12.%"
-
-# cross build currently broken, use working snapshot
-ISAR_USE_APT_SNAPSHOT = "1"
-ISAR_APT_SNAPSHOT_DATE = "20250309T000000Z"
--
2.43.0
^ permalink raw reply related [flat|nested] 6+ messages in thread