[elbe-devel] [PATCH] treewide: Use CDN mirror deb.debian.org
Thomas Weißschuh
thomas.weissschuh at linutronix.de
Thu Feb 15 08:44:36 CET 2024
See commit 93f89f7774d9 ("examples: Use CDN mirror deb.debian.org")
Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
contrib/dockerfile/Dockerfile.in | 4 ++--
contrib/k8s/Dockerfile | 2 +-
elbepack/cdroms.py | 4 ++--
elbepack/repomanager.py | 8 ++++----
examples/elbe-init-big-machine.xml | 2 +-
examples/x86_64-docker-elbe.xml | 2 +-
tests/pbuilder-amd64.xml | 2 +-
tests/simple-amd64-bookworm.xml | 2 +-
tests/simple-amd64-with-grub-uefi.xml | 2 +-
tests/simple-amd64-with-grub.xml | 2 +-
tests/simple-arm64.xml | 2 +-
tests/simple-armhf.xml | 2 +-
tests/xinclude/simple.xml | 2 +-
13 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/contrib/dockerfile/Dockerfile.in b/contrib/dockerfile/Dockerfile.in
index 90c6c96fc289..1537561f0e24 100644
--- a/contrib/dockerfile/Dockerfile.in
+++ b/contrib/dockerfile/Dockerfile.in
@@ -10,8 +10,8 @@ USER root
ENV DEBIAN_FRONTEND noninteractive
# use a sources.list including backports and security
-RUN echo "deb http://ftp.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list; \
- echo "deb http://security.debian.org/ bullseye-security main" >> /etc/apt/sources.list
+RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list; \
+ echo "deb http://deb.debian.org/debian-security bullseye-security main" >> /etc/apt/sources.list
# update, upgrade and install elbe runtime-dependencies
RUN apt-get update -y ;\
diff --git a/contrib/k8s/Dockerfile b/contrib/k8s/Dockerfile
index b1361f96afb3..6130495213dc 100644
--- a/contrib/k8s/Dockerfile
+++ b/contrib/k8s/Dockerfile
@@ -12,7 +12,7 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
-RUN echo "deb http://ftp.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list && \
+RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list && \
apt-get update -y && \
apt-get install -y --no-install-recommends \
elbe-archive-keyring
diff --git a/elbepack/cdroms.py b/elbepack/cdroms.py
index 89745cf91182..6f225a35d732 100644
--- a/elbepack/cdroms.py
+++ b/elbepack/cdroms.py
@@ -37,7 +37,7 @@ def add_source_pkg(repo, component, cache, pkg, version, forbid):
def mk_source_cdrom(components, codename,
init_codename, target,
cdrom_size=CDROM_SIZE, xml=None,
- mirror='http://ftp.de.debian.org/debian'):
+ mirror='http://deb.debian.org/debian'):
hostfs.mkdir_p('/var/cache/elbe/sources')
@@ -120,7 +120,7 @@ def mk_binary_cdrom(rfs, arch, codename, init_codename, xml, target):
if xml is not None:
mirror = xml.get_primary_mirror(rfs.fname('cdrom'))
else:
- mirror = 'http://ftp.de.debian.org/debian'
+ mirror = 'http://deb.debian.org/debian'
repo_path = os.path.join(target, 'binrepo')
target_repo_path = os.path.join(repo_path, 'targetrepo')
diff --git a/elbepack/repomanager.py b/elbepack/repomanager.py
index fc2245054582..9a3e5df17f82 100644
--- a/elbepack/repomanager.py
+++ b/elbepack/repomanager.py
@@ -14,7 +14,7 @@ from elbepack.shellhelper import CommandError, do
class RepoAttributes:
def __init__(self, codename, arch, components,
- mirror='http://ftp.de.debian.org/debian'):
+ mirror='http://deb.debian.org/debian'):
self.codename = codename
if isinstance(arch, str):
self.arch = set([arch])
@@ -372,7 +372,7 @@ class UpdateRepo(RepoBase):
class CdromInitRepo(RepoBase):
def __init__(self, init_codename, path,
- mirror='http://ftp.de.debian.org/debian'):
+ mirror='http://deb.debian.org/debian'):
init_attrs = RepoAttributes(
init_codename, 'amd64', [
@@ -393,7 +393,7 @@ class CdromBinRepo(RepoBase):
codename,
init_codename,
path,
- mirror='http://ftp.debian.org/debian'):
+ mirror='http://deb.debian.org/debian'):
repo_attrs = RepoAttributes(codename, arch, ['main', 'added'], mirror)
if init_codename is not None:
@@ -413,7 +413,7 @@ class CdromBinRepo(RepoBase):
class CdromSrcRepo(RepoBase):
def __init__(self, codename, init_codename, path, maxsize,
- mirror='http://ftp.debian.org/debian'):
+ mirror='http://deb.debian.org/debian'):
repo_attrs = RepoAttributes(codename,
'source',
diff --git a/examples/elbe-init-big-machine.xml b/examples/elbe-init-big-machine.xml
index 57e84d28d8b5..a721f547a0f5 100644
--- a/examples/elbe-init-big-machine.xml
+++ b/examples/elbe-init-big-machine.xml
@@ -47,7 +47,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
<pkg>openssh-server</pkg>
</pkg-list>
<preseed>
- <conf owner="pbuilder" key="pbuilder/mirrorsite" type="string" value="http://ftp.de.debian.org/debian"/>
+ <conf owner="pbuilder" key="pbuilder/mirrorsite" type="string" value="http://deb.debian.org/debian"/>
<!-- THIS CONF IS POTENTIALLY DANGEROUS! It enables logging in on the initvm's ssh as root with password.
See https://bugs.debian.org/837733 for this counter-intuitive setting -->
diff --git a/examples/x86_64-docker-elbe.xml b/examples/x86_64-docker-elbe.xml
index 399697692b4f..2caef347d2a5 100644
--- a/examples/x86_64-docker-elbe.xml
+++ b/examples/x86_64-docker-elbe.xml
@@ -85,7 +85,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
<command>cp /usr/share/doc/sbuild/examples/example.sbuildrc /home/elbe/.sbuildrc</command>
<command>chown elbe:elbe /home/elbe/.sbuildrc</command>
- <command>sbuild-createchroot --include=eatmydata,ccache,gnupg stable /srv/chroot/stable-amd64-sbuild http://ftp.de.debian.org/debian</command>
+ <command>sbuild-createchroot --include=eatmydata,ccache,gnupg stable /srv/chroot/stable-amd64-sbuild http://deb.debian.org/debian</command>
<command>sbuild-adduser elbe</command>
</finetuning>
</target>
diff --git a/tests/pbuilder-amd64.xml b/tests/pbuilder-amd64.xml
index b13901a30f25..2639e8092536 100644
--- a/tests/pbuilder-amd64.xml
+++ b/tests/pbuilder-amd64.xml
@@ -12,7 +12,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
<description>elbe-ci test for pbuilder-amd64</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>
diff --git a/tests/simple-amd64-bookworm.xml b/tests/simple-amd64-bookworm.xml
index 9d9005e07d3f..a317d5f80269 100644
--- a/tests/simple-amd64-bookworm.xml
+++ b/tests/simple-amd64-bookworm.xml
@@ -18,7 +18,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<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/simple-amd64-with-grub-uefi.xml b/tests/simple-amd64-with-grub-uefi.xml
index 2ec466228fef..d2a3138dfd80 100644
--- a/tests/simple-amd64-with-grub-uefi.xml
+++ b/tests/simple-amd64-with-grub-uefi.xml
@@ -14,7 +14,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>
<url-list>
diff --git a/tests/simple-amd64-with-grub.xml b/tests/simple-amd64-with-grub.xml
index eb0421cb6a3e..e0fb75634a4d 100644
--- a/tests/simple-amd64-with-grub.xml
+++ b/tests/simple-amd64-with-grub.xml
@@ -18,7 +18,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<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/simple-arm64.xml b/tests/simple-arm64.xml
index e42a2bd9481a..c9fd8dab6de9 100644
--- a/tests/simple-arm64.xml
+++ b/tests/simple-arm64.xml
@@ -18,7 +18,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<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/simple-armhf.xml b/tests/simple-armhf.xml
index be0b15888937..4b8b2c351d2b 100644
--- a/tests/simple-armhf.xml
+++ b/tests/simple-armhf.xml
@@ -18,7 +18,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<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/xinclude/simple.xml b/tests/xinclude/simple.xml
index bebe8b59c435..3c23bdc44a73 100644
--- a/tests/xinclude/simple.xml
+++ b/tests/xinclude/simple.xml
@@ -18,7 +18,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
</description>
<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>
--
2.43.1
More information about the elbe-devel
mailing list