From: Vagrant Cascadian <vagrant@debian.org>
Date: Tue, 21 Apr 2020 02:34:37 +0000 (+0100)
Subject: add-debian-revision-to-u-boot-version
X-Git-Tag: archive/raspbian/2020.07+dfsg-2+rpi1^2^2^2~19
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=95056762dc47c557caf5c886443d4c1edbd30aad;p=u-boot.git

add-debian-revision-to-u-boot-version

Add the debian revision to the U-boot version, which is displayed at
boot and can be helpful to determine which specific version is used.


Gbp-Pq: Name add-debian-revision-to-u-boot-version
---

diff --git a/Makefile b/Makefile
index 7c2067f35..ff123a050 100644
--- a/Makefile
+++ b/Makefile
@@ -424,7 +424,7 @@ KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)
 
 # Read UBOOTRELEASE from include/config/uboot.release (if it exists)
 UBOOTRELEASE = $(shell cat include/config/uboot.release 2> /dev/null)
-UBOOTVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
+UBOOTVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)$(DEBIAN_REVISION)
 
 export VERSION PATCHLEVEL SUBLEVEL UBOOTRELEASE UBOOTVERSION
 export ARCH CPU BOARD VENDOR SOC CPUDIR BOARDDIR