From a5859a5932a5674ba590d2b45bd2c688e59af5e4 Mon Sep 17 00:00:00 2001 From: ghost Date: Thu, 16 Dec 2010 01:21:10 +0100 Subject: [PATCH 1/1] add support for .git/last_commit_info generated by bitbake with latest "hack" --- main/Makefile.am | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/main/Makefile.am b/main/Makefile.am index 4f26387e..975432c5 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -31,11 +31,15 @@ version.h: entries echo "#define ENIGMA2_LAST_CHANGE_DATE \"`LANG="en" svn info | grep 'Last Changed Date:' | cut -d' ' -f4`\"" >> version.h; \ elif [ -d ../.git ]; then \ if [ -f ../.git/last_commit_info ]; then \ - echo "#define ENIGMA2_LAST_CHANGE_DATE \"`cat ../.git/last_commit_info | grep 'Date:' | cut -d' ' -f4`\"" >> version.h; \ + LAST_CHANGE_DATE=`cat ../.git/last_commit_info | grep 'CommitDate:' | cut -d' ' -f2`; \ + if [ "$$LAST_CHANGE_DATE" = "" ]; then \ + LAST_CHANGE_DATE=`cat ../.git/last_commit_info | grep 'Date:' | cut -d' ' -f4`; \ + fi; \ + echo "#define ENIGMA2_LAST_CHANGE_DATE \"$$LAST_CHANGE_DATE\"" >> version.h; \ echo "#define ENIGMA2_BRANCH \"`cat ../.git/branch`\"" >> version.h; \ else \ - echo "#define ENIGMA2_LAST_CHANGE_DATE \"`LANG="en" git log --max-count=1 --date=short | grep 'Date:' | cut -d' ' -f4`\"" >> version.h; \ - echo "#define ENIGMA2_BRANCH \"`LANG="en" git branch | grep '* ' | cut -d' ' -f2`\"" >> version.h; \ + echo "#define ENIGMA2_LAST_CHANGE_DATE \"`LANG="en" git log --pretty=fuller --max-count=1 --date=short | grep 'CommitDate:' | cut -d' ' -f2`\"" >> version.h; \ + echo "#define ENIGMA2_BRANCH \"`LANG=\"en\" git branch | grep '* ' | cut -d' ' -f2`\"" >> version.h; \ fi; \ fi; -- 2.30.2