[PATCH] .gitmodules: Update URLs for the u-boot submodules

Erick Shepherd posted 1 patch 5 days, 16 hours ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20250922220401.74802-1-erick.shepherd@ni.com
.gitmodules | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] .gitmodules: Update URLs for the u-boot submodules
Posted by Erick Shepherd 5 days, 16 hours ago
The u-boot and u-boot-sam460ex submodule repositories were moved to new
locations. Update .gitmodules to use the new URLs.

Signed-off-by: Erick Shepherd <erick.shepherd@ni.com>
---
 .gitmodules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 73cae4cd4d..e27dfe8c2c 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.50.1
Re: [PATCH] .gitmodules: Update URLs for the u-boot submodules
Posted by Daniel P. Berrangé 5 days, 7 hours ago
On Mon, Sep 22, 2025 at 05:04:01PM -0500, Erick Shepherd wrote:
> The u-boot and u-boot-sam460ex submodule repositories were moved to new
> locations. Update .gitmodules to use the new URLs.
> 
> Signed-off-by: Erick Shepherd <erick.shepherd@ni.com>

You need to update your git tree, as this change was already done when
the modules were moved:

  commit a11d1847d5ef8a7db58e6d4e44f36fec708f0981
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   Mon Sep 8 15:19:11 2025 +0100

    .gitmodules: move u-boot mirrors to qemu-project-mirrors


> ---
>  .gitmodules | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/.gitmodules b/.gitmodules
> index 73cae4cd4d..e27dfe8c2c 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.50.1
> 
> 

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: Update URLs for the u-boot submodules
Posted by Erick Shepherd 4 days, 20 hours ago
Ah, I must have missed that, are there any plans to cherrypick the
change to any of the other branches? I'm particularly interested in the
xlnx_rel_v2025.1 branch since that is what is used by the meta-xilinx
scarthgap branch.

Regards,
Erick Shepherd
Re: [PATCH] .gitmodules: Update URLs for the u-boot submodules
Posted by Daniel P. Berrangé 4 days, 7 hours ago
On Tue, Sep 23, 2025 at 01:52:51PM -0500, Erick Shepherd wrote:
> Ah, I must have missed that, are there any plans to cherrypick the
> change to any of the other branches? I'm particularly interested in the
> xlnx_rel_v2025.1 branch since that is what is used by the meta-xilinx
> scarthgap branch.

That is not a branch that is maintained by the QEMU project....which
throws up a issue we failed to anticipate....

While we update master & current stableXXX, every single fork of QEMU
with a custom vendor branch is now broken.

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: Update URLs for the u-boot submodules
Posted by Erick Shepherd 3 days, 20 hours ago
What is the current stableXXX branch and are there plans to cherrypick
the fix to it? I see that the Xilinx/meta-xilinx master branch uses the
xlnx_rel_v2024.2 branch for Xilinx/qemu.git. I just need to identify
which Xilinx/meta-xilinx branch will pull in the recent fix.

Regards,
Erick Shepherd