From da418f1395bf51cf43f2a79562ea7288d9926af0 Mon Sep 17 00:00:00 2001 From: hmz007 Date: Tue, 29 Oct 2024 20:16:11 +0800 Subject: [PATCH] rockchip: Minor fixes for generating version.h Signed-off-by: hmz007 --- hardware/rockchip/libmpimmz/Android.bp | 1 - hardware/rockchip/libmpimmz/version.sh | 17 ++++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/hardware/rockchip/libmpimmz/Android.bp b/hardware/rockchip/libmpimmz/Android.bp index 14f13c46f08..8f43aef4ddf 100644 --- a/hardware/rockchip/libmpimmz/Android.bp +++ b/hardware/rockchip/libmpimmz/Android.bp @@ -26,7 +26,6 @@ genrule { srcs: libmpimmz_src + [ "version.sh", "version.h.template", - ".git/HEAD" ], out: ["version.h"], cmd: "bash $(location version.sh) < $(in) > $(out)", diff --git a/hardware/rockchip/libmpimmz/version.sh b/hardware/rockchip/libmpimmz/version.sh index 97c0f198193..872c959c499 100644 --- a/hardware/rockchip/libmpimmz/version.sh +++ b/hardware/rockchip/libmpimmz/version.sh @@ -1,14 +1,21 @@ #!/bin/bash rm -f version.h -COMMIT_INFO=$(cd $(dirname $0) && git log -1 --oneline --date=short --pretty=format:"%h date: %cd author: %<|(20)%an") -BUILD_TIME=$(date "+%G-%m-%d %H:%M:%S") -MPI_MMZ_VERSION="build:$BUILD_TIME git-$COMMIT_INFO" +CURRENTDIR=$(dirname $0) + +if [ -d $CURRENTDIR/.git ]; then + COMMIT_INFO=$(cd $CURRENTDIR && \ + git log -1 --oneline --date=short --pretty=format:"%h date: %cd author: %<|(20)%an") +else + COMMIT_INFO="e504f0e date: 2021-06-08 author: Meiyou Chen" +fi + +MPI_MMZ_VERSION="git-$COMMIT_INFO" #Only when compiling with CMAKE in linux, will the current directory generate version.h. if [ $TARGET_PRODUCT ];then - cat $(dirname $0)/version.h.template | sed "s/\$FULL_VERSION/$MPI_MMZ_VERSION/g" + cat $CURRENTDIR/version.h.template | sed "s/\$FULL_VERSION/$MPI_MMZ_VERSION/g" else - cat $(dirname $0)/version.h.template | sed "s/\$FULL_VERSION/$MPI_MMZ_VERSION/g" > $(dirname $0)/version.h + cat $CURRENTDIR/version.h.template | sed "s/\$FULL_VERSION/$MPI_MMZ_VERSION/g" > $(dirname $0)/version.h echo "Generated version.h" fi