[PATCH] .gitmodules: move u-boot mirrors to qemu-project-mirrors

[PATCH] .gitmodules: move u-boot mirrors to qemu-project-mirrors

[Alex Bennée]

To continue our GitLab Open Source Program license we need to pass an
automated license check for all repos under qemu-project. While U-Boot
is clearly GPLv2 rather than fight with the automated validation
script just move the mirror across to a separate project.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Cc: qemu-stable@nongnu.org
---
 .gitmodules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 73cae4cd4da..e27dfe8c2c1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,7 +15,7 @@
 	url = https://gitlab.com/qemu-project/qemu-palcode.git
 [submodule "roms/u-boot"]
 	path = roms/u-boot
-	url = https://gitlab.com/qemu-project/u-boot.git
+	url = https://gitlab.com/qemu-project-mirrors/u-boot.git
 [submodule "roms/skiboot"]
 	path = roms/skiboot
 	url = https://gitlab.com/qemu-project/skiboot.git
@@ -27,7 +27,7 @@
 	url = https://gitlab.com/qemu-project/seabios-hppa.git
 [submodule "roms/u-boot-sam460ex"]
 	path = roms/u-boot-sam460ex
-	url = https://gitlab.com/qemu-project/u-boot-sam460ex.git
+	url = https://gitlab.com/qemu-project-mirrors/u-boot-sam460ex.git
 [submodule "roms/edk2"]
 	path = roms/edk2
 	url = https://gitlab.com/qemu-project/edk2.git
-- 
2.47.3

Re: [PATCH] .gitmodules: move u-boot mirrors to qemu-project-mirrors

[Alex Bennée]

Alex Bennée <alex.bennee@linaro.org> writes:

> To continue our GitLab Open Source Program license we need to pass an
> automated license check for all repos under qemu-project. While U-Boot
> is clearly GPLv2 rather than fight with the automated validation
> script just move the mirror across to a separate project.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
> Cc: qemu-stable@nongnu.org

Gentle ping.

The GitLab OSS SaaS license expires on the 28th and I'd like to get all
the bits passing before then so I have time to address anything else
that might come up.

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH] .gitmodules: move u-boot mirrors to qemu-project-mirrors

[Daniel P. Berrangé]

On Mon, Sep 08, 2025 at 03:19:11PM +0100, Alex Bennée wrote:
> To continue our GitLab Open Source Program license we need to pass an
> automated license check for all repos under qemu-project. While U-Boot
> is clearly GPLv2 rather than fight with the automated validation
> script just move the mirror across to a separate project.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
> Cc: qemu-stable@nongnu.org
> ---
>  .gitmodules | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/.gitmodules b/.gitmodules
> index 73cae4cd4da..e27dfe8c2c1 100644
> --- a/.gitmodules
> +++ b/.gitmodules
> @@ -15,7 +15,7 @@
>  	url = https://gitlab.com/qemu-project/qemu-palcode.git
>  [submodule "roms/u-boot"]
>  	path = roms/u-boot
> -	url = https://gitlab.com/qemu-project/u-boot.git
> +	url = https://gitlab.com/qemu-project-mirrors/u-boot.git
>  [submodule "roms/skiboot"]
>  	path = roms/skiboot
>  	url = https://gitlab.com/qemu-project/skiboot.git
> @@ -27,7 +27,7 @@
>  	url = https://gitlab.com/qemu-project/seabios-hppa.git
>  [submodule "roms/u-boot-sam460ex"]
>  	path = roms/u-boot-sam460ex
> -	url = https://gitlab.com/qemu-project/u-boot-sam460ex.git
> +	url = https://gitlab.com/qemu-project-mirrors/u-boot-sam460ex.git
>  [submodule "roms/edk2"]
>  	path = roms/edk2
>  	url = https://gitlab.com/qemu-project/edk2.git

Are these the only 2 repos that are still blocking the OSS program
approval checks we need ?

This is pretty ugly, but unless upstream u-boot is willing to add a COPYING
file very quickly, I'm not seeing better options, given that GitLab's OSS
Program approval is driven off entirely automated processing of the
COPYING/LICENSE file contents.

If upstream u-boot.git added a good COPYING file, we would have to handle
the u-boot-sam460ex fork by pulling all of u-boot.git modern histry into
u-boot-sam460ex.git and ensuring the primary branch was master so GitLab
sees the COPYING file. The QEMU sub-module would still point to the
original old commit with the sam640ex changes we need, lacking a COPYING
file but that won't be a problem.


My only comment is that if we go down the route of this patch, I think we
should aim to move all read-only mirrored 3rd party stuff under the new
/qemu-project-mirrors group, so that /qemu is exclusively for code which
we actively maintain ourselves (and thus have control over licensing)


Every single active stable branch will need this change too, otherwise
they'll be unable to find the submodules we moved.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH] .gitmodules: move u-boot mirrors to qemu-project-mirrors

[Alex Bennée]

Daniel P. Berrangé <berrange@redhat.com> writes:

> On Mon, Sep 08, 2025 at 03:19:11PM +0100, Alex Bennée wrote:
>> To continue our GitLab Open Source Program license we need to pass an
>> automated license check for all repos under qemu-project. While U-Boot
>> is clearly GPLv2 rather than fight with the automated validation
>> script just move the mirror across to a separate project.
>> 
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
>> Cc: qemu-stable@nongnu.org
>> ---
>>  .gitmodules | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/.gitmodules b/.gitmodules
>> index 73cae4cd4da..e27dfe8c2c1 100644
>> --- a/.gitmodules
>> +++ b/.gitmodules
>> @@ -15,7 +15,7 @@
>>  	url = https://gitlab.com/qemu-project/qemu-palcode.git
>>  [submodule "roms/u-boot"]
>>  	path = roms/u-boot
>> -	url = https://gitlab.com/qemu-project/u-boot.git
>> +	url = https://gitlab.com/qemu-project-mirrors/u-boot.git
>>  [submodule "roms/skiboot"]
>>  	path = roms/skiboot
>>  	url = https://gitlab.com/qemu-project/skiboot.git
>> @@ -27,7 +27,7 @@
>>  	url = https://gitlab.com/qemu-project/seabios-hppa.git
>>  [submodule "roms/u-boot-sam460ex"]
>>  	path = roms/u-boot-sam460ex
>> -	url = https://gitlab.com/qemu-project/u-boot-sam460ex.git
>> +	url = https://gitlab.com/qemu-project-mirrors/u-boot-sam460ex.git
>>  [submodule "roms/edk2"]
>>  	path = roms/edk2
>>  	url = https://gitlab.com/qemu-project/edk2.git
>
> Are these the only 2 repos that are still blocking the OSS program
> approval checks we need ?

There are two biosbits repos and the s390 tools as well, see:

  https://gitlab.com/qemu-project-mirrors

but we don't reference them as submodules.

>
> This is pretty ugly, but unless upstream u-boot is willing to add a COPYING
> file very quickly, I'm not seeing better options, given that GitLab's OSS
> Program approval is driven off entirely automated processing of the
> COPYING/LICENSE file contents.
>
> If upstream u-boot.git added a good COPYING file, we would have to handle
> the u-boot-sam460ex fork by pulling all of u-boot.git modern histry into
> u-boot-sam460ex.git and ensuring the primary branch was master so GitLab
> sees the COPYING file. The QEMU sub-module would still point to the
> original old commit with the sam640ex changes we need, lacking a COPYING
> file but that won't be a problem.
>
>
> My only comment is that if we go down the route of this patch, I think we
> should aim to move all read-only mirrored 3rd party stuff under the new
> /qemu-project-mirrors group, so that /qemu is exclusively for code which
> we actively maintain ourselves (and thus have control over licensing)

Sure - I just wanted the minimum to get over the renewal.

However I can't hit the button now, something is stopping me and its not
entirely clear. I think maybe we need a Tax ID.

> Every single active stable branch will need this change too, otherwise
> they'll be unable to find the submodules we moved.

Once this is in it will be easy enough to apply to the stable branches.

>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
>
> With regards,
> Daniel

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH] .gitmodules: move u-boot mirrors to qemu-project-mirrors

[Christoph Müllner]

On Mon, Sep 8, 2025 at 4:21 PM Alex Bennée <alex.bennee@linaro.org> wrote:
>
> To continue our GitLab Open Source Program license we need to pass an
> automated license check for all repos under qemu-project. While U-Boot
> is clearly GPLv2 rather than fight with the automated validation
> script just move the mirror across to a separate project.

If I haven't missed anything, then it is currently not possible to
build any (recent?) QEMU release without this patch.
It would be great if this patch could be backported to at least the
stable-10.1 branch.
This patch landed as `a11d1847d5ef` on master and applies cleanly on
stable-10.1.

Thanks,
Christoph

>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
> Cc: qemu-stable@nongnu.org
> ---
>  .gitmodules | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/.gitmodules b/.gitmodules
> index 73cae4cd4da..e27dfe8c2c1 100644
> --- a/.gitmodules
> +++ b/.gitmodules
> @@ -15,7 +15,7 @@
>         url = https://gitlab.com/qemu-project/qemu-palcode.git
>  [submodule "roms/u-boot"]
>         path = roms/u-boot
> -       url = https://gitlab.com/qemu-project/u-boot.git
> +       url = https://gitlab.com/qemu-project-mirrors/u-boot.git
>  [submodule "roms/skiboot"]
>         path = roms/skiboot
>         url = https://gitlab.com/qemu-project/skiboot.git
> @@ -27,7 +27,7 @@
>         url = https://gitlab.com/qemu-project/seabios-hppa.git
>  [submodule "roms/u-boot-sam460ex"]
>         path = roms/u-boot-sam460ex
> -       url = https://gitlab.com/qemu-project/u-boot-sam460ex.git
> +       url = https://gitlab.com/qemu-project-mirrors/u-boot-sam460ex.git
>  [submodule "roms/edk2"]
>         path = roms/edk2
>         url = https://gitlab.com/qemu-project/edk2.git
> --
> 2.47.3
>
>