[PATCH 1/2] Revert "Add support for 2025.12"

[Stefano Babic]

This reverts commit 2b48267fcfedf61c2a33c7830e794115263639f8.

Do not drop previous releases.

Signed-off-by: Stefano Babic <Stefan...@swupdate.org>
Reported-by: Marko Peter <Peter...@siemens.com>
---
.../0001-BUG-regression-checking-IVT.patch | 34 +++++++++++++++++++
.../swupdate/swupdate_2023.12.1.bb | 5 +++
recipes-support/swupdate/swupdate_2024.05.bb | 3 ++
recipes-support/swupdate/swupdate_2024.12.bb | 3 ++
recipes-support/swupdate/swupdate_2025.12.bb | 3 --
recipes-support/swupdate/swupdate_git.bb | 4 +--
6 files changed, 47 insertions(+), 5 deletions(-)
create mode 100644 recipes-support/swupdate/swupdate/0001-BUG-regression-checking-IVT.patch
create mode 100644 recipes-support/swupdate/swupdate_2023.12.1.bb
create mode 100644 recipes-support/swupdate/swupdate_2024.05.bb
create mode 100644 recipes-support/swupdate/swupdate_2024.12.bb
delete mode 100644 recipes-support/swupdate/swupdate_2025.12.bb

diff --git a/recipes-support/swupdate/swupdate/0001-BUG-regression-checking-IVT.patch b/recipes-support/swupdate/swupdate/0001-BUG-regression-checking-IVT.patch
new file mode 100644
index 0000000..b3e0bde
--- /dev/null
+++ b/recipes-support/swupdate/swupdate/0001-BUG-regression-checking-IVT.patch
@@ -0,0 +1,34 @@
+From fee1c3febbb45bdc691c1fde79f537cdfc74ffc5 Mon Sep 17 00:00:00 2001
+From: Stefano Babic <stefan...@swupdate.org>
+Date: Mon, 19 Feb 2024 19:05:29 +0100
+Subject: [PATCH] BUG: regression checking IVT
+
+e48a866542 creates a regression bug. A valid IVT pointer is always
+passed because it is generally a zeroed array of chars, so passing null
+length string is a valid case and not an error, and in that case the IVT
+from the file should be taken.
+
+Signed-off-by: Stefano Babic <stefan...@swupdate.org>
+Signed-off-by: Ayoub Zaki <ayoub...@embetrix.com>
+---
+ core/cpio_utils.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/core/cpio_utils.c b/core/cpio_utils.c
+index e5de2a7..7948dc2 100644
+--- a/core/cpio_utils.c
++++ b/core/cpio_utils.c
+@@ -514,8 +514,8 @@ static int __swupdate_copy(int fdin, unsigned char *inbuf, void *out, size_t nby
+
+ if (encrypted) {
+ aes_key = get_aes_key();
+- if (imgivt) {
+- if (!strlen(imgivt) || !is_hex_str(imgivt) || ascii_to_bin(ivtbuf, sizeof(ivtbuf), imgivt)) {
++ if (imgivt && strlen(imgivt)) {
++ if (!is_hex_str(imgivt) || ascii_to_bin(ivtbuf, sizeof(ivtbuf), imgivt)) {
+ ERROR("Invalid image ivt");
+ return -EINVAL;
+ }
+--
+2.34.1
+
diff --git a/recipes-support/swupdate/swupdate_2023.12.1.bb b/recipes-support/swupdate/swupdate_2023.12.1.bb
new file mode 100644
index 0000000..bc9b641
--- /dev/null
+++ b/recipes-support/swupdate/swupdate_2023.12.1.bb
@@ -0,0 +1,5 @@
+require swupdate.inc
+
+SRC_URI += "file://0001-BUG-regression-checking-IVT.patch"
+
+SRCREV = "66952eff1a30701686723ff2fab0576b389620db"
diff --git a/recipes-support/swupdate/swupdate_2024.05.bb b/recipes-support/swupdate/swupdate_2024.05.bb
new file mode 100644
index 0000000..b68bfbd
--- /dev/null
+++ b/recipes-support/swupdate/swupdate_2024.05.bb
@@ -0,0 +1,3 @@
+require swupdate.inc
+
+SRCREV = "435c7debf8cb361a77da8c0540c5cf6f910194a6"
diff --git a/recipes-support/swupdate/swupdate_2024.12.bb b/recipes-support/swupdate/swupdate_2024.12.bb
new file mode 100644
index 0000000..ea44fd2
--- /dev/null
+++ b/recipes-support/swupdate/swupdate_2024.12.bb
@@ -0,0 +1,3 @@
+SRCBRANCH = "2024.12-y"
+SRCREV = "3077da2018f2f013872fb1e1213670c075fdd7ce"
+require swupdate.inc
diff --git a/recipes-support/swupdate/swupdate_2025.12.bb b/recipes-support/swupdate/swupdate_2025.12.bb
deleted file mode 100644
index 8efeeec..0000000
--- a/recipes-support/swupdate/swupdate_2025.12.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-SRCBRANCH = "master"
-SRCREV = "3f7915fb64b4be9d7280e3167219a08348c128f2"
-require swupdate.inc
diff --git a/recipes-support/swupdate/swupdate_git.bb b/recipes-support/swupdate/swupdate_git.bb
index 736baea..bdd9b1e 100644
--- a/recipes-support/swupdate/swupdate_git.bb
+++ b/recipes-support/swupdate/swupdate_git.bb
@@ -2,5 +2,5 @@ require swupdate.inc

DEFAULT_PREFERENCE = "-1"

-SRCREV ?= "3f7915fb64b4be9d7280e3167219a08348c128f2"
-PV = "2025.12+git${SRCPV}"
+SRCREV ?= "33c5688590e811c9d54101accc6ea368ea5f0f50"
+PV = "2024.12+git${SRCPV}"
--
2.43.0