Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions tools/tool_config_system_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,14 @@ def get_source_by_system(self,system,codename,arch,failed_sources=[], return_all
# 实际测试发现,阿里云虽然延时很低,但是带宽也低的离谱,一点都不用心,删掉了
ubuntu_amd64_sources = [
"https://mirrors.tuna.tsinghua.edu.cn/ubuntu",
"https://mirror.sysu.edu.cn/ubuntu/",
# "https://mirrors.aliyun.com/ubuntu",
# "https://mirrors.163.com/ubuntu",
"https://mirrors.ustc.edu.cn/ubuntu",
"https://archive.ubuntu.com/ubuntu",
"https://mirrors.kernel.org/ubuntu",
"http://mirrors.tuna.tsinghua.edu.cn/ubuntu",
"http://mirror.sysu.edu.cn/ubuntu/",
# "http://mirrors.aliyun.com/ubuntu",
# "http://mirrors.163.com/ubuntu",
"http://mirrors.ustc.edu.cn/ubuntu",
Expand All @@ -108,24 +110,28 @@ def get_source_by_system(self,system,codename,arch,failed_sources=[], return_all
"https://ports.ubuntu.com/ubuntu-ports",
# "https://mirrors.aliyun.com/ubuntu-ports",
"https://mirrors.tuna.tsinghua.edu.cn/ubuntu-ports",
"https://mirror.sysu.edu.cn/ubuntu-ports/",
"https://ports.ubuntu.com/ubuntu-ports",
# "https://mirrors.aliyun.com/ubuntu-ports",
"https://mirrors.tuna.tsinghua.edu.cn/ubuntu-ports",
"http://ports.ubuntu.com/ubuntu-ports",
# "https://mirrors.aliyun.com/ubuntu-ports",
"http://mirrors.tuna.tsinghua.edu.cn/ubuntu-ports",
"http://mirror.sysu.edu.cn/ubuntu-ports/",
"http://ports.ubuntu.com/ubuntu-ports",
# "https://mirrors.aliyun.com/ubuntu-ports",
"http://mirrors.tuna.tsinghua.edu.cn/ubuntu-ports",
]
debian_amd64_sources = [
"https://mirrors.tuna.tsinghua.edu.cn/debian",
"https://mirror.sysu.edu.cn/debian/",
"https://mirrors.aliyun.com/debian",
# "https://mirrors.163.com/debian",
"https://mirrors.ustc.edu.cn/debian",
"https://deb.debian.org/debian",
"https://mirrors.kernel.org/debian",
"http://mirrors.tuna.tsinghua.edu.cn/debian",
"http://mirror.sysu.edu.cn/debian/",
"http://mirrors.aliyun.com/debian",
# "http://mirrors.163.com/debian",
"http://mirrors.ustc.edu.cn/debian",
Expand Down
22 changes: 17 additions & 5 deletions tools/tool_install_ros.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ def get_desktop_version(name):

ros_mirror_dic = {
"tsinghua":{"ROS1":"http://mirrors.tuna.tsinghua.edu.cn/ros/ubuntu/","ROS2":"http://mirrors.tuna.tsinghua.edu.cn/ros2/ubuntu/"},
"mirrorz":{"ROS1":"http://mirrors.cernet.edu.cn/ros/ubuntu/","ROS2":"http://mirrors.cernet.edu.cn/ros2/ubuntu"},
"ustc":{"ROS1":"https://mirrors.ustc.edu.cn/ros/ubuntu/","ROS2":"https://mirrors.ustc.edu.cn/ros2/ubuntu/"},
"huawei":{"ROS1":"https://repo.huaweicloud.com/ros/ubuntu/","ROS2":"https://repo.huaweicloud.com/ros2/ubuntu/"},
"packages.ros":{"ROS1":"http://packages.ros.org/ros/ubuntu/","ROS2":"http://packages.ros.org/ros2/ubuntu/"},
Expand All @@ -96,12 +97,12 @@ def get_desktop_version(name):

ros_dist_dic = {
'artful':{"packages.ros"},
'bionic':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"},
'bionic':{"tsinghua","ustc","huawei","mirrorz","packages.ros","https.packages.ros"},
'buster':{"packages.ros"},
'cosmic':{"packages.ros"},
'disco':{"packages.ros"},
'eoan':{"packages.ros"},
'focal':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"},
'focal':{"tsinghua","ustc","huawei","mirrorz","packages.ros","https.packages.ros"},
'jessie':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"},
'lucid':{"packages.ros"},
'maverick':{"packages.ros"},
Expand All @@ -117,7 +118,7 @@ def get_desktop_version(name):
'vivid':{"packages.ros"},
'wheezy':{"packages.ros"},
'wily':{"packages.ros"},
'xenial':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"},
'xenial':{"tsinghua","ustc","huawei","mirrorz","packages.ros","https.packages.ros"},
'yakkety':{"packages.ros"},
'zesty':{"packages.ros"},
}
Expand All @@ -132,8 +133,8 @@ def get_desktop_version(name):
'eoan':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"},
'focal':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"},
'jessie':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"},
'jammy':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"},
'noble':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"},
'jammy':{"tsinghua","ustc","huawei","mirrorz","packages.ros","https.packages.ros"},
'noble':{"tsinghua","ustc","huawei","mirrorz","packages.ros","https.packages.ros"},
'stretch':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"},
'trusty':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"},
'utopic':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"},
Expand Down Expand Up @@ -198,6 +199,11 @@ def select_mirror(self):
if "huawei" in ros_dist_dic.get(codename, []) or "huawei" in ros2_dist_dic.get(codename, []):
supported_mirrors.append("huawei")

# 添加 mirrorz 镜像源支持
if codename in ros_dist_dic.keys() or codename in ros2_dist_dic.keys():
if "mirrorz" in ros_dist_dic.get(codename, []) or "mirrorz" in ros2_dist_dic.get(codename, []):
supported_mirrors.append("mirrorz")

# 如果系统支持多个镜像源,则让用户选择
if len(supported_mirrors) > 1:
mirror_dict = {}
Expand All @@ -209,6 +215,8 @@ def select_mirror(self):
mirror_dict[count] = "清华镜像源 (容易被封禁)"
elif mirror == "huawei":
mirror_dict[count] = "华为镜像源"
elif mirror == "mirrorz":
mirror_dict[count] = "中山大学开源软件镜像站 (试运行)"
count += 1

mirror_dict[count] = "ROS官方源 (国外用户或需要最新版本时使用)"
Expand All @@ -228,6 +236,10 @@ def select_mirror(self):
return "tsinghua"
elif "华为" in value:
return "huawei"
elif "中山大" in value:
return "mirrorz"


else:
# 系统只支持默认的清华源
PrintUtils.print_info("您的系统默认使用清华镜像源")
Expand Down
Loading