0001-fix-version.patch 911 B

12345678910111213141516171819202122
  1. Always use the fallback behaviour for determining the version number
  2. When built from within buildroot the micropython build process detects
  3. that it is inside a git repository and ends up using the buildroot
  4. version number instead of the correct micropython version number.
  5. Signed-off-by: Chris Packham <judge.packham@gmail.com>
  6. ---
  7. diff -Naur micropython-v1.4.5-old/py/makeversionhdr.py micropython-v1.4.5/py/makeversionhdr.py
  8. --- micropython-v1.4.5-old/py/makeversionhdr.py 2015-08-12 00:42:30.000000000 +1200
  9. +++ micropython-v1.4.5/py/makeversionhdr.py 2015-09-16 10:21:06.698962836 +1200
  10. @@ -70,9 +70,7 @@
  11. def make_version_header(filename):
  12. # Get version info using git, with fallback to docs/conf.py
  13. - info = get_version_info_from_git()
  14. - if info is None:
  15. - info = get_version_info_from_docs_conf()
  16. + info = get_version_info_from_docs_conf()
  17. git_tag, git_hash, ver = info