[PATCHv2,2/4] scripts/git_hash: change repo to CUSTOM_STR

Message ID 1439558708-31151-3-git-send-email-anders.roxell@linaro.org
State New
Headers show

Commit Message

Anders Roxell Aug. 14, 2015, 1:25 p.m.
other platforms should export CUSTOM_STR in their
platform/<target>/Makefile.am

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
 platform/linux-generic/Makefile.am | 3 +++
 scripts/git_hash.sh                | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

Comments

Mike Holmes Aug. 17, 2015, 7:56 p.m. | #1
On 14 August 2015 at 09:25, Anders Roxell <anders.roxell@linaro.org> wrote:

> other platforms should export CUSTOM_STR in their
> platform/<target>/Makefile.am
>
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
> ---
>  platform/linux-generic/Makefile.am | 3 +++
>  scripts/git_hash.sh                | 4 ++--
>  2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/platform/linux-generic/Makefile.am
> b/platform/linux-generic/Makefile.am
> index fb145e7..a6f12a1 100644
> --- a/platform/linux-generic/Makefile.am
> +++ b/platform/linux-generic/Makefile.am
> @@ -1,3 +1,6 @@
> +# Uncomment this in you need to change the CUSTOM_STR string
>

Typo: in --> if, maybe that could be fixed when pushed Maxim ?

Otherwise for the series Reviewed-and-tested-by:Mike Holmes <
mike.holmes@linaro.org>


> +#export CUSTOM_STR=https://git.linaro.org/lng/odp.git
> +
>  include $(top_srcdir)/platform/Makefile.inc
>
>  AM_CFLAGS +=  -I$(srcdir)/include
> diff --git a/scripts/git_hash.sh b/scripts/git_hash.sh
> index 48ae24e..6cfec2f 100755
> --- a/scripts/git_hash.sh
> +++ b/scripts/git_hash.sh
> @@ -6,14 +6,14 @@ if [ -z ${1} ]; then
>  fi
>  ROOTDIR=${1}
>
> -repo=https://git.linaro.org/lng/odp.git
> +CUSTOM_STR=${CUSTOM_STR:-https://git.linaro.org/lng/odp.git}
>  if [ -d ${ROOTDIR}/.git ]; then
>         hash=$(git describe | tr -d "\n")
>         if git diff-index --name-only HEAD &>/dev/null ; then
>                 dirty=-dirty
>         fi
>
> -       echo -n "'${repo}' (${hash}${dirty})">${ROOTDIR}/.scmversion
> +       echo -n "'${CUSTOM_STR}' (${hash}${dirty})">${ROOTDIR}/.scmversion
>  fi
>
>  cat ${ROOTDIR}/.scmversion
> --
> 2.1.4
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/lng-odp
>

Patch

diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index fb145e7..a6f12a1 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -1,3 +1,6 @@ 
+# Uncomment this in you need to change the CUSTOM_STR string
+#export CUSTOM_STR=https://git.linaro.org/lng/odp.git
+
 include $(top_srcdir)/platform/Makefile.inc
 
 AM_CFLAGS +=  -I$(srcdir)/include
diff --git a/scripts/git_hash.sh b/scripts/git_hash.sh
index 48ae24e..6cfec2f 100755
--- a/scripts/git_hash.sh
+++ b/scripts/git_hash.sh
@@ -6,14 +6,14 @@  if [ -z ${1} ]; then
 fi
 ROOTDIR=${1}
 
-repo=https://git.linaro.org/lng/odp.git
+CUSTOM_STR=${CUSTOM_STR:-https://git.linaro.org/lng/odp.git}
 if [ -d ${ROOTDIR}/.git ]; then
 	hash=$(git describe | tr -d "\n")
 	if git diff-index --name-only HEAD &>/dev/null ; then
 		dirty=-dirty
 	fi
 
-	echo -n "'${repo}' (${hash}${dirty})">${ROOTDIR}/.scmversion
+	echo -n "'${CUSTOM_STR}' (${hash}${dirty})">${ROOTDIR}/.scmversion
 fi
 
 cat ${ROOTDIR}/.scmversion