From patchwork Fri Nov 24 12:13:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gylstorff Quirin X-Patchwork-Id: 13467591 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E874FC61D97 for ; Fri, 24 Nov 2023 12:14:46 +0000 (UTC) Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net [185.136.65.226]) by mx.groups.io with SMTP id smtpd.web10.133960.1700828078211967680 for ; Fri, 24 Nov 2023 04:14:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm1 header.b=DwGdCfOn; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-51332-2023112412143441800c75e17f604842-t17enn@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 2023112412143441800c75e17f604842 for ; Fri, 24 Nov 2023 13:14:35 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=x2AzBams56uqBRMEUo5pvLO9JhKjHcufMZLmGqcBUrw=; b=DwGdCfOn/xjy5iqjATzOMBIhJ72Gpqrq7na8pgTk0h/ko5FroWqW5CKpYqR/W2QbYB2Cyw dxzqohgC1dFscSTJymIsVCE846r3Fg7JvzyCqOyhOEKtUMpc6LkBXXhofqUYoguqc0VMD0H5 9MUj6YNro1mdgQz0mm8RFNdSzk1Ak=; From: Quirin Gylstorff To: felix.moessbauer@siemens.com, jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-core][PATCH v3] swupdate: Update debian folder to 2023.05+dfsg-4 Date: Fri, 24 Nov 2023 13:13:49 +0100 Message-ID: <20231124121433.2174817-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 24 Nov 2023 12:14:46 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/13738 From: Quirin Gylstorff This adds the system user swupdate and changes the permission of the sockets to 0660 instead of world writable. Also suricatta lua is now set automatically. swupdate uses wolfssl (=< 5) instead of openssl for certificate management. wolfssl(=< 5) is only available as backport in debian bullseye. Signed-off-by: Quirin Gylstorff --- SWUpdate in cip-core uses the debian folder from salsa with swupdate commit c8ca55684c375937dbcdefb0563071a35137f4ba as decribed in a2aa61b swupdate: Update to 2023.05 with wfx support. This allows to select hawkbit or wfx as backend during runtime. Changes v3: - Cleanup of bullseye backport preference - change subject to clarify patch Changes v2: - Fix for bullseye ...eferences.swupdate-bullseye-backports.conf | 7 +++++ ...d-rules-Add-option-for-suricatta_lua.patch | 30 ------------------- ...ate-build_profile-option-for-delta-.patch} | 16 +++++----- ...ch-to-add-the-build-version-to-swup.patch} | 10 +++---- ...-Add-option-to-enable-suricatta_wfx.patch} | 14 ++++----- ...install-Fix-path-for-debian-bullseye.patch | 24 +++++++++++++++ recipes-core/swupdate/swupdate_2023.05.bb | 10 +++---- 7 files changed, 56 insertions(+), 55 deletions(-) delete mode 100644 recipes-core/swupdate/files/2023.05/0001-d-rules-Add-option-for-suricatta_lua.patch rename recipes-core/swupdate/files/2023.05/{0002-d-rules-Add-seperate-build_profile-option-for-delta-.patch => 0001-d-rules-Add-seperate-build_profile-option-for-delta-.patch} (76%) rename recipes-core/swupdate/files/2023.05/{0003-d-patches-Add-patch-to-add-the-build-version-to-swup.patch => 0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch} (93%) rename recipes-core/swupdate/files/2023.05/{0004-d-rules-Add-option-to-enable-suricatta_wfx.patch => 0003-d-rules-Add-option-to-enable-suricatta_wfx.patch} (69%) create mode 100644 recipes-core/swupdate/files/2023.05/0004-d-swupdate-www.install-Fix-path-for-debian-bullseye.patch diff --git a/conf/distro/preferences.swupdate-bullseye-backports.conf b/conf/distro/preferences.swupdate-bullseye-backports.conf index a2377bb..70d0494 100644 --- a/conf/distro/preferences.swupdate-bullseye-backports.conf +++ b/conf/distro/preferences.swupdate-bullseye-backports.conf @@ -1,3 +1,10 @@ Package: dh-nodejs Pin: release n=bullseye-backports Pin-Priority: 801 +Package: libwolfssl-dev, libwolfssl35 +Pin: release n=bullseye-backports +Pin-Priority: 801 +Package: libwolfssl-dev +Pin: release n=bullseye +Pin-Priority: -1 + diff --git a/recipes-core/swupdate/files/2023.05/0001-d-rules-Add-option-for-suricatta_lua.patch b/recipes-core/swupdate/files/2023.05/0001-d-rules-Add-option-for-suricatta_lua.patch deleted file mode 100644 index 5aeb605..0000000 --- a/recipes-core/swupdate/files/2023.05/0001-d-rules-Add-option-for-suricatta_lua.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f94f8c2f62ade7568fe8fafa106488761fc55f91 Mon Sep 17 00:00:00 2001 -From: Quirin Gylstorff -Date: Wed, 3 May 2023 16:02:37 +0200 -Subject: [PATCH 1/4] d/rules: Add option for suricatta_lua - -This allows to use lua plugins as suricatta backends. It is optional -as it overrides the default HAWKBIT backend. - -Signed-off-by: Quirin Gylstorff ---- - debian/rules | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/debian/rules b/debian/rules -index 57da4ca7..91106fbd 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.39.2 - diff --git a/recipes-core/swupdate/files/2023.05/0002-d-rules-Add-seperate-build_profile-option-for-delta-.patch b/recipes-core/swupdate/files/2023.05/0001-d-rules-Add-seperate-build_profile-option-for-delta-.patch similarity index 76% rename from recipes-core/swupdate/files/2023.05/0002-d-rules-Add-seperate-build_profile-option-for-delta-.patch rename to recipes-core/swupdate/files/2023.05/0001-d-rules-Add-seperate-build_profile-option-for-delta-.patch index 4203061..0d0fc0a 100644 --- a/recipes-core/swupdate/files/2023.05/0002-d-rules-Add-seperate-build_profile-option-for-delta-.patch +++ b/recipes-core/swupdate/files/2023.05/0001-d-rules-Add-seperate-build_profile-option-for-delta-.patch @@ -1,7 +1,7 @@ -From a5ab9aaa53acac4c4155b6c4cc8a86bc59278e53 Mon Sep 17 00:00:00 2001 +From 03d455be74d439c7e2eb849e5acdfb494afb3d7c Mon Sep 17 00:00:00 2001 From: Quirin Gylstorff Date: Thu, 15 Jun 2023 18:48:25 +0200 -Subject: [PATCH 2/4] d/rules: Add seperate build_profile option for delta +Subject: [PATCH 1/4] d/rules: Add seperate build_profile option for delta update Delta update need zchunk 1.3 to work on memory restricted @@ -15,20 +15,20 @@ Signed-off-by: Quirin Gylstorff 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control -index e47c320c..d4b17972 100644 +index a389b2a9..2f0c0053 100644 --- a/debian/control +++ b/debian/control -@@ -26,7 +26,7 @@ Build-Depends: debhelper-compat (= 13), +@@ -28,7 +28,7 @@ Build-Depends: debhelper-compat (= 13), uuid-dev, zlib1g-dev, libzstd-dev, -- libzck-dev (>= 1.2) , +- libzck-dev (>= 1.3) , + libzck-dev (>= 1.3) , libp11-kit-dev , - libwolfssl-dev , + libwolfssl-dev (>= 5), libmtd-dev [linux-any], diff --git a/debian/rules b/debian/rules -index 91106fbd..8cac6359 100755 +index 3b1cc0f6..2c91677c 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ ifeq (linux,$(DEB_HOST_ARCH_OS)) @@ -41,5 +41,5 @@ index 91106fbd..8cac6359 100755 endif ifneq (,$(findstring $(DEB_HOST_ARCH),amd64 i386 arm64 armhf riscv64 ia64)) -- -2.39.2 +2.42.0 diff --git a/recipes-core/swupdate/files/2023.05/0003-d-patches-Add-patch-to-add-the-build-version-to-swup.patch b/recipes-core/swupdate/files/2023.05/0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch similarity index 93% rename from recipes-core/swupdate/files/2023.05/0003-d-patches-Add-patch-to-add-the-build-version-to-swup.patch rename to recipes-core/swupdate/files/2023.05/0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch index 857b4ab..8056818 100644 --- a/recipes-core/swupdate/files/2023.05/0003-d-patches-Add-patch-to-add-the-build-version-to-swup.patch +++ b/recipes-core/swupdate/files/2023.05/0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch @@ -1,7 +1,7 @@ -From ed4e8b5d4ad6ffcddb755571303c077fff227ea3 Mon Sep 17 00:00:00 2001 +From ad714bc12b03c148aadb3523f87cc14d42a477b0 Mon Sep 17 00:00:00 2001 From: Quirin Gylstorff Date: Fri, 16 Jun 2023 19:43:38 +0200 -Subject: [PATCH 3/4] d/patches: Add patch to add the build version to swupdate +Subject: [PATCH 2/4] 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 @@ -77,10 +77,10 @@ index 5638bbf5..12324569 100644 use-gcc-compiler.diff +Makefile.flags-Set-version-if-git-returns-no-informa.diff diff --git a/debian/rules b/debian/rules -index 8cac6359..566a21bd 100755 +index 2c91677c..5d72987c 100755 --- a/debian/rules +++ b/debian/rules -@@ -17,6 +17,8 @@ export DH_WITH=--with lua +@@ -17,6 +17,8 @@ export DH_WITH=,lua export HAVE_LUA=y endif @@ -90,5 +90,5 @@ index 8cac6359..566a21bd 100755 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.42.0 diff --git a/recipes-core/swupdate/files/2023.05/0004-d-rules-Add-option-to-enable-suricatta_wfx.patch b/recipes-core/swupdate/files/2023.05/0003-d-rules-Add-option-to-enable-suricatta_wfx.patch similarity index 69% rename from recipes-core/swupdate/files/2023.05/0004-d-rules-Add-option-to-enable-suricatta_wfx.patch rename to recipes-core/swupdate/files/2023.05/0003-d-rules-Add-option-to-enable-suricatta_wfx.patch index 9c5ebd3..87c60d7 100644 --- a/recipes-core/swupdate/files/2023.05/0004-d-rules-Add-option-to-enable-suricatta_wfx.patch +++ b/recipes-core/swupdate/files/2023.05/0003-d-rules-Add-option-to-enable-suricatta_wfx.patch @@ -1,7 +1,7 @@ -From ee401ba4d0d81fc244288e7e59a7bc5cfe2d1bf4 Mon Sep 17 00:00:00 2001 +From fae97f0e23f945c1ab6e767451cda1d2798aa348 Mon Sep 17 00:00:00 2001 From: Quirin Gylstorff Date: Fri, 16 Jun 2023 20:32:38 +0200 -Subject: [PATCH 4/4] d/rules: Add option to enable suricatta_wfx +Subject: [PATCH 3/4] d/rules: Add option to enable suricatta_wfx Add the DEB_BUILD_PROFILE "pkg.swupdate.suricattawfx" to build with suricattawfx lua module. @@ -12,12 +12,12 @@ Signed-off-by: Quirin Gylstorff 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules -index 566a21bd..fc122d0d 100755 +index 5d72987c..d7ff5510 100755 --- a/debian/rules +++ b/debian/rules -@@ -61,6 +61,9 @@ endif - ifneq (,$(filter pkg.swupdate.suricattalua,$(DEB_BUILD_PROFILES))) - echo CONFIG_SURICATTA_LUA=y >> configs/debian_defconfig +@@ -58,6 +58,9 @@ endif + ifneq (,$(filter pkg.swupdate.p11,$(DEB_BUILD_PROFILES))) + echo CONFIG_PKCS11=y >> configs/debian_defconfig endif +ifneq (,$(filter pkg.swupdate.suricattawfx,$(DEB_BUILD_PROFILES))) + echo CONFIG_SURICATTA_WFX=y >> configs/debian_defconfig @@ -26,5 +26,5 @@ index 566a21bd..fc122d0d 100755 echo CONFIG_LUAPKG=\"lua$(LUA_VERSION)\" >> configs/debian_defconfig echo CONFIG_LUASCRIPTHANDLER=y >> configs/debian_defconfig -- -2.39.2 +2.42.0 diff --git a/recipes-core/swupdate/files/2023.05/0004-d-swupdate-www.install-Fix-path-for-debian-bullseye.patch b/recipes-core/swupdate/files/2023.05/0004-d-swupdate-www.install-Fix-path-for-debian-bullseye.patch new file mode 100644 index 0000000..b2d831d --- /dev/null +++ b/recipes-core/swupdate/files/2023.05/0004-d-swupdate-www.install-Fix-path-for-debian-bullseye.patch @@ -0,0 +1,24 @@ +From f2184e7573e705bad408cf1422599b967773d48e Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff +Date: Thu, 16 Nov 2023 16:40:19 +0100 +Subject: [PATCH 4/4] d/swupdate-www.install: Fix path for debian-bullseye + +Signed-off-by: Quirin Gylstorff +--- + debian/swupdate-www.install | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/debian/swupdate-www.install b/debian/swupdate-www.install +index 7e3d95c6..9c6113cc 100644 +--- a/debian/swupdate-www.install ++++ b/debian/swupdate-www.install +@@ -1,5 +1,5 @@ + web-app/css /usr/share/swupdate/www + web-app/images /usr/share/swupdate/www +-index.html /usr/share/swupdate/www ++web-app/index.html /usr/share/swupdate/www + web-app/js /usr/share/swupdate/www + web-app/node_modules /usr/share/swupdate/www +-- +2.42.0 + diff --git a/recipes-core/swupdate/swupdate_2023.05.bb b/recipes-core/swupdate/swupdate_2023.05.bb index 762fac2..5ead66e 100644 --- a/recipes-core/swupdate/swupdate_2023.05.bb +++ b/recipes-core/swupdate/swupdate_2023.05.bb @@ -22,19 +22,19 @@ FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files/${PV}:" SRC_URI += "git://github.com/sbabic/swupdate.git;protocol=https;branch=master;name=upstream;destsuffix=${P}" SRC_URI += "git://salsa.debian.org/debian/swupdate.git;protocol=https;branch=debian/master;name=debian;subpath=debian;destsuffix=${P}/debian" -SRCREV_debian = "aa9edf070567fa5b3e942c270633a8feef49dad8" +SRCREV_debian = "78cb6f20319d2b911e170eea5305f2cf0bd33030" SRCREV_upstream = "c8ca55684c375937dbcdefb0563071a35137f4ba" # patches -SRC_URI += "file://0001-d-rules-Add-option-for-suricatta_lua.patch \ - file://0002-d-rules-Add-seperate-build_profile-option-for-delta-.patch \ - file://0003-d-patches-Add-patch-to-add-the-build-version-to-swup.patch \ - file://0004-d-rules-Add-option-to-enable-suricatta_wfx.patch" +SRC_URI += "file://0001-d-rules-Add-seperate-build_profile-option-for-delta-.patch \ + file://0002-d-patches-Add-patch-to-add-the-build-version-to-swup.patch \ + file://0003-d-rules-Add-option-to-enable-suricatta_wfx.patch" # The option: "pkg.swupdate.nosigning" disables the required signing # of update binaries # DEB_BUILD_PROFILES += "pkg.swupdate.nosigning" +SRC_URI:append:bullseye = " file://0004-d-swupdate-www.install-Fix-path-for-debian-bullseye.patch" # deactivate hardware compability for simple a/b rootfs update DEB_BUILD_PROFILES += "pkg.swupdate.nohwcompat"