diff options
| author | Tom Rini | 2024-05-21 16:10:07 -0600 |
|---|---|---|
| committer | Tom Rini | 2024-05-21 16:10:07 -0600 |
| commit | 7d24c3e06fa9a3b53cea593d4579886ef0eb4fe8 (patch) | |
| tree | 94c5fa68121f98a9210e7c51cbbb7b4b7a2b0c59 /Makefile | |
| parent | 03de305ec48b0bb28554372abb40ccd46dbe0bf9 (diff) | |
| parent | 5c02350fa03d60ca41a76aca36e788db86cfabf9 (diff) | |
Merge patch series "scripts/setlocalversion sync with linux 6.9"
Rasmus Villemoes <rasmus.villemoes@prevas.dk> says:
The first commit is trivial cleanup. The second syncs
scripts/setlocalversion with linux 6.9, with just a one-line change on
top to account for a Kbuild change that U-Boot has not yet adopted.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1898,8 +1898,11 @@ $(filter-out tools, $(u-boot-dirs)): tools # is "yes"), so compile examples after U-Boot is compiled. examples: $(filter-out examples, $(u-boot-dirs)) +# The setlocalversion script comes from linux and expects a +# KERNELVERSION variable in the environment for figuring out which +# annotated tags are relevant. Pass UBOOTVERSION. define filechk_uboot.release - echo "$(UBOOTVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" + KERNELVERSION=$(UBOOTVERSION) $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree) endef # Store (new) UBOOTRELEASE string in include/config/uboot.release @@ -2426,7 +2429,7 @@ checkstack: $(PERL) $(src)/scripts/checkstack.pl $(ARCH) ubootrelease: - @echo "$(UBOOTVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" + @$(filechk_uboot.release) ubootversion: @echo $(UBOOTVERSION) |