[1/1] imager: fix caching issue by excluding BITBAKEDIR

Message ID 20231025060842.1556755-1-felix.moessbauer@siemens.com
State Accepted, archived
Headers show
Series [1/1] imager: fix caching issue by excluding BITBAKEDIR | expand

Commit Message

MOESSBAUER, Felix Oct. 25, 2023, 6:08 a.m. UTC
The BITBAKEDIR variable contains an absolute path. This is problematic
when mounting it into the schroot, as this makes the hash of the
function depend on the absolute path. As the bitbake directory anyways
directly depends on the ISAR layer, we can safely exclude it.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/classes/imagetypes_wic.bbclass | 1 +
 1 file changed, 1 insertion(+)

Comments

Uladzimir Bely Nov. 1, 2023, 7:12 a.m. UTC | #1
On Wed, 2023-10-25 at 14:08 +0800, 'Felix Moessbauer' via isar-users
wrote:
> The BITBAKEDIR variable contains an absolute path. This is
> problematic
> when mounting it into the schroot, as this makes the hash of the
> function depend on the absolute path. As the bitbake directory
> anyways
> directly depends on the ISAR layer, we can safely exclude it.
> 
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  meta/classes/imagetypes_wic.bbclass | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/meta/classes/imagetypes_wic.bbclass
> b/meta/classes/imagetypes_wic.bbclass
> index 9a0bc2b7..6b50959f 100644
> --- a/meta/classes/imagetypes_wic.bbclass
> +++ b/meta/classes/imagetypes_wic.bbclass
> @@ -147,6 +147,7 @@ IMAGE_CMD:wic() {
>  }
>  
>  SCHROOT_MOUNTS += "${BBLAYERS} ${STAGING_DIR} ${SCRIPTSDIR}
> ${BITBAKEDIR}"
> +SCHROOT_MOUNTS[vardepsexclude] += "BITBAKEDIR"
>  
>  generate_wic_image[vardepsexclude] += "WKS_FULL_PATH BITBAKEDIR
> TOPDIR"
>  generate_wic_image() {
> -- 
> 2.39.2
> 

Applied to next, thanks.

Patch

diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass
index 9a0bc2b7..6b50959f 100644
--- a/meta/classes/imagetypes_wic.bbclass
+++ b/meta/classes/imagetypes_wic.bbclass
@@ -147,6 +147,7 @@  IMAGE_CMD:wic() {
 }
 
 SCHROOT_MOUNTS += "${BBLAYERS} ${STAGING_DIR} ${SCRIPTSDIR} ${BITBAKEDIR}"
+SCHROOT_MOUNTS[vardepsexclude] += "BITBAKEDIR"
 
 generate_wic_image[vardepsexclude] += "WKS_FULL_PATH BITBAKEDIR TOPDIR"
 generate_wic_image() {