Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add cachyos #21

Closed
wants to merge 1 commit into from
Closed
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
7 changes: 7 additions & 0 deletions cachyos/intro.zh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## 项目简介

CachyOS 是基于 Arch Linux 的 Linux 发行版。 它专注于速度和安全优化——默认 Linux 内核使用 BORE(面向突发的响应增强器)调度程序进行了大量优化,而桌面包则使用 LTO 和 x86-64-v3、x86-64-v4 优化、安全标志和性能改进进行编译。

根据[官方仓库使用政策](https://wiki.cachyos.org/policy/repository_policy/),CachyOS 仓库仅供以下授权用户使用:CachyOS 用户、ArchLinux 用户。

严禁任何其他 Linux 发行版(包括其他基于 Arch 的发行版)使用 CachyOS 存储库。这包括但不限于:Manjaro EndeavourOS ArcoLinux Parabola 等“授权用户”部分中未明确提及的任何其他 Linux 发行版。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这样的做法是不合适的,更不应该出现在我们的文档中。

99 changes: 99 additions & 0 deletions cachyos/usage.zh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
## 使用方法

### CachyOS 用户

运行以下命令:

<tmpl z-lang="bash">
{{sudo}}cachyos-rate-mirrors
</tmpl>

### Arch Linux 用户

参考以下步骤,或者访问<https://github.com/CachyOS/linux-cachyos/blob/master/README.md#option-2-manual-installation>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
参考以下步骤,或者访问<https://github.com/CachyOS/linux-cachyos/blob/master/README.md#option-2-manual-installation>
参考以下步骤,或者访问 <https://github.com/CachyOS/linux-cachyos/blob/master/README.md#option-2-manual-installation>


#### 1. 安装 cachyos keyring

<tmpl z-lang="bash">
{{sudo}}pacman-key --recv-keys F3B607488DB35A47 --keyserver keyserver.ubuntu.com
{{sudo}}pacman-key --lsign-key F3B607488DB35A47
</tmpl>

#### 2. 安装所需的软件包

注意: 安装 CachyOS Pacman 将安装一个 pacman 的分支,其中包含从 CachyOS 添加的功能,例如 `INSTALLED_FROM` 和自动架构检查。CachyOS Pacman 6.1 开始添加了功能验证功能,当使用 Arch Linux pacman 时,该功能可能会导致警告。CachyOS 正在与 Arch Linux 沟通,以再次提供适当的兼容性。
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
注意: 安装 CachyOS Pacman 将安装一个 pacman 的分支,其中包含从 CachyOS 添加的功能,例如 `INSTALLED_FROM` 和自动架构检查。CachyOS Pacman 6.1 开始添加了功能验证功能,当使用 Arch Linux pacman 时,该功能可能会导致警告。CachyOS 正在与 Arch Linux 沟通,以再次提供适当的兼容性。
注意:安装 CachyOS Pacman 将安装一个 pacman 的分支,其中包含从 CachyOS 添加的功能,例如 `INSTALLED_FROM` 和自动架构检查。CachyOS Pacman 6.1 开始添加了功能验证功能,当使用 Arch Linux pacman 时,该功能可能会导致警告。CachyOS 正在与 Arch Linux 沟通,以再次提供适当的兼容性。


如果你想避免这种情况,请不要添加 `[cachyos]` 仓库,其中包含自定义的 pacman。所有其他仓库,如 cachyos-v3、cachyos-v4、cachyos-extra/core-v3/4 都可以添加。

<tmpl z-lang="bash">
{{sudo}}pacman -U '{{endpoint}}/repo/x86_64/cachyos/cachyos-keyring-20240331-1-any.pkg.tar.zst' \
'{{endpoint}}/repo/x86_64/cachyos/cachyos-mirrorlist-18-1-any.pkg.tar.zst' \
'{{endpoint}}/repo/x86_64/cachyos/cachyos-v3-mirrorlist-18-1-any.pkg.tar.zst' \
'{{endpoint}}/repo/x86_64/cachyos/cachyos-v4-mirrorlist-6-1-any.pkg.tar.zst' \
'{{endpoint}}/repo/x86_64/cachyos/pacman-7.0.0.r3.gf3211df-3.1-x86_64.pkg.tar.zst'
</tmpl>

如果安装了 CachyOS 的 pacman 版本后需要回到 Arch Linux 仓库,你必须在回滚后运行以下命令,以避免收到 `%INSTALLED_DB%` 警告:

<tmpl z-lang="bash">
{{sudo}}find /var/lib/pacman/local/ -type f -name "desc" -exec sed -i '/^%INSTALLED_DB%$/,+2d' {} \;
</tmpl>

#### 3. 检查 CPU 兼容性

通过运行以下命令来检查支持:

<tmpl z-lang="bash">
/lib/ld-linux-x86-64.so.2 --help | grep supported
</tmpl>

与 `x86-64-v4` 指令集兼容的 CPU 输出示例:

> x86-64-v4 (supported, searched)
> x86-64-v3 (supported, searched)
> x86-64-v2 (supported, searched)

如果您看到 `x86-64-v4 (supported, searched)`,则表示 CPU 兼容并且可以使用 x86-64-v4 指令集。

#### 4. 添加 cachyos 仓库

您需要编辑 `/etc/pacman.conf` 并添加仓库。

* 如果您的 CPU 支持 x86-64,则仅添加 [cachyos] 仓库

<tmpl z-lang="ini" z-path="/etc/pacman.conf" z-append>
[cachyos]
Include = /etc/pacman.d/cachyos-mirrorlist
</tmpl>

* 如果您的 CPU 支持 x86-64-v3,则添加 [cachyos-v3]、[cachyos-core-v3]、[cachyos-extra-v3] 和 [cachyos]

<tmpl z-lang="ini" z-path="/etc/pacman.conf" z-append>
[cachyos-v3]
Include = /etc/pacman.d/cachyos-v3-mirrorlist
[cachyos-core-v3]
Include = /etc/pacman.d/cachyos-v3-mirrorlist
[cachyos-extra-v3]
Include = /etc/pacman.d/cachyos-v3-mirrorlist
[cachyos]
Include = /etc/pacman.d/cachyos-mirrorlist
</tmpl>

* 如果您的 CPU 支持 x86-64-v4,则添加 [cachyos-v4]、[cachyos-core-v4]、[cachyos-extra-v4] 和 [cachyos]

<tmpl z-lang="ini" z-path="/etc/pacman.conf" z-append>
[cachyos-v4]
Include = /etc/pacman.d/cachyos-v4-mirrorlist
[cachyos-core-v4]
Include = /etc/pacman.d/cachyos-v4-mirrorlist
[cachyos-extra-v4]
Include = /etc/pacman.d/cachyos-v4-mirrorlist
[cachyos]
Include = /etc/pacman.d/cachyos-mirrorlist
</tmpl>

最后,使用 CachyOS 软件包更新您的系统:

<tmpl z-lang="bash">
{{sudo}}pacman -Syu
</tmpl>
4 changes: 4 additions & 0 deletions cachyos/zh.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
_: CachyOS 软件仓库
block:
- intro
- usage