From patchwork Mon Jan 22 12:37:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gylstorff Quirin X-Patchwork-Id: 13525435 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 87478C47E49 for ; Mon, 22 Jan 2024 12:38:00 +0000 (UTC) Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net [185.136.64.226]) by mx.groups.io with SMTP id smtpd.web10.72485.1705927075791074301 for ; Mon, 22 Jan 2024 04:37:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm1 header.b=YuA0oogY; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.226, mailfrom: fm-51332-202401221237521898598265e3bba660-8yaxu_@rts-flowmailer.siemens.com) Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202401221237521898598265e3bba660 for ; Mon, 22 Jan 2024 13:37:53 +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:References:In-Reply-To; bh=fjBC7ZZnGO5KD2b8VfYaizknOOegw54tsl+aPx6XvvQ=; b=YuA0oogYNexunOBTFfMYD2c3gwx8+XJtGt0OXuNJZM57twcEk3qllUx2sNEH8bSmU+lGSR kc3Mxf3E9O1N8fyjwbbbKBOQhSf7vFv+G4/dplrN9oEu8xnL8HluEV+ps/Bv4917I8wCqlmQ BeYIMVx31CtAVufR/l24yFuXspixE=; From: Quirin Gylstorff To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com, felix.moessbauer@siemens.com Subject: [cip-dev][isar-cip-core][RFC 1/4] swupdate-config: move swupdate.cfg from customizations to own recipe Date: Mon, 22 Jan 2024 13:37:12 +0100 Message-ID: <20240122123751.83696-2-Quirin.Gylstorff@siemens.com> In-Reply-To: <20240122123751.83696-1-Quirin.Gylstorff@siemens.com> References: <20240122123751.83696-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 ; Mon, 22 Jan 2024 12:38:00 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/14436 From: Quirin Gylstorff This allows downstream customizations without including unwanted packages. I also adds the possibilty to set the SWU_HW_COMPAT Signed-off-by: Quirin Gylstorff --- recipes-core/customizations/common.inc | 8 ++---- .../swupdate-config/files/hwrevision.tmpl | 1 + .../files/swupdate.cfg | 0 .../swupdate-config/swupdate-config_0.1.bb | 27 +++++++++++++++++++ 4 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 recipes-core/swupdate-config/files/hwrevision.tmpl rename recipes-core/{customizations => swupdate-config}/files/swupdate.cfg (100%) create mode 100644 recipes-core/swupdate-config/swupdate-config_0.1.bb diff --git a/recipes-core/customizations/common.inc b/recipes-core/customizations/common.inc index 79bf80d..8dc5037 100644 --- a/recipes-core/customizations/common.inc +++ b/recipes-core/customizations/common.inc @@ -19,8 +19,6 @@ SRC_URI = " \ file://99-silent-printk.conf \ file://99-watchdog.conf" -SRC_URI:append:swupdate = " file://swupdate.cfg" - CUSTOM_HOSTNAME ??= "demo" WIRELESS_FIRMWARE_PACKAGE ?= "" INSTALL_WIRELESS_TOOLS ??= "0" @@ -29,12 +27,14 @@ TEMPLATE_FILES += "postinst.tmpl" TEMPLATE_VARS += "CUSTOM_HOSTNAME" DEPENDS += "sshd-regen-keys change-root-homedir" +DEPENDS:append:swupdate = " swupdate-config" DEBIAN_DEPENDS = " \ ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys, \ change-root-homedir \ ${@(', iw, wireless-regdb, ' + d.getVar('WIRELESS_FIRMWARE_PACKAGE')) \ if d.getVar('INSTALL_WIRELESS_TOOLS') == '1' else ''}" +DEBIAN_DEPENDS:append:swupdate = ", swupdate-config" do_install() { install -v -d ${D}/etc/network/interfaces.d @@ -46,7 +46,3 @@ do_install() { install -v -d ${D}/etc/systemd/system.conf.d install -v -m 644 ${WORKDIR}/99-watchdog.conf ${D}/etc/systemd/system.conf.d/ } - -do_install:append:swupdate() { - install -v -m 644 ${WORKDIR}/swupdate.cfg ${D}/etc/ -} diff --git a/recipes-core/swupdate-config/files/hwrevision.tmpl b/recipes-core/swupdate-config/files/hwrevision.tmpl new file mode 100644 index 0000000..ec1d667 --- /dev/null +++ b/recipes-core/swupdate-config/files/hwrevision.tmpl @@ -0,0 +1 @@ +cip-${MACHINE} ${IMAGE_HW_VERSION} diff --git a/recipes-core/customizations/files/swupdate.cfg b/recipes-core/swupdate-config/files/swupdate.cfg similarity index 100% rename from recipes-core/customizations/files/swupdate.cfg rename to recipes-core/swupdate-config/files/swupdate.cfg diff --git a/recipes-core/swupdate-config/swupdate-config_0.1.bb b/recipes-core/swupdate-config/swupdate-config_0.1.bb new file mode 100644 index 0000000..6991321 --- /dev/null +++ b/recipes-core/swupdate-config/swupdate-config_0.1.bb @@ -0,0 +1,27 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2024 +# +# Authors: +# Quirin Gylstorff +# +# SPDX-License-Identifier: MIT +# + +inherit dpkg-raw + +SRC_URI = "file://swupdate.cfg \ + file://hwrevision.tmpl" + +MACHINE_HW_VERSION ??= "" +TEMPLATE_FILES += "hwrevision.tmpl" +TEMPLATE_VARS += "MACHINE MACHINE_HW_VERSION" + +do_install[cleandirs] = "${D}/etc/" +do_install() { + install -v -m 644 "${WORKDIR}"/swupdate.cfg "${D}"/etc/ + if [ -n "${MACHINE_HW_VERSION}" ]; then + install -v -m 644 "${WORKDIR}"/hwrevision "${D}"/etc/ + fi +} From patchwork Mon Jan 22 12:37:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gylstorff Quirin X-Patchwork-Id: 13525433 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 7AD88C47DAF for ; Mon, 22 Jan 2024 12:38:00 +0000 (UTC) Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net [185.136.65.227]) by mx.groups.io with SMTP id smtpd.web10.72484.1705927075769109558 for ; Mon, 22 Jan 2024 04:37:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm1 header.b=oruFymkZ; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.227, mailfrom: fm-51332-2024012212375291fddb9ac294b6530f-x6benq@rts-flowmailer.siemens.com) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 2024012212375291fddb9ac294b6530f for ; Mon, 22 Jan 2024 13:37:53 +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:References:In-Reply-To; bh=W3EiuH+CezxsPEUFsV4096n204g1WVxszUXC5Ah8Bng=; b=oruFymkZnBAMgnmT8t4tcUBb4m/l0g2TzaukdjkPvMX+DJsahNWaIyzQccJs733ViLmVZ8 qtuZYbDvtzxMowwyiQ/H82Aj56wTWYI8xeMDrC2ZuoR6RiVivoxrpYuEyOQ+bvsLdS0cioG4 xgrn2dRzWEGZ3De/mjGubH1KlYsAU=; From: Quirin Gylstorff To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com, felix.moessbauer@siemens.com Subject: [cip-dev][isar-cip-core][RFC 2/4] swupdate: set SWU_HW_COMPAT Date: Mon, 22 Jan 2024 13:37:13 +0100 Message-ID: <20240122123751.83696-3-Quirin.Gylstorff@siemens.com> In-Reply-To: <20240122123751.83696-1-Quirin.Gylstorff@siemens.com> References: <20240122123751.83696-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 ; Mon, 22 Jan 2024 12:38:00 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/14438 From: Quirin Gylstorff With this item SWUpdate from Debian can be used in place of a build from isar-cip-core. Signed-off-by: Quirin Gylstorff --- recipes-core/images/swupdate.inc | 2 +- recipes-core/swupdate-config/files/hwrevision.tmpl | 2 +- recipes-core/swupdate-config/swupdate-config_0.1.bb | 2 +- recipes-core/swupdate/swupdate.inc | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc index 4983f7c..183503b 100644 --- a/recipes-core/images/swupdate.inc +++ b/recipes-core/images/swupdate.inc @@ -13,7 +13,7 @@ inherit image_uuid inherit read-only-rootfs SWU_SIGNED ?= "1" - +SWU_HW_COMPAT ?= "cip-core-1.0" IMAGE_INSTALL += " swupdate" IMAGE_INSTALL += " swupdate-handler-roundrobin" diff --git a/recipes-core/swupdate-config/files/hwrevision.tmpl b/recipes-core/swupdate-config/files/hwrevision.tmpl index ec1d667..1eb0996 100644 --- a/recipes-core/swupdate-config/files/hwrevision.tmpl +++ b/recipes-core/swupdate-config/files/hwrevision.tmpl @@ -1 +1 @@ -cip-${MACHINE} ${IMAGE_HW_VERSION} +cip-${MACHINE} ${MACHINE_HW_VERSION} diff --git a/recipes-core/swupdate-config/swupdate-config_0.1.bb b/recipes-core/swupdate-config/swupdate-config_0.1.bb index 6991321..260c0f1 100644 --- a/recipes-core/swupdate-config/swupdate-config_0.1.bb +++ b/recipes-core/swupdate-config/swupdate-config_0.1.bb @@ -14,7 +14,7 @@ inherit dpkg-raw SRC_URI = "file://swupdate.cfg \ file://hwrevision.tmpl" -MACHINE_HW_VERSION ??= "" +MACHINE_HW_VERSION ??= "cip-core-1.0" TEMPLATE_FILES += "hwrevision.tmpl" TEMPLATE_VARS += "MACHINE MACHINE_HW_VERSION" diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc index cb1716b..818b431 100644 --- a/recipes-core/swupdate/swupdate.inc +++ b/recipes-core/swupdate/swupdate.inc @@ -34,9 +34,6 @@ DEPENDS += "${@bb.utils.contains('DEB_BUILD_PROFILES', 'mtd', 'mtd-utils', '', d DEB_BUILD_PROFILES += "${@'pkg.swupdate.nosigning' if not d.getVar('SWU_SIGNED') == '1' else ''}" -# deactivate hardware compability for simple a/b rootfs update -DEB_BUILD_PROFILES += "pkg.swupdate.nohwcompat" - # add cross build and deactivate testing for arm based builds DEB_BUILD_PROFILES += "cross nocheck" From patchwork Mon Jan 22 12:37:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gylstorff Quirin X-Patchwork-Id: 13525432 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 A7036C47DDF for ; Mon, 22 Jan 2024 12:38:00 +0000 (UTC) Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net [185.136.65.227]) by mx.groups.io with SMTP id smtpd.web10.72486.1705927076205220107 for ; Mon, 22 Jan 2024 04:37:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm1 header.b=P1WusKxQ; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.227, mailfrom: fm-51332-2024012212375328fc495fd7a5a8cc3a-j0k5no@rts-flowmailer.siemens.com) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 2024012212375328fc495fd7a5a8cc3a for ; Mon, 22 Jan 2024 13:37:53 +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:References:In-Reply-To; bh=uCbvdigdQq1b07hDw2e7XyQqiTU9E95pDoDgo8CoRr4=; b=P1WusKxQ2zokWgY6njTce/Q0RH3IxTMhXqS5Qxce+z/TKPR44JWBUkHG2mbTvVhiScQw8n r9ac0FEEHHbOgf39NFGRs9GqPCapgElj37xVsdvOLuPogO+xIn5VdXNh677neUsJEyOy60lt v2gnM3OvmWn64x9ng4Q8tJ0Zymhtg=; From: Quirin Gylstorff To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com, felix.moessbauer@siemens.com Subject: [cip-dev][isar-cip-core][RFC 3/4] swupdate.bbclass: weak default assignment for SWU_HW_COMPAT Date: Mon, 22 Jan 2024 13:37:14 +0100 Message-ID: <20240122123751.83696-4-Quirin.Gylstorff@siemens.com> In-Reply-To: <20240122123751.83696-1-Quirin.Gylstorff@siemens.com> References: <20240122123751.83696-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 ; Mon, 22 Jan 2024 12:38:00 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/14437 From: Quirin Gylstorff This allows to set SWU_HW_COMPAT in recipe-core/images/swupdate.inc and in downstream layers. Signed-off-by: Quirin Gylstorff --- classes/swupdate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass index 8f1215d..b2c10db 100644 --- a/classes/swupdate.bbclass +++ b/classes/swupdate.bbclass @@ -21,7 +21,7 @@ SWU_ROOTFS_PARTITION_NAME ?= "${SWU_ROOTFS_NAME}.${SWU_ROOTFS_TYPE}${@get_swu_co SWU_VERSION ?= "0.2" SWU_NAME ?= "cip software update" # space separated list of supported hw. Leave empty to leave out -SWU_HW_COMPAT ?= "" +SWU_HW_COMPAT ??= "" SWU_EBG_UPDATE ?= "" SWU_EFI_BOOT_DEVICE ?= "/dev/disk/by-uuid/4321-DCBA" From patchwork Mon Jan 22 12:37:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gylstorff Quirin X-Patchwork-Id: 13525436 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 760A2C47DDB for ; Mon, 22 Jan 2024 12:38:00 +0000 (UTC) Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net [185.136.64.225]) by mx.groups.io with SMTP id smtpd.web11.72530.1705927075843946712 for ; Mon, 22 Jan 2024 04:37:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm1 header.b=Trp0CeHZ; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.225, mailfrom: fm-51332-2024012212375391b8346f511d08a695-zklscn@rts-flowmailer.siemens.com) Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 2024012212375391b8346f511d08a695 for ; Mon, 22 Jan 2024 13:37:53 +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:References:In-Reply-To; bh=8gdVGx4Z5xq8iYax84Yl9Na4eLxa7Y9TBY/9za/LuH8=; b=Trp0CeHZrSQ4rHhFHMlysEcCnRdOv7RC9Whw58Mlj01EW9DXHadmz1k/8FUAumpQS64TT9 JbbkYABzXJXjdHMOW5F5PFXT2SsoLqJPnjaLS/k0Cb31jVgqNfty7DxWKuhhAJ2q5d/g0Hos bzDvkYNBFaYQ30Wz64hx+ItnMbSho=; From: Quirin Gylstorff To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com, felix.moessbauer@siemens.com Subject: [cip-dev][isar-cip-core][RFC 4/4] swupdate: Add patch to copy the server_wfx.lua to /usr/share Date: Mon, 22 Jan 2024 13:37:15 +0100 Message-ID: <20240122123751.83696-5-Quirin.Gylstorff@siemens.com> In-Reply-To: <20240122123751.83696-1-Quirin.Gylstorff@siemens.com> References: <20240122123751.83696-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 ; Mon, 22 Jan 2024 12:38:00 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/14434 From: Quirin Gylstorff This allows to use wfx together with swupdate with out embedding server_wfx.lua. Signed-off-by: Quirin Gylstorff --- ...rate-build_profile-option-for-delta-.patch | 8 ++-- ...tch-to-add-the-build-version-to-swup.patch | 6 +-- ...s-Add-option-to-enable-suricatta_wfx.patch | 6 +-- ...install-Fix-path-for-debian-bullseye.patch | 6 +-- ...tall-server_wfx.lua-to-usr-share-lua.patch | 44 +++++++++++++++++++ recipes-core/swupdate/swupdate_2023.05.bb | 8 +--- 6 files changed, 58 insertions(+), 20 deletions(-) create mode 100644 recipes-core/swupdate/files/2023.05/0005-d-rules-install-server_wfx.lua-to-usr-share-lua.patch diff --git a/recipes-core/swupdate/files/2023.05/0001-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 index 0d0fc0a..4a63dfd 100644 --- a/recipes-core/swupdate/files/2023.05/0001-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 03d455be74d439c7e2eb849e5acdfb494afb3d7c Mon Sep 17 00:00:00 2001 +From ce4e66c37fd6f2cb147fd0e75cfcabebdef3abd5 Mon Sep 17 00:00:00 2001 From: Quirin Gylstorff Date: Thu, 15 Jun 2023 18:48:25 +0200 -Subject: [PATCH 1/4] d/rules: Add seperate build_profile option for delta +Subject: [PATCH 1/6] d/rules: Add seperate build_profile option for delta update Delta update need zchunk 1.3 to work on memory restricted @@ -15,7 +15,7 @@ Signed-off-by: Quirin Gylstorff 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control -index a389b2a9..2f0c0053 100644 +index acbecd47..a0d4edcc 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Build-Depends: debhelper-compat (= 13), @@ -41,5 +41,5 @@ index 3b1cc0f6..2c91677c 100755 endif ifneq (,$(findstring $(DEB_HOST_ARCH),amd64 i386 arm64 armhf riscv64 ia64)) -- -2.42.0 +2.43.0 diff --git a/recipes-core/swupdate/files/2023.05/0002-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 index 8056818..65c3cb6 100644 --- a/recipes-core/swupdate/files/2023.05/0002-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 ad714bc12b03c148aadb3523f87cc14d42a477b0 Mon Sep 17 00:00:00 2001 +From 384613cc6d0b87e58cf8ca9636f65730b0790061 Mon Sep 17 00:00:00 2001 From: Quirin Gylstorff Date: Fri, 16 Jun 2023 19:43:38 +0200 -Subject: [PATCH 2/4] d/patches: Add patch to add the build version to swupdate +Subject: [PATCH 2/6] 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 @@ -90,5 +90,5 @@ index 2c91677c..5d72987c 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.42.0 +2.43.0 diff --git a/recipes-core/swupdate/files/2023.05/0003-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 index 87c60d7..e320665 100644 --- a/recipes-core/swupdate/files/2023.05/0003-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 fae97f0e23f945c1ab6e767451cda1d2798aa348 Mon Sep 17 00:00:00 2001 +From 2be6e19412eb44c55b648bb8f34acf4e87bb0d3a Mon Sep 17 00:00:00 2001 From: Quirin Gylstorff Date: Fri, 16 Jun 2023 20:32:38 +0200 -Subject: [PATCH 3/4] d/rules: Add option to enable suricatta_wfx +Subject: [PATCH 3/6] d/rules: Add option to enable suricatta_wfx Add the DEB_BUILD_PROFILE "pkg.swupdate.suricattawfx" to build with suricattawfx lua module. @@ -26,5 +26,5 @@ index 5d72987c..d7ff5510 100755 echo CONFIG_LUAPKG=\"lua$(LUA_VERSION)\" >> configs/debian_defconfig echo CONFIG_LUASCRIPTHANDLER=y >> configs/debian_defconfig -- -2.42.0 +2.43.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 index b2d831d..a1e8bc7 100644 --- 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 @@ -1,7 +1,7 @@ -From f2184e7573e705bad408cf1422599b967773d48e Mon Sep 17 00:00:00 2001 +From 4ee463885ce2532b5bdf8beb6106e357670a737a 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 +Subject: [PATCH 4/6] d/swupdate-www.install: Fix path for debian-bullseye Signed-off-by: Quirin Gylstorff --- @@ -20,5 +20,5 @@ index 7e3d95c6..9c6113cc 100644 web-app/js /usr/share/swupdate/www web-app/node_modules /usr/share/swupdate/www -- -2.42.0 +2.43.0 diff --git a/recipes-core/swupdate/files/2023.05/0005-d-rules-install-server_wfx.lua-to-usr-share-lua.patch b/recipes-core/swupdate/files/2023.05/0005-d-rules-install-server_wfx.lua-to-usr-share-lua.patch new file mode 100644 index 0000000..a4c960a --- /dev/null +++ b/recipes-core/swupdate/files/2023.05/0005-d-rules-install-server_wfx.lua-to-usr-share-lua.patch @@ -0,0 +1,44 @@ +From c34282446c928d7a1603b7dd825de7e1ddede829 Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff +Date: Mon, 15 Jan 2024 13:28:42 +0100 +Subject: [PATCH 5/6] d/rules: install server_wfx.lua to /usr/share/lua + +Signed-off-by: Quirin Gylstorff +--- + debian/lua-swupdate.install | 1 + + debian/rules | 5 +++++ + 2 files changed, 6 insertions(+) + +diff --git a/debian/lua-swupdate.install b/debian/lua-swupdate.install +index afde2a68..6cd5436c 100644 +--- a/debian/lua-swupdate.install ++++ b/debian/lua-swupdate.install +@@ -1 +1,2 @@ ++examples/suricatta/swupdate_suricatta.lua usr/share/lua/5.3/ + usr/lib/*/lua/*/lua_swupdate*.so* +diff --git a/debian/rules b/debian/rules +index d7ff5510..8be9221f 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -71,6 +71,10 @@ endif + echo CONFIG_EXTRA_LDFLAGS=\"$(LDFLAGS)\" >> configs/debian_defconfig + echo CONFIG_EXTRA_LDLIBS=\"$(LDLIBS)\" >> configs/debian_defconfig + $(MAKE) debian_defconfig ++ifneq (,$(LUA_VERSION)) ++ mv suricatta/server_wfx.lua suricatta/swupdate_suricatta.lua ++ echo "suricatta/swupdate_suricatta.lua /usr/share/lua/$(LUA_VERSION)" >> debian/swupdate.install ++endif + + override_dh_auto_build: + ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES))) +@@ -97,6 +101,7 @@ endif + endif + + override_dh_auto_install: ++ + dh_auto_install -- V=1 + + override_dh_installsystemd: +-- +2.43.0 + diff --git a/recipes-core/swupdate/swupdate_2023.05.bb b/recipes-core/swupdate/swupdate_2023.05.bb index d1fe1fa..7533bfa 100644 --- a/recipes-core/swupdate/swupdate_2023.05.bb +++ b/recipes-core/swupdate/swupdate_2023.05.bb @@ -28,15 +28,9 @@ SRCREV_upstream = "c8ca55684c375937dbcdefb0563071a35137f4ba" # patches 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" + file://0005-d-rules-install-server_wfx.lua-to-usr-share-lua.patch" SRC_URI:append:bullseye = " file://0004-d-swupdate-www.install-Fix-path-for-debian-bullseye.patch" -# suricatta wfx requires suricatta lua and the dependency -# is not set automatically -DEB_BUILD_PROFILES += "pkg.swupdate.suricattalua" -# add suricatta wfx -DEB_BUILD_PROFILES += "pkg.swupdate.suricattawfx" - # Disable cross for arm and arm64 on bullseye # with cross compile we have a unsat-dependency to dh-nodejs on arm/arm64 ISAR_CROSS_COMPILE:bullseye = "0"