1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH v2] gitmodules: use qemu.org git mirrors

Stefan Hajnoczi posted 1 patch 5 years ago
Failed in applying to current master (apply log)
.gitmodules | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
[Qemu-devel] [PATCH v2] gitmodules: use qemu.org git mirrors
Posted by Stefan Hajnoczi 5 years ago 
qemu.org hosts git repository mirrors of all submodules.  Update
.gitmodules to use the mirrors and not the upstream repositories.

Mirroring upstream repositories ensures that QEMU continues to build
even when upstream repositories are deleted or temporarily offline.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 .gitmodules | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index aa77ce6f50..2857eec763 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -39,19 +39,19 @@
 	url = https://git.qemu.org/git/capstone.git
 [submodule "roms/seabios-hppa"]
 	path = roms/seabios-hppa
-	url = https://github.com/hdeller/seabios-hppa.git
+	url = https://git.qemu.org/git/seabios-hppa.git
 [submodule "roms/u-boot-sam460ex"]
 	path = roms/u-boot-sam460ex
 	url = https://git.qemu.org/git/u-boot-sam460ex.git
 [submodule "tests/fp/berkeley-testfloat-3"]
 	path = tests/fp/berkeley-testfloat-3
-	url = https://github.com/cota/berkeley-testfloat-3
+	url = https://git.qemu.org/git/berkeley-testfloat-3.git
 [submodule "tests/fp/berkeley-softfloat-3"]
 	path = tests/fp/berkeley-softfloat-3
-	url = https://github.com/cota/berkeley-softfloat-3
+	url = https://git.qemu.org/git/berkeley-softfloat-3.git
 [submodule "roms/edk2"]
 	path = roms/edk2
-	url = https://github.com/tianocore/edk2.git
+	url = https://git.qemu.org/git/edk2.git
 [submodule "slirp"]
 	path = slirp
-	url = https://gitlab.freedesktop.org/slirp/libslirp.git
+	url = https://git.qemu.org/git/libslirp.git
-- 
2.20.1
Re: [Qemu-devel] [PATCH v2] gitmodules: use qemu.org git mirrors
Posted by Marc-André Lureau 5 years ago 
Hi

On Thu, Apr 25, 2019 at 4:54 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> qemu.org hosts git repository mirrors of all submodules.  Update
> .gitmodules to use the mirrors and not the upstream repositories.
>
> Mirroring upstream repositories ensures that QEMU continues to build
> even when upstream repositories are deleted or temporarily offline.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Stefan, do you prepare a pullreq?

> ---
>  .gitmodules | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/.gitmodules b/.gitmodules
> index aa77ce6f50..2857eec763 100644
> --- a/.gitmodules
> +++ b/.gitmodules
> @@ -39,19 +39,19 @@
>         url = https://git.qemu.org/git/capstone.git
>  [submodule "roms/seabios-hppa"]
>         path = roms/seabios-hppa
> -       url = https://github.com/hdeller/seabios-hppa.git
> +       url = https://git.qemu.org/git/seabios-hppa.git
>  [submodule "roms/u-boot-sam460ex"]
>         path = roms/u-boot-sam460ex
>         url = https://git.qemu.org/git/u-boot-sam460ex.git
>  [submodule "tests/fp/berkeley-testfloat-3"]
>         path = tests/fp/berkeley-testfloat-3
> -       url = https://github.com/cota/berkeley-testfloat-3
> +       url = https://git.qemu.org/git/berkeley-testfloat-3.git
>  [submodule "tests/fp/berkeley-softfloat-3"]
>         path = tests/fp/berkeley-softfloat-3
> -       url = https://github.com/cota/berkeley-softfloat-3
> +       url = https://git.qemu.org/git/berkeley-softfloat-3.git
>  [submodule "roms/edk2"]
>         path = roms/edk2
> -       url = https://github.com/tianocore/edk2.git
> +       url = https://git.qemu.org/git/edk2.git
>  [submodule "slirp"]
>         path = slirp
> -       url = https://gitlab.freedesktop.org/slirp/libslirp.git
> +       url = https://git.qemu.org/git/libslirp.git
> --
> 2.20.1
>
>


-- 
Marc-André Lureau
Re: [Qemu-devel] [PATCH v2] gitmodules: use qemu.org git mirrors
Posted by Stefan Hajnoczi 5 years ago 
On Tue, Apr 30, 2019 at 04:53:08PM +0200, Marc-André Lureau wrote:
> Hi
> 
> On Thu, Apr 25, 2019 at 4:54 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
> >
> > qemu.org hosts git repository mirrors of all submodules.  Update
> > .gitmodules to use the mirrors and not the upstream repositories.
> >
> > Mirroring upstream repositories ensures that QEMU continues to build
> > even when upstream repositories are deleted or temporarily offline.
> >
> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> 
> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Stefan, do you prepare a pullreq?

This patch isn't within the scope of my block or tracing trees.

Perhaps Peter is willing to apply it?

Stefan
Re: [Qemu-devel] [PATCH v2] gitmodules: use qemu.org git mirrors
Posted by Philippe Mathieu-Daudé 5 years ago 
On 5/1/19 7:06 PM, Stefan Hajnoczi wrote:
> On Tue, Apr 30, 2019 at 04:53:08PM +0200, Marc-André Lureau wrote:
>> Hi
>>
>> On Thu, Apr 25, 2019 at 4:54 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
>>>
>>> qemu.org hosts git repository mirrors of all submodules.  Update
>>> .gitmodules to use the mirrors and not the upstream repositories.
>>>
>>> Mirroring upstream repositories ensures that QEMU continues to build
>>> even when upstream repositories are deleted or temporarily offline.
>>>
>>> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
>>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>
>> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Stefan, do you prepare a pullreq?
> 
> This patch isn't within the scope of my block or tracing trees.

Peter often applies those patches directly, see:
https://lists.gnu.org/archive/html/qemu-devel/2018-11/msg02073.html

> 
> Perhaps Peter is willing to apply it?
> 
> Stefan
>
Re: [Qemu-devel] [PATCH v2] gitmodules: use qemu.org git mirrors
Posted by Stefan Hajnoczi 5 years ago 
On Thu, Apr 25, 2019 at 03:54:20PM +0100, Stefan Hajnoczi wrote:
> qemu.org hosts git repository mirrors of all submodules.  Update
> .gitmodules to use the mirrors and not the upstream repositories.
> 
> Mirroring upstream repositories ensures that QEMU continues to build
> even when upstream repositories are deleted or temporarily offline.
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  .gitmodules | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Ping?

> diff --git a/.gitmodules b/.gitmodules
> index aa77ce6f50..2857eec763 100644
> --- a/.gitmodules
> +++ b/.gitmodules
> @@ -39,19 +39,19 @@
>  	url = https://git.qemu.org/git/capstone.git
>  [submodule "roms/seabios-hppa"]
>  	path = roms/seabios-hppa
> -	url = https://github.com/hdeller/seabios-hppa.git
> +	url = https://git.qemu.org/git/seabios-hppa.git
>  [submodule "roms/u-boot-sam460ex"]
>  	path = roms/u-boot-sam460ex
>  	url = https://git.qemu.org/git/u-boot-sam460ex.git
>  [submodule "tests/fp/berkeley-testfloat-3"]
>  	path = tests/fp/berkeley-testfloat-3
> -	url = https://github.com/cota/berkeley-testfloat-3
> +	url = https://git.qemu.org/git/berkeley-testfloat-3.git
>  [submodule "tests/fp/berkeley-softfloat-3"]
>  	path = tests/fp/berkeley-softfloat-3
> -	url = https://github.com/cota/berkeley-softfloat-3
> +	url = https://git.qemu.org/git/berkeley-softfloat-3.git
>  [submodule "roms/edk2"]
>  	path = roms/edk2
> -	url = https://github.com/tianocore/edk2.git
> +	url = https://git.qemu.org/git/edk2.git
>  [submodule "slirp"]
>  	path = slirp
> -	url = https://gitlab.freedesktop.org/slirp/libslirp.git
> +	url = https://git.qemu.org/git/libslirp.git
> -- 
> 2.20.1
> 
>
Re: [Qemu-devel] [PATCH v2] gitmodules: use qemu.org git mirrors
Posted by Peter Maydell 5 years ago 
On Wed, 1 May 2019 at 17:20, Stefan Hajnoczi <stefanha@gmail.com> wrote:
>
> On Thu, Apr 25, 2019 at 03:54:20PM +0100, Stefan Hajnoczi wrote:
> > qemu.org hosts git repository mirrors of all submodules.  Update
> > .gitmodules to use the mirrors and not the upstream repositories.
> >
> > Mirroring upstream repositories ensures that QEMU continues to build
> > even when upstream repositories are deleted or temporarily offline.
> >
> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > ---
> >  .gitmodules | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
>
> Ping?
>
> > diff --git a/.gitmodules b/.gitmodules
> > index aa77ce6f50..2857eec763 100644
> > --- a/.gitmodules
> > +++ b/.gitmodules
> > @@ -39,19 +39,19 @@
> >       url = https://git.qemu.org/git/capstone.git
> >  [submodule "roms/seabios-hppa"]
> >       path = roms/seabios-hppa
> > -     url = https://github.com/hdeller/seabios-hppa.git
> > +     url = https://git.qemu.org/git/seabios-hppa.git
> >  [submodule "roms/u-boot-sam460ex"]
> >       path = roms/u-boot-sam460ex
> >       url = https://git.qemu.org/git/u-boot-sam460ex.git
> >  [submodule "tests/fp/berkeley-testfloat-3"]
> >       path = tests/fp/berkeley-testfloat-3
> > -     url = https://github.com/cota/berkeley-testfloat-3
> > +     url = https://git.qemu.org/git/berkeley-testfloat-3.git
> >  [submodule "tests/fp/berkeley-softfloat-3"]
> >       path = tests/fp/berkeley-softfloat-3
> > -     url = https://github.com/cota/berkeley-softfloat-3
> > +     url = https://git.qemu.org/git/berkeley-softfloat-3.git
> >  [submodule "roms/edk2"]
> >       path = roms/edk2
> > -     url = https://github.com/tianocore/edk2.git
> > +     url = https://git.qemu.org/git/edk2.git
> >  [submodule "slirp"]
> >       path = slirp
> > -     url = https://gitlab.freedesktop.org/slirp/libslirp.git
> > +     url = https://git.qemu.org/git/libslirp.git
> > --

This won't apply because currently master's .gitmodules
has no [submodule "slirp"] entry. I was assuming you'd
ping or repost once the slirp changes went in.

thanks
-- PMM
Re: [Qemu-devel] [PATCH v2] gitmodules: use qemu.org git mirrors
Posted by Peter Maydell 5 years ago 
On Thu, 2 May 2019 at 11:11, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> On Wed, 1 May 2019 at 17:20, Stefan Hajnoczi <stefanha@gmail.com> wrote:
> >
> > On Thu, Apr 25, 2019 at 03:54:20PM +0100, Stefan Hajnoczi wrote:
> > > qemu.org hosts git repository mirrors of all submodules.  Update
> > > .gitmodules to use the mirrors and not the upstream repositories.
> > >
> > > Mirroring upstream repositories ensures that QEMU continues to build
> > > even when upstream repositories are deleted or temporarily offline.
> > >
> > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > > ---
> > >  .gitmodules | 10 +++++-----
> > >  1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > Ping?

> This won't apply because currently master's .gitmodules
> has no [submodule "slirp"] entry. I was assuming you'd
> ping or repost once the slirp changes went in.

The slirp changes are now in master, so I've applied this.

thanks
-- PMM

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.