| Message ID | 20241022104843.2885687-1-stefano.babic@swupdate.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [meta-swupdate] swupdate-image: do not rely on IMAGE_LINK_NAME | expand |
On Tue, Oct 22, 2024 at 3:48 AM Stefano Babic <stefano.babic@swupdate.org> wrote: > IMAGE_LINK_NAME was changed since scarthgap and this mismatches with the > class. Use IMAGE_BASENAME instead. yep LGTM > > Signed-off-by: Stefano Babic <stefano.babic@swupdate.org> > --- > > Note: this helps after IMAGE_LINKNAME has added a .rootfs in the name > (since scarthgap) > > Note: patch should flow in both -master and -scarthgap, this can cause > some breakages. > > classes-recipe/swupdate-image.bbclass | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/classes-recipe/swupdate-image.bbclass > b/classes-recipe/swupdate-image.bbclass > index 175fc4e..69b8794 100644 > --- a/classes-recipe/swupdate-image.bbclass > +++ b/classes-recipe/swupdate-image.bbclass > @@ -16,10 +16,10 @@ inherit image-artifact-names > S = "${WORKDIR}/${PN}" > > SRC_URI += "file://sw-description" > -SWUPDATE_IMAGES += "${IMAGE_LINK_NAME}" > +SWUPDATE_IMAGES += "${IMAGE_BASENAME}" > > python () { > - image = d.getVar('IMAGE_LINK_NAME') > + image = d.getVar('IMAGE_BASENAME') > if d.getVarFlag("SWUPDATE_IMAGES_FSTYPES", image) is None: > flag = d.getVarFlag("SWUPDATE_IMAGES_FSTYPES", > d.getVar('IMAGE_BASENAME')) > if flag: > -- > 2.34.1 > > -- > You received this message because you are subscribed to the Google Groups > "swupdate" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to swupdate+unsubscribe@googlegroups.com. > To view this discussion on the web visit > https://groups.google.com/d/msgid/swupdate/20241022104843.2885687-1-stefano.babic%40swupdate.org > . >
diff --git a/classes-recipe/swupdate-image.bbclass b/classes-recipe/swupdate-image.bbclass index 175fc4e..69b8794 100644 --- a/classes-recipe/swupdate-image.bbclass +++ b/classes-recipe/swupdate-image.bbclass @@ -16,10 +16,10 @@ inherit image-artifact-names S = "${WORKDIR}/${PN}" SRC_URI += "file://sw-description" -SWUPDATE_IMAGES += "${IMAGE_LINK_NAME}" +SWUPDATE_IMAGES += "${IMAGE_BASENAME}" python () { - image = d.getVar('IMAGE_LINK_NAME') + image = d.getVar('IMAGE_BASENAME') if d.getVarFlag("SWUPDATE_IMAGES_FSTYPES", image) is None: flag = d.getVarFlag("SWUPDATE_IMAGES_FSTYPES", d.getVar('IMAGE_BASENAME')) if flag:
IMAGE_LINK_NAME was changed since scarthgap and this mismatches with the class. Use IMAGE_BASENAME instead. Signed-off-by: Stefano Babic <stefano.babic@swupdate.org> --- Note: this helps after IMAGE_LINKNAME has added a .rootfs in the name (since scarthgap) Note: patch should flow in both -master and -scarthgap, this can cause some breakages. classes-recipe/swupdate-image.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.34.1