Re: [cip-dev][isar-cip-core][PATCH v2 1/4] swupdate: Move handler to own recipe
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: 2021-10-13 13:47:48
On 13.10.21 15:40, Q. Gylstorff wrote:
quoted hunk ↗ jump to hunk
From: Quirin Gylstorff <redacted> Split the SWUpdate lua handler into a seperate recipe in preparation for using the Debian provided SWUpdate package. Signed-off-by: Quirin Gylstorff <redacted> --- classes/swupdate-config.bbclass | 8 ----- kas/opt/swupdate.yml | 1 + .../swupdate.handler.efibootguard.ini | 0 .../files/swupdate.handler.efibootguard.ini | 0 .../swupdate-handler-roundrobin_0.1.bb | 32 +++++++++++++++++++ recipes-core/swupdate/swupdate.bb | 13 -------- 6 files changed, 33 insertions(+), 21 deletions(-) rename recipes-core/{swupdate => swupdate-handler-roundrobin}/files/secureboot/swupdate.handler.efibootguard.ini (100%) rename recipes-core/{swupdate => swupdate-handler-roundrobin}/files/swupdate.handler.efibootguard.ini (100%) create mode 100644 recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bbdiff --git a/classes/swupdate-config.bbclass b/classes/swupdate-config.bbclass index e4879c7..1d57ce1 100644 --- a/classes/swupdate-config.bbclass +++ b/classes/swupdate-config.bbclass@@ -17,14 +17,6 @@ BUILD_DEB_DEPENDS = " \ zlib1g-dev, debhelper, libconfig-dev, libarchive-dev, \ python-sphinx:native, dh-systemd, libsystemd-dev, libssl-dev, pkg-config" -SRC_URI += " ${@ 'git://gitlab.com/cip-project/cip-sw-updates/swupdate-handler-roundrobin.git;protocol=https;destsuffix=swupdate-handler-roundrobin;name=swupdate-handler-roundrobin;nobranch=1' \ - if d.getVar('SWUPDATE_USE_ROUND_ROBIN_HANDLER_REPO') == '1' else '' \ - }" -SRCREV_swupdate-handler-roundrobin ?= "6f561f136fdbe51d2e9066b934dfcb06b94c6624" - -SWUPDATE_USE_ROUND_ROBIN_HANDLER_REPO ?= "1" -SWUPDATE_LUASCRIPT ?= "swupdate-handler-roundrobin/swupdate_handlers_roundrobin.lua" - KFEATURE_lua = "" KFEATURE_lua[BUILD_DEB_DEPENDS] = "liblua5.3-dev" KFEATURE_lua[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_lua.snippet"diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml index bd0f6e4..974eacb 100644 --- a/kas/opt/swupdate.yml +++ b/kas/opt/swupdate.yml@@ -17,6 +17,7 @@ header: local_conf_header: swupdate: | IMAGE_INSTALL_append = " swupdate" + IMAGE_INSTALL_append = " swupdate-handler-roundrobin" wic-swu: | IMAGE_TYPE = "wic-swu-img"diff --git a/recipes-core/swupdate/files/secureboot/swupdate.handler.efibootguard.ini b/recipes-core/swupdate-handler-roundrobin/files/secureboot/swupdate.handler.efibootguard.ini similarity index 100% rename from recipes-core/swupdate/files/secureboot/swupdate.handler.efibootguard.ini rename to recipes-core/swupdate-handler-roundrobin/files/secureboot/swupdate.handler.efibootguard.ini diff --git a/recipes-core/swupdate/files/swupdate.handler.efibootguard.ini b/recipes-core/swupdate-handler-roundrobin/files/swupdate.handler.efibootguard.ini similarity index 100% rename from recipes-core/swupdate/files/swupdate.handler.efibootguard.ini rename to recipes-core/swupdate-handler-roundrobin/files/swupdate.handler.efibootguard.ini diff --git a/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb b/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb new file mode 100644 index 0000000..b9ccec2 --- /dev/null +++ b/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb@@ -0,0 +1,32 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2021 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT + +inherit dpkg-raw + +PROVIDES = "swupdate-handlers"
Plural or singular? Can a generic swupdate-handler package container multiple handlers? Or will it only ever provide a single handler? In the latter case, make this "swupdate-handler" as well. Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux