mbox series

[v3,0/6] GIT-VERSION-GEN: fix overriding values

Message ID 20241220-b4-pks-git-version-via-environment-v3-0-1fd79b52a5fb@pks.im (mailing list archive)
Headers show
Series GIT-VERSION-GEN: fix overriding values | expand

Message

Patrick Steinhardt Dec. 20, 2024, 7:44 p.m. UTC 
Hi,

Peff reported that overriding GIT_VERSION and GIT_DATE broke recently
due to the refactoring of GIT-VERSION-GEN. This small commit series
fixes those cases, but also fixes the equivalent issue with
GIT_BUILT_FROM_COMMIT.

Changes in v2:

  - Don't strip leading `v`s when `GIT_VERSION` was set explicitly.
  - Allow setting build info via "config.mak" again.
  - Wire up build info options for Meson.
  - Link to v1: https://lore.kernel.org/r/20241219-b4-pks-git-version-via-environment-v1-0-9393af058240@pks.im

Changes in v3:
  - Redo things such that we use Makefile templates instead and a
    separate GIT_VERSION_OVERRIDE variable. This requires a bit of
    shuffling, but fixes a problem where the version becomes "stuck" due
    to how Makefiles handle includes.
  - Add another patch to stop including GIT-VERSION-FILE in
    Documentation/Makefile.
  - Improve code flow in GIT-VERSION-GEN.
  - Link to v2: https://lore.kernel.org/r/20241220-b4-pks-git-version-via-environment-v2-0-f1457a5e8c38@pks.im

Thanks!

Patrick

---
Patrick Steinhardt (6):
      Makefile: stop including "GIT-VERSION-FILE" in docs
      Makefile: drop unneeded indirection for GIT-VERSION-GEN outputs
      Makefile: introduce template for GIT-VERSION-GEN
      GIT-VERSION-GEN: fix overriding GIT_VERSION
      GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE
      meson: add options to override build information

 Documentation/Makefile    | 17 +++++---------
 Documentation/meson.build |  1 +
 GIT-VERSION-GEN           | 58 ++++++++++++++++++++++++++++-------------------
 Makefile                  | 25 +++++++++++---------
 meson.build               | 13 +++++++++++
 meson_options.txt         | 10 ++++++++
 shared.mak                | 11 +++++++++
 7 files changed, 90 insertions(+), 45 deletions(-)

Range-diff versus v2:

1:  16c647d30b < -:  ---------- GIT-VERSION-GEN: fix overriding version via environment
2:  819154dc77 < -:  ---------- GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE
-:  ---------- > 1:  dadeded025 Makefile: stop including "GIT-VERSION-FILE" in docs
3:  b658a5a42f = 2:  e5a4fff080 Makefile: drop unneeded indirection for GIT-VERSION-GEN outputs
4:  79b407d6a2 < -:  ---------- Makefile: respect build info declared in "config.mak"
-:  ---------- > 3:  c271f33aeb Makefile: introduce template for GIT-VERSION-GEN
-:  ---------- > 4:  c4f2c8aa17 GIT-VERSION-GEN: fix overriding GIT_VERSION
-:  ---------- > 5:  5d231080e0 GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE
5:  26feb8bc81 = 6:  53bcb815c4 meson: add options to override build information

---
base-commit: d882f382b3d939d90cfa58d17b17802338f05d66
change-id: 20241219-b4-pks-git-version-via-environment-035490abec26