* [PATCH v2] build-sys: fix git version from -version
@ 2020-09-29 14:36 marcandre.lureau
2020-09-29 14:42 ` 罗勇刚(Yonggang Luo)
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: marcandre.lureau @ 2020-09-29 14:36 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, lersek, Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Typo introduced with the script.
Fixes: 2c273f32d3 ("meson: generate qemu-version.h")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
scripts/qemu-version.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh
index 03128c56a2..3f6e7e6d41 100755
--- a/scripts/qemu-version.sh
+++ b/scripts/qemu-version.sh
@@ -9,7 +9,7 @@ version="$3"
if [ -z "$pkgversion" ]; then
cd "$dir"
if [ -e .git ]; then
- pkgversion=$(git describe --match 'v*' --dirty | echo "")
+ pkgversion=$(git describe --match 'v*' --dirty) || :
fi
fi
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] build-sys: fix git version from -version
2020-09-29 14:36 [PATCH v2] build-sys: fix git version from -version marcandre.lureau
@ 2020-09-29 14:42 ` 罗勇刚(Yonggang Luo)
2020-09-29 15:33 ` Marc-André Lureau
2020-09-29 14:52 ` Eric Blake
2020-10-01 10:17 ` Laszlo Ersek
2 siblings, 1 reply; 6+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-09-29 14:42 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: Paolo Bonzini, lersek, qemu-level
[-- Attachment #1: Type: text/plain, Size: 1068 bytes --]
On Tue, Sep 29, 2020 at 10:38 PM <marcandre.lureau@redhat.com> wrote:
>
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Typo introduced with the script.
>
> Fixes: 2c273f32d3 ("meson: generate qemu-version.h")
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> scripts/qemu-version.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh
> index 03128c56a2..3f6e7e6d41 100755
> --- a/scripts/qemu-version.sh
> +++ b/scripts/qemu-version.sh
> @@ -9,7 +9,7 @@ version="$3"
> if [ -z "$pkgversion" ]; then
> cd "$dir"
> if [ -e .git ]; then
> - pkgversion=$(git describe --match 'v*' --dirty | echo "")
> + pkgversion=$(git describe --match 'v*' --dirty) || :
> fi
> fi
>
> --
> 2.26.2
>
>
Maybe this script can convert to python? as we are converting to
meson+python,
for less care about different bash/zsh/xsh differences?
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 1522 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] build-sys: fix git version from -version
2020-09-29 14:42 ` 罗勇刚(Yonggang Luo)
@ 2020-09-29 15:33 ` Marc-André Lureau
2020-09-29 15:56 ` 罗勇刚(Yonggang Luo)
0 siblings, 1 reply; 6+ messages in thread
From: Marc-André Lureau @ 2020-09-29 15:33 UTC (permalink / raw)
To: Yonggang Luo; +Cc: Paolo Bonzini, Laszlo Ersek, qemu-level
[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]
On Tue, Sep 29, 2020 at 6:43 PM 罗勇刚(Yonggang Luo) <luoyonggang@gmail.com>
wrote:
>
>
> On Tue, Sep 29, 2020 at 10:38 PM <marcandre.lureau@redhat.com> wrote:
> >
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > Typo introduced with the script.
> >
> > Fixes: 2c273f32d3 ("meson: generate qemu-version.h")
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
> > scripts/qemu-version.sh | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh
> > index 03128c56a2..3f6e7e6d41 100755
> > --- a/scripts/qemu-version.sh
> > +++ b/scripts/qemu-version.sh
> > @@ -9,7 +9,7 @@ version="$3"
> > if [ -z "$pkgversion" ]; then
> > cd "$dir"
> > if [ -e .git ]; then
> > - pkgversion=$(git describe --match 'v*' --dirty | echo "")
> > + pkgversion=$(git describe --match 'v*' --dirty) || :
> > fi
> > fi
> >
> > --
> > 2.26.2
> >
> >
> Maybe this script can convert to python? as we are converting to
> meson+python,
> for less care about different bash/zsh/xsh differences?
>
You are welcome to do it :)
thanks
> --
> 此致
> 礼
> 罗勇刚
> Yours
> sincerely,
> Yonggang Luo
>
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 2316 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] build-sys: fix git version from -version
2020-09-29 15:33 ` Marc-André Lureau
@ 2020-09-29 15:56 ` 罗勇刚(Yonggang Luo)
0 siblings, 0 replies; 6+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-09-29 15:56 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: Paolo Bonzini, Laszlo Ersek, qemu-level
[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]
On Tue, Sep 29, 2020 at 11:33 PM Marc-André Lureau <
marcandre.lureau@gmail.com> wrote:
>
>
>
> On Tue, Sep 29, 2020 at 6:43 PM 罗勇刚(Yonggang Luo) <luoyonggang@gmail.com>
wrote:
>>
>>
>>
>> On Tue, Sep 29, 2020 at 10:38 PM <marcandre.lureau@redhat.com> wrote:
>> >
>> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
>> >
>> > Typo introduced with the script.
>> >
>> > Fixes: 2c273f32d3 ("meson: generate qemu-version.h")
>> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> > ---
>> > scripts/qemu-version.sh | 2 +-
>> > 1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh
>> > index 03128c56a2..3f6e7e6d41 100755
>> > --- a/scripts/qemu-version.sh
>> > +++ b/scripts/qemu-version.sh
>> > @@ -9,7 +9,7 @@ version="$3"
>> > if [ -z "$pkgversion" ]; then
>> > cd "$dir"
>> > if [ -e .git ]; then
>> > - pkgversion=$(git describe --match 'v*' --dirty | echo "")
>> > + pkgversion=$(git describe --match 'v*' --dirty) || :
>> > fi
>> > fi
>> >
>> > --
>> > 2.26.2
>> >
>> >
>> Maybe this script can convert to python? as we are converting to
meson+python,
>> for less care about different bash/zsh/xsh differences?
>
>
> You are welcome to do it :)
> thanks
No problem. I've done one before.
>
>>
>> --
>> 此致
>> 礼
>> 罗勇刚
>> Yours
>> sincerely,
>> Yonggang Luo
>
>
>
> --
> Marc-André Lureau
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 2506 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] build-sys: fix git version from -version
2020-09-29 14:36 [PATCH v2] build-sys: fix git version from -version marcandre.lureau
2020-09-29 14:42 ` 罗勇刚(Yonggang Luo)
@ 2020-09-29 14:52 ` Eric Blake
2020-10-01 10:17 ` Laszlo Ersek
2 siblings, 0 replies; 6+ messages in thread
From: Eric Blake @ 2020-09-29 14:52 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel; +Cc: pbonzini, lersek
[-- Attachment #1.1: Type: text/plain, Size: 1004 bytes --]
On 9/29/20 9:36 AM, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Typo introduced with the script.
>
> Fixes: 2c273f32d3 ("meson: generate qemu-version.h")
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> scripts/qemu-version.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Reviewed-by: Eric Blake <eblake@redhat.com>
> diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh
> index 03128c56a2..3f6e7e6d41 100755
> --- a/scripts/qemu-version.sh
> +++ b/scripts/qemu-version.sh
> @@ -9,7 +9,7 @@ version="$3"
> if [ -z "$pkgversion" ]; then
> cd "$dir"
> if [ -e .git ]; then
> - pkgversion=$(git describe --match 'v*' --dirty | echo "")
> + pkgversion=$(git describe --match 'v*' --dirty) || :
> fi
> fi
>
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] build-sys: fix git version from -version
2020-09-29 14:36 [PATCH v2] build-sys: fix git version from -version marcandre.lureau
2020-09-29 14:42 ` 罗勇刚(Yonggang Luo)
2020-09-29 14:52 ` Eric Blake
@ 2020-10-01 10:17 ` Laszlo Ersek
2 siblings, 0 replies; 6+ messages in thread
From: Laszlo Ersek @ 2020-10-01 10:17 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel; +Cc: pbonzini
On 09/29/20 16:36, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Typo introduced with the script.
>
> Fixes: 2c273f32d3 ("meson: generate qemu-version.h")
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> scripts/qemu-version.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh
> index 03128c56a2..3f6e7e6d41 100755
> --- a/scripts/qemu-version.sh
> +++ b/scripts/qemu-version.sh
> @@ -9,7 +9,7 @@ version="$3"
> if [ -z "$pkgversion" ]; then
> cd "$dir"
> if [ -e .git ]; then
> - pkgversion=$(git describe --match 'v*' --dirty | echo "")
> + pkgversion=$(git describe --match 'v*' --dirty) || :
> fi
> fi
>
>
Reported-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Thanks!
Laszlo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-01 10:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-29 14:36 [PATCH v2] build-sys: fix git version from -version marcandre.lureau
2020-09-29 14:42 ` 罗勇刚(Yonggang Luo)
2020-09-29 15:33 ` Marc-André Lureau
2020-09-29 15:56 ` 罗勇刚(Yonggang Luo)
2020-09-29 14:52 ` Eric Blake
2020-10-01 10:17 ` Laszlo Ersek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.