From a04bffebbab51f7728e3bc2c5438f00508c5e708 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Mon, 18 Jan 2021 16:54:26 +0100 Subject: arm-trusted-firmware-mvebu: pass commit ids to a3700-utils/mv-ddr-marvell The two required tools fail to identify their version when not compiling from a git clone, patch that in and pass on the used commit hashes. Upon boot it now prints "WTMI-devel-18.12.1-5598e150". Signed-off-by: Andre Heider --- .../patches-mv-ddr-marvell/001-version.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 package/boot/arm-trusted-firmware-mvebu/patches-mv-ddr-marvell/001-version.patch (limited to 'package/boot/arm-trusted-firmware-mvebu/patches-mv-ddr-marvell') diff --git a/package/boot/arm-trusted-firmware-mvebu/patches-mv-ddr-marvell/001-version.patch b/package/boot/arm-trusted-firmware-mvebu/patches-mv-ddr-marvell/001-version.patch new file mode 100644 index 0000000000..1c7c61d43c --- /dev/null +++ b/package/boot/arm-trusted-firmware-mvebu/patches-mv-ddr-marvell/001-version.patch @@ -0,0 +1,12 @@ +diff --git a/scripts/localversion.sh b/scripts/localversion.sh +--- a/scripts/localversion.sh ++++ b/scripts/localversion.sh +@@ -103,7 +103,7 @@ MV_DDR_ROOT=$1 + MV_DDR_VER_CSRC=$2 + + # get mv_ddr git commit id +-MV_DDR_COMMIT_ID=`git -C $MV_DDR_ROOT rev-parse --verify --quiet --short HEAD 2> /dev/null` ++test -z "$MV_DDR_COMMIT_ID" && MV_DDR_COMMIT_ID=`git -C $MV_DDR_ROOT rev-parse --verify --quiet --short HEAD 2> /dev/null` + + # check for uncommitted changes in mv_ddr git + MV_DDR_DIRTY_CHK=`git -C $MV_DDR_ROOT diff-index --name-only HEAD 2> /dev/null` -- cgit v1.2.3