| Message ID | 20211112115017.401779-3-Quirin.Gylstorff@siemens.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | recipes-core/swupdate: Update the SRC_URI and SWUPDATE_BUILD_PROFILES append for buster | expand |
This should not be have sent. Drop. On 11/12/21 12:50 PM, Quirin Gylstorff via lists.cip-project.org 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 OVERRIDES for BASE_DISTRO_CODENAME to select the particular base distro. > > Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com> > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > recipes-core/swupdate/swupdate.inc | 2 ++ > recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb | 8 ++++---- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc > index a469587..191aa2b 100644 > --- a/recipes-core/swupdate/swupdate.inc > +++ b/recipes-core/swupdate/swupdate.inc > @@ -13,6 +13,8 @@ HOMEPAGE= "https://github.com/sbabic/swupdate" > LICENSE = "GPL-2.0" > LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" > > +OVERRIDES_append = ":${BASE_DISTRO_CODENAME}" > + > def get_bootloader_build_profile(d): > bootloader = d.getVar("SWUPDATE_BOOTLOADER") or "" > if bootloader == "efibootguard": > 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..e62230f 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_buster = " 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_buster = " 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" > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#6880): https://lists.cip-project.org/g/cip-dev/message/6880 > Mute This Topic: https://lists.cip-project.org/mt/87004225/1753640 > Group Owner: cip-dev+owner@lists.cip-project.org > Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129121/1753640/1405269326/xyzzy [quirin.gylstorff@siemens.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc index a469587..191aa2b 100644 --- a/recipes-core/swupdate/swupdate.inc +++ b/recipes-core/swupdate/swupdate.inc @@ -13,6 +13,8 @@ HOMEPAGE= "https://github.com/sbabic/swupdate" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" +OVERRIDES_append = ":${BASE_DISTRO_CODENAME}" + def get_bootloader_build_profile(d): bootloader = d.getVar("SWUPDATE_BOOTLOADER") or "" if bootloader == "efibootguard": 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..e62230f 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_buster = " 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_buster = " 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"