Skip to content

Commit 67312ff

Browse files
authored
[Build]: Use one debian mirror config (#10281)
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 86e6ef5 commit 67312ff

File tree

6 files changed

+0
-60
lines changed

6 files changed

+0
-60
lines changed

files/build_templates/sonic_debian_extension.j2

-9
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,6 @@ else
6868
sudo chroot $FILESYSTEM_ROOT service docker start
6969
fi
7070

71-
# Apply apt configuration files
72-
sudo cp $IMAGE_CONFIGS/apt/sources.list $FILESYSTEM_ROOT/etc/apt/
73-
sudo mkdir -p $FILESYSTEM_ROOT/etc/apt/sources.list.d/
74-
sudo cp -R $IMAGE_CONFIGS/apt/sources.list.d/${CONFIGURED_ARCH}/* $FILESYSTEM_ROOT/etc/apt/sources.list.d/
75-
cat $IMAGE_CONFIGS/apt/sonic-dev.gpg.key | sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add -
76-
77-
# Update apt's snapshot of its repos
78-
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get update
79-
8071
# Apply environtment configuration files
8172
sudo cp $IMAGE_CONFIGS/environment/environment $FILESYSTEM_ROOT/etc/
8273
sudo cp $IMAGE_CONFIGS/environment/motd $FILESYSTEM_ROOT/etc/

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

-30
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

-3
This file was deleted.

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

-9
This file was deleted.

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

-9
This file was deleted.

0 commit comments

Comments
 (0)