From 645f073b9f78ae32d64fad27917f941f6f0b07b9 Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Fri, 16 Aug 2024 01:26:33 +0800 Subject: [PATCH] Split freebsd out --- include/source.h | 18 ------ src/chsrc.c | 109 +------------------------------- src/recipe/catalog.c | 1 - src/recipe/os/freebsd.c | 134 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 135 insertions(+), 127 deletions(-) create mode 100644 src/recipe/os/freebsd.c diff --git a/include/source.h b/include/source.h index 1ef2c79..22a0e76 100644 --- a/include/source.h +++ b/include/source.h @@ -338,22 +338,6 @@ os_armbian_sources[] = { }, -/** - * @time 2023-09-27 更新 - * - * @note by:ccmywish { - * [2023-09-24] 以下三个USTC, NJU, Netease 均维护了 freebsd-pkg freebsd-ports - * [2023-09-27] 请务必保持Nju前面有至少一个镜像，原因请查看 freebsd 的换源函数 - * } - */ -os_freebsd_sources[] = { - {&Upstream, NULL}, - {&Ustc, "mirrors.ustc.edu.cn"}, - {&Nju, "mirror.nju.edu.cn"}, - {&Netease, "mirrors.163.com"}, -}, - - /** * @time 2023-09-06 更新 @@ -528,8 +512,6 @@ def_sources_n(os_rocky); def_sources_n(os_alma); def_sources_n(os_linuxlite); def_sources_n(os_raspberrypi); def_sources_n(os_armbian); -def_sources_n(os_freebsd); - def_sources_n(os_ros); def_sources_n(os_deepin); def_sources_n(os_openeuler); def_sources_n(os_openkylin); diff --git a/src/chsrc.c b/src/chsrc.c index 376e6c3..4173025 100644 --- a/src/chsrc.c +++ b/src/chsrc.c @@ -752,114 +752,7 @@ os_openkylin_setsrc (char *option) } - -/** - * 参考: - * 1. https://book.bsdcn.org/di-3-zhang-ruan-jian-yuan-ji-bao-guan-li-qi/di-3.2-jie-freebsd-huan-yuan-fang-shi.html - * 2. https://help.mirrors.cernet.edu.cn/FreeBSD-ports/ - * - * 据 @ykla, - * FreeBSD 有五类源：pkg、ports、port、portsnap、update，其中 portsnap 在 FreeBSD 14 已经被移除了 - */ -void -os_freebsd_setsrc (char *option) -{ - // 据 @ykla，FreeBSD不自带sudo，但是我们依然要保证是root权限 - chsrc_ensure_root (); - - int index = use_specific_mirror_or_auto_select (option, os_freebsd); - - SourceInfo source = os_freebsd_sources[index]; - chsrc_confirm_source (&source); - - chsrc_log2 ("1. 添加 freebsd-pkg 源 (二进制安装包)"); - chsrc_ensure_dir ("/usr/local/etc/pkg/repos"); - - char *conf = xy_strjoin (3, "/usr/local/etc/pkg/repos/", source.mirror->code, ".conf"); - - char *pkg_content = xy_strjoin (4, - source.mirror->code, ": { \n" - " url: \"http://", source.url, "/freebsd-pkg/${ABI}/latest\",\n" - "}\n" - "FreeBSD: { enabled: no }" - ); - - chsrc_overwrite_file (pkg_content, conf); - chsrc_note2 ( - xy_strjoin (3, "若要使用季度分支，请在", conf ,"中将latest改为quarterly")); - - chsrc_note2 ("若要使用HTTPS源，请先安装securtiy/ca_root_ns，并将'http'改成'https'，最后使用'pkg update -f'刷新缓存即可\n"); - puts (""); - - chsrc_log2 ("2. 修改 freebsd-ports 源"); - // @ccmywish: [2023-09-27] 据 @ykla , NJU的freebsd-ports源没有设置 Git， - // 但是我认为由于使用Git还是要比非Git方便许多，我们尽可能坚持使用Git - // 而 gitup 又要额外修改它自己的配置，比较麻烦 - bool git_exist = query_program_exist (xy_str_to_quietcmd ("git version"), "git"); - if (git_exist) - { - if (xy_streql("nju",source.mirror->code)) - { - source = os_freebsd_sources[index-1]; // 使用NJU的前一个源，即USTC源 - } - char *git_cmd = xy_strjoin (3, "git clone --depth 1 https://", source.url, "/freebsd-ports/ports.git /usr/ports"); - chsrc_run (git_cmd, RunOpt_Default); - source = os_freebsd_sources[index]; // 恢复至选中的源 - chsrc_note2 ("下次更新请使用 git -C /usr/ports pull 而非使用 gitup"); - } - else - { - char *fetch = xy_strjoin (3, "fetch https://", source.url, "/freebsd-ports/ports.tar.gz"); // 70多MB - char *unzip = "tar -zxvf ports.tar.gz -C /usr/ports"; - char *delete = "rm ports.tar.gz"; - chsrc_run (fetch, RunOpt_Default); - chsrc_run (unzip, RunOpt_Default); - chsrc_run (delete, RunOpt_Default); - chsrc_log2 ("下次更新请重新下载内容至 /usr/ports"); - } - - - chsrc_log2 ("3. 指定 port 源"); - // https://help.mirrors.cernet.edu.cn/FreeBSD-ports/ - chsrc_backup ("/etc/make.conf"); - - char *ports = xy_strjoin (3, "MASTER_SITE_OVERRIDE?=http://", source.url, "/freebsd-ports/distfiles/${DIST_SUBDIR}/"); - chsrc_append_to_file (ports, "/etc/make.conf"); - - - /* 不再换 portsnap */ - /* - chsrc_backup ("/etc/portsnap.conf"); - - char *portsnap =xy_strjoin(3,"s@(.*)SERVERNAME=[\\.|a-z|A-Z]*@\\1SERVERNAME=", source.url, - "@g < /etc/portsnap.conf.bak"); - - chsrc_overwrite_file (portsnap, "/etc/portsnap.conf"); - - chsrc_log2 ("portsnap sources changed"); - chsrc_log2 ("获取portsnap更新使用此命令: 'portsnap fetch extract'"); - */ - - - // HELP: 暂时没有源提供 - chsrc_note2 ("4. 抱歉，目前境内无 freebsd-update 源，若存在请报告issue，谢谢"); - /* - chsrc_log2 ("3. 修改 freebsd-update 源"); - - char *update_cp = "cp /etc/freebsd-update.conf /etc/freebsd-update.conf.bak"; - chsrc_run (update_cp, RunOpt_Default); - - char *update =xy_strjoin (3,"s@(.*)SERVERNAME [\\.|a-z|A-Z]*@\\1SERVERNAME ", - source.url, - "@g < /etc/freebsd-update.conf.bak"); - - chsrc_overwrite_file (update, "/etc/freebsd-update.conf"); - */ - - chsrc_say_lastly (&source, ChsrcTypeSemiAuto); -} - - +#include "recipe/os/freebsd.c" #include "recipe/os/netbsd.c" #include "recipe/os/openbsd.c" diff --git a/src/recipe/catalog.c b/src/recipe/catalog.c index c3f678e..76b945f 100644 --- a/src/recipe/catalog.c +++ b/src/recipe/catalog.c @@ -47,7 +47,6 @@ def_target(os_armbian); def_target_noget(os_fedora); def_target_noget(os_rocky); def_target_noget(os_alma); -def_target_noget(os_freebsd); def_target_noget(os_openeuler); def_target_noget(os_anolis); def_target_noget(os_ros); diff --git a/src/recipe/os/freebsd.c b/src/recipe/os/freebsd.c new file mode 100644 index 0000000..008b209 --- /dev/null +++ b/src/recipe/os/freebsd.c @@ -0,0 +1,134 @@ +/** ------------------------------------------------------------ + * SPDX-License-Identifier: GPL-3.0-or-later + * ------------------------------------------------------------- + * File Authors : Aoran Zeng + * | Heng Guo <2085471348@qq.com> + * Contributors : Nil Null + * Created On : <2023-09-03> + * Last Modified : <2024-08-16> + * ------------------------------------------------------------*/ + +/** + * @time 2023-09-27 更新 + * + * @note by:ccmywish { + * [2023-09-24] 以下三个USTC, NJU, Netease 均维护了 freebsd-pkg freebsd-ports + * [2023-09-27] 请务必保持Nju前面有至少一个镜像，原因请查看 freebsd 的换源函数 + * } + */ +static SourceInfo +os_freebsd_sources[] = { + {&Upstream, NULL}, + {&Ustc, "mirrors.ustc.edu.cn"}, + {&Nju, "mirror.nju.edu.cn"}, + {&Netease, "mirrors.163.com"}, +}; +def_sources_n(os_freebsd); + +/** + * 参考: + * 1. https://book.bsdcn.org/di-3-zhang-ruan-jian-yuan-ji-bao-guan-li-qi/di-3.2-jie-freebsd-huan-yuan-fang-shi.html + * 2. https://help.mirrors.cernet.edu.cn/FreeBSD-ports/ + * + * 据 @ykla, + * FreeBSD 有五类源：pkg、ports、port、portsnap、update，其中 portsnap 在 FreeBSD 14 已经被移除了 + */ +void +os_freebsd_setsrc (char *option) +{ + // 据 @ykla，FreeBSD不自带sudo，但是我们依然要保证是root权限 + chsrc_ensure_root (); + + int index = use_specific_mirror_or_auto_select (option, os_freebsd); + + SourceInfo source = os_freebsd_sources[index]; + chsrc_confirm_source (&source); + + chsrc_log2 ("1. 添加 freebsd-pkg 源 (二进制安装包)"); + chsrc_ensure_dir ("/usr/local/etc/pkg/repos"); + + char *conf = xy_strjoin (3, "/usr/local/etc/pkg/repos/", source.mirror->code, ".conf"); + + char *pkg_content = xy_strjoin (4, + source.mirror->code, ": { \n" + " url: \"http://", source.url, "/freebsd-pkg/${ABI}/latest\",\n" + "}\n" + "FreeBSD: { enabled: no }" + ); + + chsrc_overwrite_file (pkg_content, conf); + chsrc_note2 ( + xy_strjoin (3, "若要使用季度分支，请在", conf ,"中将latest改为quarterly")); + + chsrc_note2 ("若要使用HTTPS源，请先安装securtiy/ca_root_ns，并将'http'改成'https'，最后使用'pkg update -f'刷新缓存即可\n"); + puts (""); + + chsrc_log2 ("2. 修改 freebsd-ports 源"); + // @ccmywish: [2023-09-27] 据 @ykla , NJU的freebsd-ports源没有设置 Git， + // 但是我认为由于使用Git还是要比非Git方便许多，我们尽可能坚持使用Git + // 而 gitup 又要额外修改它自己的配置，比较麻烦 + bool git_exist = query_program_exist (xy_str_to_quietcmd ("git version"), "git"); + if (git_exist) + { + if (xy_streql("nju",source.mirror->code)) + { + source = os_freebsd_sources[index-1]; // 使用NJU的前一个源，即USTC源 + } + char *git_cmd = xy_strjoin (3, "git clone --depth 1 https://", source.url, "/freebsd-ports/ports.git /usr/ports"); + chsrc_run (git_cmd, RunOpt_Default); + source = os_freebsd_sources[index]; // 恢复至选中的源 + chsrc_note2 ("下次更新请使用 git -C /usr/ports pull 而非使用 gitup"); + } + else + { + char *fetch = xy_strjoin (3, "fetch https://", source.url, "/freebsd-ports/ports.tar.gz"); // 70多MB + char *unzip = "tar -zxvf ports.tar.gz -C /usr/ports"; + char *delete = "rm ports.tar.gz"; + chsrc_run (fetch, RunOpt_Default); + chsrc_run (unzip, RunOpt_Default); + chsrc_run (delete, RunOpt_Default); + chsrc_log2 ("下次更新请重新下载内容至 /usr/ports"); + } + + + chsrc_log2 ("3. 指定 port 源"); + // https://help.mirrors.cernet.edu.cn/FreeBSD-ports/ + chsrc_backup ("/etc/make.conf"); + + char *ports = xy_strjoin (3, "MASTER_SITE_OVERRIDE?=http://", source.url, "/freebsd-ports/distfiles/${DIST_SUBDIR}/"); + chsrc_append_to_file (ports, "/etc/make.conf"); + + + /* 不再换 portsnap */ + /* + chsrc_backup ("/etc/portsnap.conf"); + + char *portsnap =xy_strjoin(3,"s@(.*)SERVERNAME=[\\.|a-z|A-Z]*@\\1SERVERNAME=", source.url, + "@g < /etc/portsnap.conf.bak"); + + chsrc_overwrite_file (portsnap, "/etc/portsnap.conf"); + + chsrc_log2 ("portsnap sources changed"); + chsrc_log2 ("获取portsnap更新使用此命令: 'portsnap fetch extract'"); + */ + + + // HELP: 暂时没有源提供 + chsrc_note2 ("4. 抱歉，目前境内无 freebsd-update 源，若存在请报告issue，谢谢"); + /* + chsrc_log2 ("3. 修改 freebsd-update 源"); + + char *update_cp = "cp /etc/freebsd-update.conf /etc/freebsd-update.conf.bak"; + chsrc_run (update_cp, RunOpt_Default); + + char *update =xy_strjoin (3,"s@(.*)SERVERNAME [\\.|a-z|A-Z]*@\\1SERVERNAME ", + source.url, + "@g < /etc/freebsd-update.conf.bak"); + + chsrc_overwrite_file (update, "/etc/freebsd-update.conf"); + */ + + chsrc_say_lastly (&source, ChsrcTypeSemiAuto); +} + +def_target_noget(os_freebsd);