From: Vagrant Cascadian <vagrant@debian.org>
Date: Fri, 12 Mar 2021 23:00:43 +0000 (+0000)
Subject: add-debian-revision-to-u-boot-version
X-Git-Tag: archive/raspbian/2021.01+dfsg-4+rpi1~1^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=69438c62d2ed5f0722cf5d5264b3486f577f5cc0;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 b4f1cbcf9..fc94ab35c 100644
--- a/Makefile
+++ b/Makefile
@@ -447,7 +447,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