Re: [isar-cip-dev] [PATCH] recipes-core/swupdate: Update the SRC_URI and SWUPDATE_BUILD_PROFILES append for buster


Jan Kiszka
 

On 28.10.21 13:15, Srinuvasan A wrote:
From: Srinuvasan A <srinuvasan_a@mentor.com>

When we build the swupdate debian package for buster some build
dependency packages are not available in stable buster, hence we created a
patch in cip-core upstream for buster build, here we hardcoded the distro
for buster build hence it is building fine in cip-core not the
downstream layer, added the "DISTRO" variable to pick the proper distro name.

Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com>
---
recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
index a451b55..f8298f0 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -35,14 +35,14 @@ SWUPDATE_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption"
# SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua"

# modify for debian buster build
-SRC_URI_append_cip-core-buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"
+SRC_URI_append_${DISTRO} = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"
This makes no sense. DISTRO is in OVERRIDES, so this will always match.
And that would also not make sense for a patch that is for buster only.

You likely want to match on BASE_DISTRO_CODENAME. That means expanding
OVERRIDES accordingly.

Jan


# disable documentation due to missing packages in debian buster
# disable create filesystem due to missing symbols in debian buster
# disable webserver due to missing symbols in debian buster
-SWUPDATE_BUILD_PROFILES_append_cip-core-buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+SWUPDATE_BUILD_PROFILES_append_${DISTRO} = " nodoc \
+ pkg.swupdate.nocreatefs \
+ pkg.swupdate.nowebserver "
# In debian buster the git-compression defaults to gz and does not detect other
# compression formats.
GBP_EXTRA_OPTIONS += "--git-compression=xz"
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

Join cip-dev@lists.cip-project.org to automatically receive all group messages.