| Message ID | 20211029053940.625034-1-Srinuvasan_A@mentor.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [isar-cip-dev] recipes-core/swupdate: Update the SRC_URI and SWUPDATE_BUILD_PROFILES append for buster | expand |
On 29.10.21 07:39, 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 repo, 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 "BASE_DISTRO_CODENAME" variable to pick the proper base distro. > > 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..e6526ba 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_${BASE_DISTRO_CODENAME} = " file://0009-debian-prepare-build-for-isar-debian-buster.patch" > > # 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_${BASE_DISTRO_CODENAME} = " 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" > Please have a look at the bitbake manual, how overrides work (https://www.yoctoproject.org/docs/latest/bitbake-user-manual/bitbake-user-manual.html#conditional-syntax-overrides). And test whether your code is behaving as expected, also for non-buster images. Jan
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..e6526ba 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_${BASE_DISTRO_CODENAME} = " file://0009-debian-prepare-build-for-isar-debian-buster.patch" # 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_${BASE_DISTRO_CODENAME} = " 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"