From patchwork Wed Feb 16 16:03:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gylstorff Quirin X-Patchwork-Id: 12748720 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 6CD90C433F5 for ; Wed, 16 Feb 2022 16:04:06 +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.web08.935.1645027444622733017 for ; Wed, 16 Feb 2022 08:04:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm1 header.b=VyilzHo/; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-51332-2022021616040129f5851078a3d57e47-uv7wdq@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 2022021616040129f5851078a3d57e47 for ; Wed, 16 Feb 2022 17:04:01 +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=e3UTSsHb1dt6fWsJ1FjxoqW4vreEExqzxE6Xok/npmM=; b=VyilzHo/coPHM11GoWN1OO5pwcMdKRIYMGdF/PNAerD97RTpAv0SXznBHOn72qt653fUQ7 v3rFxDr2zOZg4RBKQOCmXA3mRoygnypmYBA+TSfnk4md+J8ePE3FGSZnAqJmXLJfAEvvohbY M9ChdcAXwJTyMY+yaol/IIOPjFUqw=; From: Quirin.Gylstorff@siemens.com To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-dev][PATCH v2 1/1] Update ISAR to next Date: Wed, 16 Feb 2022 17:03:59 +0100 Message-Id: <20220216160359.3517492-2-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220216160359.3517492-1-Quirin.Gylstorff@siemens.com> References: <20220216160359.3517492-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 ; Wed, 16 Feb 2022 16:04:06 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7624 From: Quirin Gylstorff refspec is now cf3f18a649ff42726677a58b224b9bb58ea4ba46 This adds Debian build profile support The option 'nodoc' is no longer necessary as the build dependencies of SWUpdate were fixed with [1]. [1]: https://salsa.debian.org/debian/swupdate/-/commit/d666b84435e1b1abebc6070252872ed390ac4df8 Signed-off-by: Quirin Gylstorff --- kas-cip.yml | 2 +- recipes-core/swupdate/swupdate.inc | 12 ++---------- .../swupdate/swupdate_2021.11-1+debian-gbp.bb | 11 ++++------- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/kas-cip.yml b/kas-cip.yml index 9c8ac9f..fce176b 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - refspec: 33b5aa65fa3f28987525799d0731fb4e7050207d + refspec: cf3f18a649ff42726677a58b224b9bb58ea4ba46 layers: meta: patches: diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc index 7812ae7..f2d478d 100644 --- a/recipes-core/swupdate/swupdate.inc +++ b/recipes-core/swupdate/swupdate.inc @@ -23,7 +23,7 @@ def get_bootloader_build_profile(d): return "pkg.swupdate.uboot" return "" -SWUPDATE_BUILD_PROFILES += "${@get_bootloader_build_profile(d)}" +DEB_BUILD_PROFILES += "${@get_bootloader_build_profile(d)}" def get_bootloader_dependencies(d): bootloader = d.getVar("SWUPDATE_BOOTLOADER") or "" @@ -37,15 +37,7 @@ def get_bootloader_dependencies(d): return "" DEPENDS += "${@get_bootloader_dependencies(d)}" -DEPENDS += "${@bb.utils.contains('SWUPDATE_BUILD_PROFILES', 'mtd', 'mtd-utils', '', d)}" - -do_install_builddeps_prepend() { - export DEB_BUILD_PROFILES="${SWUPDATE_BUILD_PROFILES}" -} - -dpkg_runbuild_prepend() { - export DEB_BUILD_PROFILES="${SWUPDATE_BUILD_PROFILES}" -} +DEPENDS += "${@bb.utils.contains('DEB_BUILD_PROFILES', 'mtd', 'mtd-utils', '', d)}" python do_check_bootloader () { bootloader = d.getVar("SWUPDATE_BOOTLOADER") or "None" diff --git a/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb index 699dad3..bf060b4 100644 --- a/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb +++ b/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb @@ -28,25 +28,22 @@ SRC_URI += "file://0001-debian-config-Make-image-encryption-optional.patch \ # end patching for dm-verity based images # deactivate signing and encryption for simple a/b rootfs update -SWUPDATE_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption" +DEB_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption" # add cross build and deactivate testing for arm based builds -SWUPDATE_BUILD_PROFILES += "cross nocheck" +DEB_BUILD_PROFILES += "cross nocheck" # If the luahandler shall be embedded into the swupdate binary # include the following lines. # DEPENDS += "swupdate-handlers" # GBP_DEPENDS += "swupdate-handlers" -# SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua" +# DEB_BUILD_PROFILES += "pkg.swupdate.embeddedlua" # modify for debian buster build SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch" -# disable documentation due to missing packages -SWUPDATE_BUILD_PROFILES_append = " nodoc " - # disable create filesystem due to missing symbols in debian buster # disable webserver due to missing symbols in debian buster -SWUPDATE_BUILD_PROFILES_append_buster = " \ +DEB_BUILD_PROFILES_append_buster = " \ pkg.swupdate.nocreatefs \ pkg.swupdate.nowebserver " # In debian buster the git-compression defaults to gz and does not detect other