[cip-dev][isar-cip-core][PATCH v2 0/3] Add SWUpdate 2022.12

[cip-dev][isar-cip-core][PATCH v2 0/3] Add SWUpdate 2022.12

[Quirin Gylstorff]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

SWUpdate changed the API for the Suricatta lua plugin with 2023.05.
To support released legacy application which use the old api add
SWUpdate 2022.12.

Changes v2:
 - Reword commit message 'add SWUpdate 2022.12'
   - add information from salsa

Quirin Gylstorff (3):
  swupdate delete unused patch
  add SWUpdate 2022.12
  build swupdate 2022.12 for qemu-amd64-secure-boot-bullseye

 .gitlab-ci.yml                                |  4 +-
 kas/opt/swupdate-2022.12.yaml                 | 22 ++++++++++
 ...-Add-option-to-enable-surricatta-lua.patch | 27 ++++++++++++
 ...ch-to-add-the-build-version-to-swup.patch} |  8 ++--
 .../swupdate/swupdate_2022.12+dsfg-4-cip.bb   | 41 +++++++++++++++++++
 5 files changed, 97 insertions(+), 5 deletions(-)
 create mode 100644 kas/opt/swupdate-2022.12.yaml
 create mode 100644 recipes-core/swupdate/files/2022.12/0001-Add-option-to-enable-surricatta-lua.patch
 rename recipes-core/swupdate/files/{0001-d-patches-Add-patch-to-add-the-build-version-to-swup.patch => 2022.12/0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch} (94%)
 create mode 100644 recipes-core/swupdate/swupdate_2022.12+dsfg-4-cip.bb

-- 
2.43.0

[cip-dev][isar-cip-core][PATCH v2 1/3] swupdate delete unused patch

[Quirin Gylstorff]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 ...tch-to-add-the-build-version-to-swup.patch | 94 -------------------
 1 file changed, 94 deletions(-)
 delete mode 100644 recipes-core/swupdate/files/0001-d-patches-Add-patch-to-add-the-build-version-to-swup.patch

diff --git a/recipes-core/swupdate/files/0001-d-patches-Add-patch-to-add-the-build-version-to-swup.patch b/recipes-core/swupdate/files/0001-d-patches-Add-patch-to-add-the-build-version-to-swup.patch
deleted file mode 100644
index efc584b..0000000
--- a/recipes-core/swupdate/files/0001-d-patches-Add-patch-to-add-the-build-version-to-swup.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 48963be5c3cd33ed9f36db52130cbd1dda3ed007 Mon Sep 17 00:00:00 2001
-From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
-Date: Fri, 16 Jun 2023 19:43:38 +0200
-Subject: [PATCH] d/patches: Add patch to add the build version to swupdate
-
-The build version is only set if build in a git repository
-this patch allows to use the version information stored in
-the Makefile.
-
-Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
----
- ...Set-version-if-git-returns-no-informa.diff | 46 +++++++++++++++++++
- debian/patches/series                         |  1 +
- debian/rules                                  |  2 +
- 3 files changed, 49 insertions(+)
- create mode 100644 debian/patches/Makefile.flags-Set-version-if-git-returns-no-informa.diff
-
-diff --git a/debian/patches/Makefile.flags-Set-version-if-git-returns-no-informa.diff b/debian/patches/Makefile.flags-Set-version-if-git-returns-no-informa.diff
-new file mode 100644
-index 00000000..480b67f5
---- /dev/null
-+++ b/debian/patches/Makefile.flags-Set-version-if-git-returns-no-informa.diff
-@@ -0,0 +1,46 @@
-+From 40b3d8036ba08da2cb0013f5fefd4736b25dca8e Mon Sep 17 00:00:00 2001
-+From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
-+Date: Sat, 17 Jun 2023 17:56:18 +0200
-+Subject: [PATCH] Makefile.flags: Set version if git returns no information
-+
-+This set the swupdate version if build in a non git environment.
-+E.g. pristine-tar build or from a release tarball.
-+
-+Also allows to set the EXTRAVERSION from the command line.
-+
-+Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
-+---
-+ Makefile       | 2 +-
-+ Makefile.flags | 3 +++
-+ 2 files changed, 4 insertions(+), 1 deletion(-)
-+
-+diff --git a/Makefile b/Makefile
-+index 9f6a33a6..56189688 100644
-+--- a/Makefile
-++++ b/Makefile
-+@@ -5,7 +5,7 @@
-+ VERSION = 2022
-+ PATCHLEVEL = 12
-+ SUBLEVEL = 0
-+-EXTRAVERSION =
-++EXTRAVERSION ?=
-+ NAME =
-+ 
-+ IPCLIB_VERSION = 0.1
-+diff --git a/Makefile.flags b/Makefile.flags
-+index 2bec8468..f69ab5e8 100644
-+--- a/Makefile.flags
-++++ b/Makefile.flags
-+@@ -7,6 +7,9 @@
-+ # ==========================================================================
-+ SWU_DIR = $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-+ SWU_VER = $(shell git -C $(SWU_DIR) describe --tags --always --dirty)
-++ifeq (,$(SWU_VER))
-++	SWU_VER = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
-++endif
-+ export SWU_VER
-+ SKIP_STRIP ?= n
-+ 
-+-- 
-+2.39.2
-+
-diff --git a/debian/patches/series b/debian/patches/series
-index 5638bbf5..12324569 100644
---- a/debian/patches/series
-+++ b/debian/patches/series
-@@ -1,3 +1,4 @@
- Link-config-to-swupdate-www-path.diff
- Replace-Font-Awesome-5-with-Fork-Awesome.diff
- use-gcc-compiler.diff
-+Makefile.flags-Set-version-if-git-returns-no-informa.diff
-diff --git a/debian/rules b/debian/rules
-index 57da4ca7..f645cc6e 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -17,6 +17,8 @@ export DH_WITH=--with lua
- export HAVE_LUA=y
- endif
- 
-+DEB_CHANGELOG_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p' | cut -d + -f 2)
-+export EXTRAVERSION=($(DEB_CHANGELOG_VERSION))
- BU_SWU=
- ifeq (linux,$(DEB_HOST_ARCH_OS))
- 	BU_SWU += -VBuilt-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W libmtd-dev libubi-dev)"
--- 
-2.39.2
-
-- 
2.43.0

[cip-dev][isar-cip-core][PATCH v2 2/3] add SWUpdate 2022.12

[Quirin Gylstorff]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

SWUpdate changed the Suricatta lua API in release 2023.05.
To support released legacy applications add SWUpdate 2022.12
which supports the old api.

We use the latest release from salsa[1].

[1]: https://salsa.debian.org/debian/swupdate/-/tree/debian/2022.12+dfsg-4?ref_type=tags

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 kas/opt/swupdate-2022.12.yaml                 | 22 +++++
 ...-Add-option-to-enable-surricatta-lua.patch | 27 ++++++
 ...tch-to-add-the-build-version-to-swup.patch | 94 +++++++++++++++++++
 .../swupdate/swupdate_2022.12+dsfg-4-cip.bb   | 41 ++++++++
 4 files changed, 184 insertions(+)
 create mode 100644 kas/opt/swupdate-2022.12.yaml
 create mode 100644 recipes-core/swupdate/files/2022.12/0001-Add-option-to-enable-surricatta-lua.patch
 create mode 100644 recipes-core/swupdate/files/2022.12/0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch
 create mode 100644 recipes-core/swupdate/swupdate_2022.12+dsfg-4-cip.bb

diff --git a/kas/opt/swupdate-2022.12.yaml b/kas/opt/swupdate-2022.12.yaml
new file mode 100644
index 0000000..5dfe97a
--- /dev/null
+++ b/kas/opt/swupdate-2022.12.yaml
@@ -0,0 +1,22 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2020
+#
+# Authors:
+#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+# This kas file adds swupdate and generates a ${IMAGE_NAME}.swu
+# from the first wic partition
+
+header:
+  version: 14
+  includes:
+   - kas/opt/swupdate.yml
+
+local_conf_header:
+  swupdate-2022.12: |
+    PREFERRED_VERSION_swupdate = "2022.12%"
+    IMAGE_PREINSTALL += "cowsay"
diff --git a/recipes-core/swupdate/files/2022.12/0001-Add-option-to-enable-surricatta-lua.patch b/recipes-core/swupdate/files/2022.12/0001-Add-option-to-enable-surricatta-lua.patch
new file mode 100644
index 0000000..dafbf6d
--- /dev/null
+++ b/recipes-core/swupdate/files/2022.12/0001-Add-option-to-enable-surricatta-lua.patch
@@ -0,0 +1,27 @@
+From 451a80e1a98d7f6abd287215e7cac3929eebe025 Mon Sep 17 00:00:00 2001
+From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
+Date: Thu, 15 Feb 2024 11:06:52 +0100
+Subject: [PATCH 1/2] Add option to enable surricatta-lua
+
+Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
+---
+ debian/rules | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/debian/rules b/debian/rules
+index 57da4ca7..a78d9ca8 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -56,6 +56,9 @@ endif
+ ifneq (,$(filter pkg.swupdate.p11,$(DEB_BUILD_PROFILES)))
+ 	echo CONFIG_PKCS11=y >> configs/debian_defconfig
+ endif
++ifneq (,$(filter pkg.swupdate.suricattalua,$(DEB_BUILD_PROFILES)))
++	echo CONFIG_SURICATTA_LUA=y              >> configs/debian_defconfig
++endif
+ ifneq (,$(LUA_VERSION))
+ 	echo CONFIG_LUAPKG=\"lua$(LUA_VERSION)\" >> configs/debian_defconfig
+ 	echo CONFIG_LUASCRIPTHANDLER=y           >> configs/debian_defconfig
+-- 
+2.43.0
+
diff --git a/recipes-core/swupdate/files/2022.12/0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch b/recipes-core/swupdate/files/2022.12/0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch
new file mode 100644
index 0000000..4ff7419
--- /dev/null
+++ b/recipes-core/swupdate/files/2022.12/0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch
@@ -0,0 +1,94 @@
+From 356ed7987a489f0259c0878117a4cac8e22ba8d5 Mon Sep 17 00:00:00 2001
+From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
+Date: Fri, 16 Jun 2023 19:43:38 +0200
+Subject: [PATCH 2/2] d/patches: Add patch to add the build version to swupdate
+
+The build version is only set if build in a git repository
+this patch allows to use the version information stored in
+the Makefile.
+
+Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
+---
+ ...Set-version-if-git-returns-no-informa.diff | 46 +++++++++++++++++++
+ debian/patches/series                         |  1 +
+ debian/rules                                  |  2 +
+ 3 files changed, 49 insertions(+)
+ create mode 100644 debian/patches/Makefile.flags-Set-version-if-git-returns-no-informa.diff
+
+diff --git a/debian/patches/Makefile.flags-Set-version-if-git-returns-no-informa.diff b/debian/patches/Makefile.flags-Set-version-if-git-returns-no-informa.diff
+new file mode 100644
+index 00000000..480b67f5
+--- /dev/null
++++ b/debian/patches/Makefile.flags-Set-version-if-git-returns-no-informa.diff
+@@ -0,0 +1,46 @@
++From 40b3d8036ba08da2cb0013f5fefd4736b25dca8e Mon Sep 17 00:00:00 2001
++From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
++Date: Sat, 17 Jun 2023 17:56:18 +0200
++Subject: [PATCH] Makefile.flags: Set version if git returns no information
++
++This set the swupdate version if build in a non git environment.
++E.g. pristine-tar build or from a release tarball.
++
++Also allows to set the EXTRAVERSION from the command line.
++
++Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
++---
++ Makefile       | 2 +-
++ Makefile.flags | 3 +++
++ 2 files changed, 4 insertions(+), 1 deletion(-)
++
++diff --git a/Makefile b/Makefile
++index 9f6a33a6..56189688 100644
++--- a/Makefile
+++++ b/Makefile
++@@ -5,7 +5,7 @@
++ VERSION = 2022
++ PATCHLEVEL = 12
++ SUBLEVEL = 0
++-EXTRAVERSION =
+++EXTRAVERSION ?=
++ NAME =
++ 
++ IPCLIB_VERSION = 0.1
++diff --git a/Makefile.flags b/Makefile.flags
++index 2bec8468..f69ab5e8 100644
++--- a/Makefile.flags
+++++ b/Makefile.flags
++@@ -7,6 +7,9 @@
++ # ==========================================================================
++ SWU_DIR = $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
++ SWU_VER = $(shell git -C $(SWU_DIR) describe --tags --always --dirty)
+++ifeq (,$(SWU_VER))
+++	SWU_VER = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
+++endif
++ export SWU_VER
++ SKIP_STRIP ?= n
++ 
++-- 
++2.39.2
++
+diff --git a/debian/patches/series b/debian/patches/series
+index 5638bbf5..12324569 100644
+--- a/debian/patches/series
++++ b/debian/patches/series
+@@ -1,3 +1,4 @@
+ Link-config-to-swupdate-www-path.diff
+ Replace-Font-Awesome-5-with-Fork-Awesome.diff
+ use-gcc-compiler.diff
++Makefile.flags-Set-version-if-git-returns-no-informa.diff
+diff --git a/debian/rules b/debian/rules
+index a78d9ca8..1bc70f84 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -17,6 +17,8 @@ export DH_WITH=--with lua
+ export HAVE_LUA=y
+ endif
+ 
++DEB_CHANGELOG_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p' | cut -d + -f 2)
++export EXTRAVERSION=($(DEB_CHANGELOG_VERSION))
+ BU_SWU=
+ ifeq (linux,$(DEB_HOST_ARCH_OS))
+ 	BU_SWU += -VBuilt-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W libmtd-dev libubi-dev)"
+-- 
+2.43.0
+
diff --git a/recipes-core/swupdate/swupdate_2022.12+dsfg-4-cip.bb b/recipes-core/swupdate/swupdate_2022.12+dsfg-4-cip.bb
new file mode 100644
index 0000000..fcccc2c
--- /dev/null
+++ b/recipes-core/swupdate/swupdate_2022.12+dsfg-4-cip.bb
@@ -0,0 +1,41 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2023
+#
+# Authors:
+#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+
+inherit dpkg
+
+require swupdate.inc
+
+DEPENDS += "libebgenv-dev"
+
+DEB_BUILD_PROFILES += "nodoc"
+DEB_BUILD_OPTIONS += "nodoc"
+
+FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files/2022.12:"
+
+SRC_URI += "git://salsa.debian.org/debian/swupdate.git;protocol=https;branch=debian/master;destsuffix=${P}"
+
+SRCREV = "aa9edf070567fa5b3e942c270633a8feef49dad8"
+SRC_URI += "file://0001-Add-option-to-enable-surricatta-lua.patch"
+SRC_URI += "file://0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch"
+
+ISAR_CROSS_COMPILE:bullseye = "0"
+
+DEB_BUILD_PROFILES += "pkg.swupdate.suricattalua"
+
+# use backport build profile for bullseye
+DEB_BUILD_PROFILES:append:bullseye = " pkg.swupdate.bpo"
+
+CHANGELOG_V ?= "${PV}-${SRCREV}"
+
+do_prepare_build() {
+    deb_add_changelog
+    cd ${WORKDIR}
+    tar cJf ${PN}_${PV}.orig.tar.xz --exclude=.git --exclude=debian ${P}
+}
-- 
2.43.0

[cip-dev][isar-cip-core][PATCH v2 3/3] build swupdate 2022.12 for qemu-amd64-secure-boot-bullseye

[Quirin Gylstorff]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

This ensure minimal build testing for SWUpdate 2022.12

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c3ee0f..d39ecb3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ variables:
   dtb: none
   deploy: enable
   deploy_kernelci: disable
-
+  swupdate_version: default
 stages:
   - build
   - test
@@ -63,6 +63,7 @@ default:
     - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi
     - if [ "${release}" = "sid" ]; then base_yaml="${base_yaml}:kas/opt/sid.yml"; fi
     - if [ "${encrypt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/encrypt-partitions.yml"; fi
+    - if [ "${swupdate_version}" = "2022.12" ]; then base_yaml="${base_yaml}:kas/opt/swupdate-2022.12.yaml"; fi
     - echo "Building ${base_yaml}"
     - kas build ${base_yaml}
     - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
@@ -303,6 +304,7 @@ build:qemu-amd64-secure-boot-bullseye:
     use_rt: disable
     wic_targz: disable
     deploy: disable
+    swupdate_version: "2022.12"
 
 # buster images
 build:iwg20m-buster:
-- 
2.43.0

Re: [cip-dev][isar-cip-core][PATCH v2 2/3] add SWUpdate 2022.12

[Jan Kiszka]

On 15.02.24 16:53, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> SWUpdate changed the Suricatta lua API in release 2023.05.
> To support released legacy applications add SWUpdate 2022.12
> which supports the old api.
> 
> We use the latest release from salsa[1].
> 
> [1]: https://salsa.debian.org/debian/swupdate/-/tree/debian/2022.12+dfsg-4?ref_type=tags
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  kas/opt/swupdate-2022.12.yaml                 | 22 +++++
>  ...-Add-option-to-enable-surricatta-lua.patch | 27 ++++++
>  ...tch-to-add-the-build-version-to-swup.patch | 94 +++++++++++++++++++
>  .../swupdate/swupdate_2022.12+dsfg-4-cip.bb   | 41 ++++++++
>  4 files changed, 184 insertions(+)
>  create mode 100644 kas/opt/swupdate-2022.12.yaml
>  create mode 100644 recipes-core/swupdate/files/2022.12/0001-Add-option-to-enable-surricatta-lua.patch
>  create mode 100644 recipes-core/swupdate/files/2022.12/0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch
>  create mode 100644 recipes-core/swupdate/swupdate_2022.12+dsfg-4-cip.bb
> 
> diff --git a/kas/opt/swupdate-2022.12.yaml b/kas/opt/swupdate-2022.12.yaml
> new file mode 100644
> index 0000000..5dfe97a
> --- /dev/null
> +++ b/kas/opt/swupdate-2022.12.yaml
> @@ -0,0 +1,22 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2020
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +# This kas file adds swupdate and generates a ${IMAGE_NAME}.swu
> +# from the first wic partition
> +
> +header:
> +  version: 14
> +  includes:
> +   - kas/opt/swupdate.yml
> +
> +local_conf_header:
> +  swupdate-2022.12: |
> +    PREFERRED_VERSION_swupdate = "2022.12%"
> +    IMAGE_PREINSTALL += "cowsay"

Still there - may I send this cow back to the barn while merging?

Jan

-- 
Siemens AG, Technology
Linux Expert Center

Re: [cip-dev][isar-cip-core][PATCH v2 2/3] add SWUpdate 2022.12

[Gylstorff Quirin]

On 2/15/24 21:14, Jan Kiszka wrote:
> On 15.02.24 16:53, Quirin Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> SWUpdate changed the Suricatta lua API in release 2023.05.
>> To support released legacy applications add SWUpdate 2022.12
>> which supports the old api.
>>
>> We use the latest release from salsa[1].
>>
>> [1]: https://salsa.debian.org/debian/swupdate/-/tree/debian/2022.12+dfsg-4?ref_type=tags
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>>   kas/opt/swupdate-2022.12.yaml                 | 22 +++++
>>   ...-Add-option-to-enable-surricatta-lua.patch | 27 ++++++
>>   ...tch-to-add-the-build-version-to-swup.patch | 94 +++++++++++++++++++
>>   .../swupdate/swupdate_2022.12+dsfg-4-cip.bb   | 41 ++++++++
>>   4 files changed, 184 insertions(+)
>>   create mode 100644 kas/opt/swupdate-2022.12.yaml
>>   create mode 100644 recipes-core/swupdate/files/2022.12/0001-Add-option-to-enable-surricatta-lua.patch
>>   create mode 100644 recipes-core/swupdate/files/2022.12/0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch
>>   create mode 100644 recipes-core/swupdate/swupdate_2022.12+dsfg-4-cip.bb
>>
>> diff --git a/kas/opt/swupdate-2022.12.yaml b/kas/opt/swupdate-2022.12.yaml
>> new file mode 100644
>> index 0000000..5dfe97a
>> --- /dev/null
>> +++ b/kas/opt/swupdate-2022.12.yaml
>> @@ -0,0 +1,22 @@
>> +#
>> +# CIP Core, generic profile
>> +#
>> +# Copyright (c) Siemens AG, 2020
>> +#
>> +# Authors:
>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +# This kas file adds swupdate and generates a ${IMAGE_NAME}.swu
>> +# from the first wic partition
>> +
>> +header:
>> +  version: 14
>> +  includes:
>> +   - kas/opt/swupdate.yml
>> +
>> +local_conf_header:
>> +  swupdate-2022.12: |
>> +    PREFERRED_VERSION_swupdate = "2022.12%"
>> +    IMAGE_PREINSTALL += "cowsay"
> 
> Still there - may I send this cow back to the barn while merging?

Sorry this cow was used to generate a new update :-D
v3 on the way.
Quirin
> 
> Jan
> 

Re: [cip-dev][isar-cip-core][PATCH v2 0/3] Add SWUpdate 2022.12

[Jan Kiszka]

On 15.02.24 16:53, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> SWUpdate changed the API for the Suricatta lua plugin with 2023.05.
> To support released legacy application which use the old api add
> SWUpdate 2022.12.
> 
> Changes v2:
>  - Reword commit message 'add SWUpdate 2022.12'
>    - add information from salsa
> 
> Quirin Gylstorff (3):
>   swupdate delete unused patch
>   add SWUpdate 2022.12
>   build swupdate 2022.12 for qemu-amd64-secure-boot-bullseye
> 
>  .gitlab-ci.yml                                |  4 +-
>  kas/opt/swupdate-2022.12.yaml                 | 22 ++++++++++
>  ...-Add-option-to-enable-surricatta-lua.patch | 27 ++++++++++++
>  ...ch-to-add-the-build-version-to-swup.patch} |  8 ++--
>  .../swupdate/swupdate_2022.12+dsfg-4-cip.bb   | 41 +++++++++++++++++++
>  5 files changed, 97 insertions(+), 5 deletions(-)
>  create mode 100644 kas/opt/swupdate-2022.12.yaml
>  create mode 100644 recipes-core/swupdate/files/2022.12/0001-Add-option-to-enable-surricatta-lua.patch
>  rename recipes-core/swupdate/files/{0001-d-patches-Add-patch-to-add-the-build-version-to-swup.patch => 2022.12/0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch} (94%)
>  create mode 100644 recipes-core/swupdate/swupdate_2022.12+dsfg-4-cip.bb
> 

Thanks, applied.

Jan

-- 
Siemens AG, Technology
Linux Expert Center

Re: [cip-dev][isar-cip-core][PATCH v2 0/3] Add SWUpdate 2022.12

[Jan Kiszka]

On 16.02.24 09:33, Jan Kiszka wrote:
> On 15.02.24 16:53, Quirin Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> SWUpdate changed the API for the Suricatta lua plugin with 2023.05.
>> To support released legacy application which use the old api add
>> SWUpdate 2022.12.
>>
>> Changes v2:
>>  - Reword commit message 'add SWUpdate 2022.12'
>>    - add information from salsa
>>
>> Quirin Gylstorff (3):
>>   swupdate delete unused patch
>>   add SWUpdate 2022.12
>>   build swupdate 2022.12 for qemu-amd64-secure-boot-bullseye
>>
>>  .gitlab-ci.yml                                |  4 +-
>>  kas/opt/swupdate-2022.12.yaml                 | 22 ++++++++++
>>  ...-Add-option-to-enable-surricatta-lua.patch | 27 ++++++++++++
>>  ...ch-to-add-the-build-version-to-swup.patch} |  8 ++--
>>  .../swupdate/swupdate_2022.12+dsfg-4-cip.bb   | 41 +++++++++++++++++++
>>  5 files changed, 97 insertions(+), 5 deletions(-)
>>  create mode 100644 kas/opt/swupdate-2022.12.yaml
>>  create mode 100644 recipes-core/swupdate/files/2022.12/0001-Add-option-to-enable-surricatta-lua.patch
>>  rename recipes-core/swupdate/files/{0001-d-patches-Add-patch-to-add-the-build-version-to-swup.patch => 2022.12/0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch} (94%)
>>  create mode 100644 recipes-core/swupdate/swupdate_2022.12+dsfg-4-cip.bb
>>
> 
> Thanks, applied.
> 

Err, v3, not this one :)

Jan

-- 
Siemens AG, Technology
Linux Expert Center