[MONARCH_LTS,PATCHv2,1/2] scripts/git_hash.sh: to support monarch_lts tags

Message ID 1470842750-25147-2-git-send-email-maxim.uvarov@linaro.org
State New
Headers show

Commit Message

Maxim Uvarov Aug. 10, 2016, 3:25 p.m.
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
 scripts/git_hash.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.7.1.250.gff4ea60

Comments

Anders Roxell Aug. 17, 2016, 5:31 p.m. | #1
On 2016-08-10 18:25, Maxim Uvarov wrote:
> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

> ---

>  scripts/git_hash.sh | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/scripts/git_hash.sh b/scripts/git_hash.sh

> index 336eb01..35b8749 100755

> --- a/scripts/git_hash.sh

> +++ b/scripts/git_hash.sh

> @@ -7,7 +7,7 @@ fi

>  ROOTDIR=${1}

>  

>  if [ -d ${ROOTDIR}/.git ]; then

> -	hash=$(git --git-dir=${ROOTDIR}/.git describe --match 'v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*'\

> +	hash=$(git --git-dir=${ROOTDIR}/.git describe --match 'v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*-monarch'\

>  	       | tr -d "\n")

>  	if [[ $(git --git-dir=${ROOTDIR}/.git diff --shortstat 2> /dev/null \

>  		| tail -n1) != "" ]]; then

> -- 

> 2.7.1.250.gff4ea60

> 


We don't need this patch if we change the monarch_lts tag to
v1.11.0.0_monarch_lts and not v1.11.0.0-monarch_lts.

Use an underscore and not a dash before monarch_lts.

See my comment in you v1 of this patch [1].

Cheers,
Anders
[1] https://lists.linaro.org/pipermail/lng-odp/2016-August/025139.html
Maxim Uvarov Aug. 17, 2016, 6:46 p.m. | #2
On 08/17/16 20:31, Anders Roxell wrote:
> On 2016-08-10 18:25, Maxim Uvarov wrote:

>> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

>> ---

>>   scripts/git_hash.sh | 2 +-

>>   1 file changed, 1 insertion(+), 1 deletion(-)

>>

>> diff --git a/scripts/git_hash.sh b/scripts/git_hash.sh

>> index 336eb01..35b8749 100755

>> --- a/scripts/git_hash.sh

>> +++ b/scripts/git_hash.sh

>> @@ -7,7 +7,7 @@ fi

>>   ROOTDIR=${1}

>>   

>>   if [ -d ${ROOTDIR}/.git ]; then

>> -	hash=$(git --git-dir=${ROOTDIR}/.git describe --match 'v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*'\

>> +	hash=$(git --git-dir=${ROOTDIR}/.git describe --match 'v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*-monarch'\

>>   	       | tr -d "\n")

>>   	if [[ $(git --git-dir=${ROOTDIR}/.git diff --shortstat 2> /dev/null \

>>   		| tail -n1) != "" ]]; then

>> -- 

>> 2.7.1.250.gff4ea60

>>

> We don't need this patch if we change the monarch_lts tag to

> v1.11.0.0_monarch_lts and not v1.11.0.0-monarch_lts.

>

> Use an underscore and not a dash before monarch_lts.

>

> See my comment in you v1 of this patch [1].

>

> Cheers,

> Anders

> [1] https://lists.linaro.org/pipermail/lng-odp/2016-August/025139.html

 From call Mike said that it's better to remove "_lts" from tag name 
because it's clear that it is lts.
(I hope I understood him correctly).

Looks like I missed the last comment sorry. Agree that this patch can be 
dropped.

Maxim.
Mike Holmes Aug. 17, 2016, 7:16 p.m. | #3
On 17 August 2016 at 14:46, Maxim Uvarov <maxim.uvarov@linaro.org> wrote:

> On 08/17/16 20:31, Anders Roxell wrote:

>

>> On 2016-08-10 18:25, Maxim Uvarov wrote:

>>

>>> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

>>> ---

>>>   scripts/git_hash.sh | 2 +-

>>>   1 file changed, 1 insertion(+), 1 deletion(-)

>>>

>>> diff --git a/scripts/git_hash.sh b/scripts/git_hash.sh

>>> index 336eb01..35b8749 100755

>>> --- a/scripts/git_hash.sh

>>> +++ b/scripts/git_hash.sh

>>> @@ -7,7 +7,7 @@ fi

>>>   ROOTDIR=${1}

>>>     if [ -d ${ROOTDIR}/.git ]; then

>>> -       hash=$(git --git-dir=${ROOTDIR}/.git describe --match

>>> 'v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*'\

>>> +       hash=$(git --git-dir=${ROOTDIR}/.git describe --match

>>> 'v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*-monarch'\

>>>                | tr -d "\n")

>>>         if [[ $(git --git-dir=${ROOTDIR}/.git diff --shortstat 2>

>>> /dev/null \

>>>                 | tail -n1) != "" ]]; then

>>> --

>>> 2.7.1.250.gff4ea60

>>>

>>> We don't need this patch if we change the monarch_lts tag to

>> v1.11.0.0_monarch_lts and not v1.11.0.0-monarch_lts.

>>

>> Use an underscore and not a dash before monarch_lts.

>>

>> See my comment in you v1 of this patch [1].

>>

>> Cheers,

>> Anders

>> [1] https://lists.linaro.org/pipermail/lng-odp/2016-August/025139.html

>>

> From call Mike said that it's better to remove "_lts" from tag name

> because it's clear that it is lts.

> (I hope I understood him correctly).

>


I think that is true, named tags are LTS, all the rest are just the API
 numbers vx.x.x.x



>

> Looks like I missed the last comment sorry. Agree that this patch can be

> dropped.

>

> Maxim.

>




-- 
Mike Holmes
Technical Manager - Linaro Networking Group
Linaro.org <http://www.linaro.org/> *│ *Open source software for ARM SoCs
"Work should be fun and collaborative, the rest follows"

Patch

diff --git a/scripts/git_hash.sh b/scripts/git_hash.sh
index 336eb01..35b8749 100755
--- a/scripts/git_hash.sh
+++ b/scripts/git_hash.sh
@@ -7,7 +7,7 @@  fi
 ROOTDIR=${1}
 
 if [ -d ${ROOTDIR}/.git ]; then
-	hash=$(git --git-dir=${ROOTDIR}/.git describe --match 'v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*'\
+	hash=$(git --git-dir=${ROOTDIR}/.git describe --match 'v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*-monarch'\
 	       | tr -d "\n")
 	if [[ $(git --git-dir=${ROOTDIR}/.git diff --shortstat 2> /dev/null \
 		| tail -n1) != "" ]]; then