Skip to content

Commit 4fccda4

Browse files
xumiaxumia
committed
[Build]: Use one debian mirror config (#10274)
Why I did it Use one debian mirror config. The empty config in https://github.com/Azure/sonic-buildimage/blob/master/files/image_config/apt/sources.list overrides the file https://github.com/Azure/sonic-buildimage/blob/master/files/apt/sources.list.amd64 (armhf/arm64), it does not make sense. All the content in files/image_config/apt is no use, any one wants to add mirror config, please add in files/apt. How I did it Remove files/image_config/apt and the reference.
1 parent 6239897 commit 4fccda4

File tree

9 files changed

+30
-89
lines changed

9 files changed

+30
-89
lines changed

‎files/apt/sources.list.amd64‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
## Debian mirror on Microsoft Azure
22
## Ref: http://debian-archive.trafficmanager.net/
33

4-
deb [arch=amd64] http://deb.debian.org/debian/ bullseye main contrib non-free
5-
deb-src [arch=amd64] http://deb.debian.org/debian/ bullseye main contrib non-free
6-
#deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ bullseye main contrib non-free
7-
#deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ bullseye main contrib non-free
8-
#deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ bullseye/updates main contrib non-free
9-
#deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ bullseye/updates main contrib non-free
10-
#deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ bullseye-backports main contrib non-free
11-
#deb [arch=amd64] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
12-
#deb-src [arch=amd64] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
13-
#deb [arch=amd64] http://packages.trafficmanager.net/debian/debian-security/ bullseye_updates main contrib non-free
14-
#deb-src [arch=amd64] http://packages.trafficmanager.net/debian/debian-security/ bullseye_updates main contrib non-free
15-
#deb [arch=amd64] http://packages.trafficmanager.net/debian/debian bullseye-backports main contrib non-free
4+
deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ bullseye main contrib non-free
5+
deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ bullseye main contrib non-free
6+
deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ bullseye-security main contrib non-free
7+
deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ bullseye-security main contrib non-free
8+
deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ bullseye-backports main contrib non-free
9+
deb [arch=amd64] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
10+
deb-src [arch=amd64] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
11+
deb [arch=amd64] http://packages.trafficmanager.net/debian/debian-security/ bullseye-security main contrib non-free
12+
deb-src [arch=amd64] http://packages.trafficmanager.net/debian/debian-security/ bullseye-security main contrib non-free
13+
deb [arch=amd64] http://packages.trafficmanager.net/debian/debian bullseye-backports main contrib non-free

‎files/apt/sources.list.arm64‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
## Debian mirror for ARM
22
## Not the repo mirror site can change in future, and needs to be updated to be in sync
33

4-
deb [arch=arm64] http://deb.debian.org/debian bullseye main contrib non-free
5-
deb-src [arch=arm64] http://deb.debian.org/debian bullseye main contrib non-free
6-
deb [arch=arm64] http://deb.debian.org/debian bullseye-updates main contrib non-free
7-
deb-src [arch=arm64] http://deb.debian.org/debian bullseye-updates main contrib non-free
8-
deb [arch=arm64] http://ftp.debian.org/debian bullseye-backports main
9-
# deb [arch=arm64] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
10-
# deb-src [arch=arm64] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
11-
# deb [arch=arm64] http://packages.trafficmanager.net/debian/debian bullseye-updates main contrib non-free
12-
# deb-src [arch=arm64] http://packages.trafficmanager.net/debian/debian bullseye-updates main contrib non-free
13-
# deb [arch=arm64] http://packages.trafficmanager.net/debian/debian bullseye-backports main
4+
deb [arch=arm64] http://debian-archive.trafficmanager.net/debian/ bullseye main contrib non-free
5+
deb-src [arch=arm64] http://debian-archive.trafficmanager.net/debian/ bullseye main contrib non-free
6+
deb [arch=arm64] http://debian-archive.trafficmanager.net/debian-security/ bullseye-security main contrib non-free
7+
deb-src [arch=arm64] http://debian-archive.trafficmanager.net/debian-security/ bullseye-security main contrib non-free
8+
deb [arch=arm64] http://debian-archive.trafficmanager.net/debian/ bullseye-backports main contrib non-free
9+
deb [arch=arm64] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
10+
deb-src [arch=arm64] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
11+
deb [arch=arm64] http://packages.trafficmanager.net/debian/debian-security/ bullseye-security main contrib non-free
12+
deb-src [arch=arm64] http://packages.trafficmanager.net/debian/debian-security/ bullseye-security main contrib non-free
13+
deb [arch=arm64] http://packages.trafficmanager.net/debian/debian bullseye-backports main contrib non-free

‎files/apt/sources.list.armhf‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
## Debian mirror for ARM
22
## Not the repo mirror site can change in future, and needs to be updated to be in sync
33

4-
deb [arch=armhf] http://deb.debian.org/debian bullseye main contrib non-free
5-
deb-src [arch=armhf] http://deb.debian.org/debian bullseye main contrib non-free
6-
deb [arch=armhf] http://deb.debian.org/debian bullseye-updates main contrib non-free
7-
deb-src [arch=armhf] http://deb.debian.org/debian bullseye-updates main contrib non-free
8-
deb [arch=armhf] http://ftp.debian.org/debian bullseye-backports main
9-
# deb [arch=armhf] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
10-
# deb-src [arch=armhf] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
11-
# deb [arch=armhf] http://packages.trafficmanager.net/debian/debian bullseye-updates main contrib non-free
12-
# deb-src [arch=armhf] http://packages.trafficmanager.net/debian/debian bullseye-updates main contrib non-free
13-
# deb [arch=armhf] http://packages.trafficmanager.net/debian/debian bullseye-backports main
4+
deb [arch=armhf] http://debian-archive.trafficmanager.net/debian/ bullseye main contrib non-free
5+
deb-src [arch=armhf] http://debian-archive.trafficmanager.net/debian/ bullseye main contrib non-free
6+
deb [arch=armhf] http://debian-archive.trafficmanager.net/debian-security/ bullseye-security main contrib non-free
7+
deb-src [arch=armhf] http://debian-archive.trafficmanager.net/debian-security/ bullseye-security main contrib non-free
8+
deb [arch=armhf] http://debian-archive.trafficmanager.net/debian/ bullseye-backports main contrib non-free
9+
deb [arch=armhf] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
10+
deb-src [arch=armhf] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
11+
deb [arch=armhf] http://packages.trafficmanager.net/debian/debian-security/ bullseye-security main contrib non-free
12+
deb-src [arch=armhf] http://packages.trafficmanager.net/debian/debian-security/ bullseye-security main contrib non-free
13+
deb [arch=armhf] http://packages.trafficmanager.net/debian/debian bullseye-backports main contrib non-free

‎files/build_templates/sonic_debian_extension.j2‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,6 @@ else
7575
sudo chroot $FILESYSTEM_ROOT $DOCKER_CTL_SCRIPT start
7676
fi
7777

78-
# Apply apt configuration files
79-
sudo cp $IMAGE_CONFIGS/apt/sources.list $FILESYSTEM_ROOT/etc/apt/
80-
sudo mkdir -p $FILESYSTEM_ROOT/etc/apt/sources.list.d/
81-
sudo cp -R $IMAGE_CONFIGS/apt/sources.list.d/${CONFIGURED_ARCH}/* $FILESYSTEM_ROOT/etc/apt/sources.list.d/
82-
cat $IMAGE_CONFIGS/apt/sonic-dev.gpg.key | sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add -
83-
8478
# Update apt's snapshot of its repos
8579
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get update
8680

‎files/image_config/apt/sonic-dev.gpg.key‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎files/image_config/apt/sources.list‎

Whitespace-only changes.

‎files/image_config/apt/sources.list.d/amd64/debian_archive_trafficmanager_net_debian.list‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎files/image_config/apt/sources.list.d/arm64/debian_mirror_arm64.list‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎files/image_config/apt/sources.list.d/armhf/debian_mirror_armhf.list‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)