diff options
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-tools.inc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools.inc b/meta/recipes-bsp/u-boot/u-boot-tools.inc index 8ae290acc6..4ed936a70d 100644 --- a/meta/recipes-bsp/u-boot/u-boot-tools.inc +++ b/meta/recipes-bsp/u-boot/u-boot-tools.inc | |||
@@ -23,6 +23,21 @@ SED_CONFIG_EFI_armeb = '' | |||
23 | SED_CONFIG_EFI_aarch64 = '' | 23 | SED_CONFIG_EFI_aarch64 = '' |
24 | 24 | ||
25 | do_compile () { | 25 | do_compile () { |
26 | # Yes, this is crazy. If you build on a system with git < 2.14 from scratch, the tree will | ||
27 | # be marked as "dirty" and the version will include "-dirty", leading to a reproducibility problem. | ||
28 | # The issue is the inode count for Licnses/README changing due to do_populate_lic hardlinking a | ||
29 | # copy of the file. We avoid this by ensuring the index is updated with a "git diff" before the | ||
30 | # u-boot machinery tries to determine the version. | ||
31 | # | ||
32 | # build$ ../git/scripts/setlocalversion ../git | ||
33 | # "" | ||
34 | # build$ ln ../git/ | ||
35 | # build$ ln ../git/README ../foo | ||
36 | # build$ ../git/scripts/setlocalversion ../git | ||
37 | # ""-dirty | ||
38 | # (i.e. creating a hardlink dirties the index) | ||
39 | cd ${S}; git diff; cd ${B} | ||
40 | |||
26 | oe_runmake -C ${S} sandbox_defconfig O=${B} | 41 | oe_runmake -C ${S} sandbox_defconfig O=${B} |
27 | 42 | ||
28 | # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and | 43 | # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and |