Browse Source

swupdate-image: use image link name

Use IMAGE_LINK_NAME instead of IMAGE_BASENAME. IMAGE_BASENAME contains a
timestamp which causes some sporadic build failures. The problem is that
if the image files have been built by a previous bitbake call and bitbake
skips the task to build them again swupdate fails with searching for images
with the timestamp of the current build job in the file name. The link
refers to the latest available build in any case.

Setting S to WORKDIR should not be needed. It's the default from
bitbake.conf.

Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
Adrian Freihofer 4 years ago
parent
commit
557b1b55fa
1 changed files with 2 additions and 5 deletions
  1. 2 5
      classes/swupdate-image.bbclass

+ 2 - 5
classes/swupdate-image.bbclass

@@ -11,17 +11,14 @@
 inherit swupdate-common.bbclass
 inherit image-artifact-names
 
-S = "${WORKDIR}/${PN}"
-
 SRC_URI += "file://sw-description"
-SWUPDATE_IMAGES += "${IMAGE_BASENAME}"
+SWUPDATE_IMAGES += "${IMAGE_LINK_NAME}"
 
 python do_swupdate_copy_swdescription() {
-
     import shutil
 
     workdir = d.getVar('S', True)
-    image = d.getVar('IMAGE_BASENAME', True)
+    image = d.getVar('IMAGE_LINK_NAME', True)
     filespath = d.getVar('FILESPATH')
     sw_desc_path = bb.utils.which(filespath, "sw-description")
     shutil.copyfile(sw_desc_path, os.path.join(workdir, "sw-description"))