[elbe-devel] [PATCH 09/37] examples: Use CDN mirror deb.debian.org
Benedikt Spranger
b.spranger at linutronix.de
Wed Feb 7 15:28:36 CET 2024
From: Eduard Krein <eduard.krein at linutronix.de>
To get the nearest/fastest debian mirror the debian project introduced
the deb.debian.org mirror. This mirror points to a appropiate server in
a CDN. While at it update references to the debian security mirror too.
Speed up building E.L.B.E. examples by using this mirror.
Signed-off-by: Eduard Krein <eduard.krein at linutronix.de>
Signed-off-by: Benedikt Spranger <b.spranger at linutronix.de>
---
elbepack/init/default-init.xml | 4 ++--
examples/arm64-qemu-virt.xml | 2 +-
examples/armel-rescue-busybox-cpio.xml | 2 +-
examples/armhf-nfs-with-build-tools.xml | 2 +-
examples/armhf-ti-beaglebone-black.xml | 6 +++---
examples/elbe-init-big-machine.xml | 6 +++---
examples/powerpc.xml | 2 +-
examples/x86_32-pc-hdimg-minimal-grub-buster.xml | 2 +-
examples/x86_32-pc-hdimg-with-include-development.xml | 2 +-
examples/x86_32-pc-hdimg-with-include-production.xml | 2 +-
examples/x86_64-docker-elbe.xml | 6 +++---
examples/x86_64-docker-systemd.xml | 6 +++---
examples/x86_64-docker.xml | 6 +++---
examples/x86_64-pc-hdimg-gnome3.xml | 2 +-
examples/x86_64-pc-hdimg-grub-hybrid-buster.xml | 6 +++---
examples/x86_64-pc-hdimg-grub-uefi-buster.xml | 6 +++---
examples/x86_64-pc-rescue-busybox-dyn-cpio.xml | 2 +-
tests/pbuilder-amd64.xml | 4 ++--
tests/simple-amd64-with-grub-uefi.xml | 4 ++--
19 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/elbepack/init/default-init.xml b/elbepack/init/default-init.xml
index 4e8d0c9f..782a273e 100644
--- a/elbepack/init/default-init.xml
+++ b/elbepack/init/default-init.xml
@@ -12,10 +12,10 @@ SPDX-FileCopyrightText: Linutronix GmbH
<url-list>
<url>
<binary>
- http://security.debian.org/debian-security bullseye-security main
+ http://deb.debian.org/debian-security bullseye-security main
</binary>
<source>
- http://security.debian.org/debian-security bullseye-security main
+ http://deb.debian.org/debian-security bullseye-security main
</source>
</url>
<url>
diff --git a/examples/arm64-qemu-virt.xml b/examples/arm64-qemu-virt.xml
index ddccbfa2..40581386 100644
--- a/examples/arm64-qemu-virt.xml
+++ b/examples/arm64-qemu-virt.xml
@@ -24,7 +24,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<buildtype>aarch64</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
</mirror>
diff --git a/examples/armel-rescue-busybox-cpio.xml b/examples/armel-rescue-busybox-cpio.xml
index 6dbe5078..caaaf5ef 100644
--- a/examples/armel-rescue-busybox-cpio.xml
+++ b/examples/armel-rescue-busybox-cpio.xml
@@ -11,7 +11,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<buildtype>armel</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
</mirror>
diff --git a/examples/armhf-nfs-with-build-tools.xml b/examples/armhf-nfs-with-build-tools.xml
index 1638cb30..a43591d1 100644
--- a/examples/armhf-nfs-with-build-tools.xml
+++ b/examples/armhf-nfs-with-build-tools.xml
@@ -11,7 +11,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<buildtype>armhf</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
</mirror>
diff --git a/examples/armhf-ti-beaglebone-black.xml b/examples/armhf-ti-beaglebone-black.xml
index 5a10c2aa..2122950f 100644
--- a/examples/armhf-ti-beaglebone-black.xml
+++ b/examples/armhf-ti-beaglebone-black.xml
@@ -14,13 +14,13 @@ SPDX-FileCopyrightText: Linutronix GmbH
<buildtype>armhf</buildtype>
<mirror>
<!-- primary mirror is used by debootstrap -->
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
<url-list>
<url>
- <binary>http://security.debian.org/ buster/updates main</binary>
- <source>http://security.debian.org/ buster/updates main</source>
+ <binary>http://deb.debian.org/debian buster-updates main</binary>
+ <source>http://deb.debian.org/debian buster-updates main</source>
</url>
</url-list>
</mirror>
diff --git a/examples/elbe-init-big-machine.xml b/examples/elbe-init-big-machine.xml
index 3e045899..d0479127 100644
--- a/examples/elbe-init-big-machine.xml
+++ b/examples/elbe-init-big-machine.xml
@@ -6,16 +6,16 @@ SPDX-FileCopyrightText: Linutronix GmbH
<initvm>
<buildtype>amd64</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
<url-list>
<url>
<binary>
- http://security.debian.org/debian-security bullseye-security main
+ http://deb.debian.org/debian-security bullseye-security main
</binary>
<source>
- http://security.debian.org/debian-security bullseye-security main
+ http://deb.debian.org/debian-security bullseye-security main
</source>
</url>
<url>
diff --git a/examples/powerpc.xml b/examples/powerpc.xml
index 8880e05d..a9c8761a 100644
--- a/examples/powerpc.xml
+++ b/examples/powerpc.xml
@@ -11,7 +11,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<buildtype>ppc64el</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
</mirror>
diff --git a/examples/x86_32-pc-hdimg-minimal-grub-buster.xml b/examples/x86_32-pc-hdimg-minimal-grub-buster.xml
index aa8f6bd5..d250bee4 100644
--- a/examples/x86_32-pc-hdimg-minimal-grub-buster.xml
+++ b/examples/x86_32-pc-hdimg-minimal-grub-buster.xml
@@ -9,7 +9,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
<description>for testing 32bit with grub2</description>
<buildtype>i386</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
</mirror>
diff --git a/examples/x86_32-pc-hdimg-with-include-development.xml b/examples/x86_32-pc-hdimg-with-include-development.xml
index 6a537157..1ef1204b 100644
--- a/examples/x86_32-pc-hdimg-with-include-development.xml
+++ b/examples/x86_32-pc-hdimg-with-include-development.xml
@@ -13,7 +13,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
<description>for testing 32bit with grub2</description>
<buildtype>i386</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
</mirror>
diff --git a/examples/x86_32-pc-hdimg-with-include-production.xml b/examples/x86_32-pc-hdimg-with-include-production.xml
index c0a32f35..bedc0e5a 100644
--- a/examples/x86_32-pc-hdimg-with-include-production.xml
+++ b/examples/x86_32-pc-hdimg-with-include-production.xml
@@ -13,7 +13,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
<description>for testing 32bit with grub2</description>
<buildtype>i386</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
</mirror>
diff --git a/examples/x86_64-docker-elbe.xml b/examples/x86_64-docker-elbe.xml
index 71ae325e..6a134cbd 100644
--- a/examples/x86_64-docker-elbe.xml
+++ b/examples/x86_64-docker-elbe.xml
@@ -13,13 +13,13 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<buildtype>amd64</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
<url-list>
<url>
- <binary>http://security.debian.org buster/updates main</binary>
- <source>http://security.debian.org buster/updates main</source>
+ <binary>http://deb.debian.org/debian buster-updates main</binary>
+ <source>http://deb.debian.org/debian buster-updates main</source>
</url>
<url>
<binary>http://debian.linutronix.de/elbe buster main</binary>
diff --git a/examples/x86_64-docker-systemd.xml b/examples/x86_64-docker-systemd.xml
index dbab31d9..150b420d 100644
--- a/examples/x86_64-docker-systemd.xml
+++ b/examples/x86_64-docker-systemd.xml
@@ -13,13 +13,13 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<buildtype>amd64</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
<url-list>
<url>
- <binary>http://security.debian.org buster/updates main</binary>
- <source>http://security.debian.org buster/updates main</source>
+ <binary>http://deb.debian.org/debian buster-updates main</binary>
+ <source>http://deb.debian.org/debian buster-updates main</source>
</url>
</url-list>
</mirror>
diff --git a/examples/x86_64-docker.xml b/examples/x86_64-docker.xml
index 58356d6d..24956efb 100644
--- a/examples/x86_64-docker.xml
+++ b/examples/x86_64-docker.xml
@@ -19,7 +19,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<buildtype>amd64</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
<options>
@@ -27,8 +27,8 @@ SPDX-FileCopyrightText: Linutronix GmbH
</options>
<url-list>
<url>
- <binary>http://security.debian.org bullseye-security main</binary>
- <source>http://security.debian.org bullseye-security main</source>
+ <binary>http://deb.debian.org/debian-security bullseye-security main</binary>
+ <source>http://deb.debian.org/debian-security bullseye-security main</source>
<options>
<option>check-date=no</option>
</options>
diff --git a/examples/x86_64-pc-hdimg-gnome3.xml b/examples/x86_64-pc-hdimg-gnome3.xml
index 05782771..d5202d30 100644
--- a/examples/x86_64-pc-hdimg-gnome3.xml
+++ b/examples/x86_64-pc-hdimg-gnome3.xml
@@ -12,7 +12,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<buildtype>amd64</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
</mirror>
diff --git a/examples/x86_64-pc-hdimg-grub-hybrid-buster.xml b/examples/x86_64-pc-hdimg-grub-hybrid-buster.xml
index 05ece42f..59601ac2 100644
--- a/examples/x86_64-pc-hdimg-grub-hybrid-buster.xml
+++ b/examples/x86_64-pc-hdimg-grub-hybrid-buster.xml
@@ -18,13 +18,13 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<buildtype>amd64</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
<url-list>
<url>
- <binary>http://security.debian.org buster/updates main</binary>
- <source>http://security.debian.org buster/updates main</source>
+ <binary>http://deb.debian.org/debian buster-updates main</binary>
+ <source>http://deb.debian.org/debian buster-updates main</source>
</url>
</url-list>
</mirror>
diff --git a/examples/x86_64-pc-hdimg-grub-uefi-buster.xml b/examples/x86_64-pc-hdimg-grub-uefi-buster.xml
index 3dd73457..6b774931 100644
--- a/examples/x86_64-pc-hdimg-grub-uefi-buster.xml
+++ b/examples/x86_64-pc-hdimg-grub-uefi-buster.xml
@@ -16,13 +16,13 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<buildtype>amd64</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
<url-list>
<url>
- <binary>http://security.debian.org buster/updates main</binary>
- <source>http://security.debian.org buster/updates main</source>
+ <binary>http://deb.debian.org/debian buster-updates main</binary>
+ <source>http://deb.debian.org/debian buster-updates main</source>
</url>
</url-list>
</mirror>
diff --git a/examples/x86_64-pc-rescue-busybox-dyn-cpio.xml b/examples/x86_64-pc-rescue-busybox-dyn-cpio.xml
index a64336df..57d41c47 100644
--- a/examples/x86_64-pc-rescue-busybox-dyn-cpio.xml
+++ b/examples/x86_64-pc-rescue-busybox-dyn-cpio.xml
@@ -12,7 +12,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<buildtype>amd64</buildtype>
<mirror>
- <primary_host>ftp.de.debian.org</primary_host>
+ <primary_host>deb.debian.org</primary_host>
<primary_path>/debian</primary_path>
<primary_proto>http</primary_proto>
</mirror>
diff --git a/tests/pbuilder-amd64.xml b/tests/pbuilder-amd64.xml
index 7d385d15..b13901a3 100644
--- a/tests/pbuilder-amd64.xml
+++ b/tests/pbuilder-amd64.xml
@@ -17,8 +17,8 @@ SPDX-FileCopyrightText: Linutronix GmbH
<primary_proto>http</primary_proto>
<url-list>
<url>
- <binary>http://security.debian.org/ buster/updates main</binary>
- <source>http://security.debian.org/ buster/updates main</source>
+ <binary>http://deb.debian.org/ buster/updates main</binary>
+ <source>http://deb.debian.org/ buster/updates main</source>
</url>
</url-list>
</mirror>
diff --git a/tests/simple-amd64-with-grub-uefi.xml b/tests/simple-amd64-with-grub-uefi.xml
index 058692bb..2ec46622 100644
--- a/tests/simple-amd64-with-grub-uefi.xml
+++ b/tests/simple-amd64-with-grub-uefi.xml
@@ -19,8 +19,8 @@ SPDX-FileCopyrightText: Linutronix GmbH
<primary_proto>http</primary_proto>
<url-list>
<url>
- <binary>http://security.debian.org bullseye-security main</binary>
- <source>http://security.debian.org bullseye-security main</source>
+ <binary>http://deb.debian.org bullseye-security main</binary>
+ <source>http://deb.debian.org bullseye-security main</source>
</url>
</url-list>
</mirror>
--
2.43.0
More information about the elbe-devel
mailing list