From 3e5d02a3674fba89907fada9c1933ba8399f374e Mon Sep 17 00:00:00 2001 From: Caspar Zhang Date: Mon, 19 Aug 2019 20:45:43 +0800 Subject: [PATCH] use unified project name Cloud Kernel We had too many names for our projects before, Aliyun Linux Kernel(ALK), Alibaba Cloud Linux Kernel, Cloud Kernel, etc. Now we have a unified project name as the "Cloud Kernel". If the company name should appear if necessary, the name "Alibaba Cloud Kernel" would be used. Signed-off-by: Caspar Zhang --- CONTRIBUTING.md | 10 +++++----- README.md | 20 ++++++++++---------- zh/CONTRIBUTING.md | 12 ++++++------ zh/CREDITS.md | 2 +- zh/README.md | 24 ++++++++++++------------ zh/os.md | 2 +- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5d7c1ae8690b..0dc7d6bc8869 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ Table of Contents ## 1. Report Bugs -The easiest way to participate in contributing to the project is just use ALK and Alibaba Cloud Linux OS, then report bugs to us. However, there are some ground rules against special types of bugs when filing a bug. +The easiest way to participate in contributing to the project is just use Cloud Kernel and Alibaba Cloud Linux OS, then report bugs to us. However, there are some ground rules against special types of bugs when filing a bug. ### 1.1 Report security issues @@ -41,7 +41,7 @@ Feel free to file bug reports in our project [issues](https://github.com/alibaba ### 1.4 Report Alibaba Cloud Linux OS issues -ALK has tight connections with Alibaba Cloud Linux OS, if you run into any Alibaba Cloud Linux OS problems, feel free to file a bug report in our project [issues](https://github.com/alibaba/cloud-kernel/issues) page as well, or start a thread in [mailing lists](MAILLIST.md) or in [Alibaba Cloud Developer forum](https://bbs.aliyun.com/thread/450.html). +Cloud Kernel has tight connections with Alibaba Cloud Linux OS, if you run into any Alibaba Cloud Linux OS problems, feel free to file a bug report in our project [issues](https://github.com/alibaba/cloud-kernel/issues) page as well, or start a thread in [mailing lists](MAILLIST.md) or in [Alibaba Cloud Developer forum](https://bbs.aliyun.com/thread/450.html). ## 2. Help to improve @@ -50,7 +50,7 @@ ALK has tight connections with Alibaba Cloud Linux OS, if you run into any Aliba Before you decide to involve in kernel development, you need to get kernel source and build it. You can download a stable release source from [Releases](https://github.com/alibaba/cloud-kernel/releases) page, then extract the source to a directory: ```shell -tar xzf alk-release-7.tar.gz +tar xzf ck-release-7.tar.gz ``` Alternatively, you can use Git to clone from our git repo. @@ -60,7 +60,7 @@ git clone git@github.com:alibaba/cloud-kernel.git cd cloud-kernel ``` -> You may have noticed that `master` is not the default branch, instead, you would get a branch named like `alk-4.19.y`. This is due to our 'rebase' approach, every time we rebase from an LTS version, a new branch will be created and then be used as the default branch. +> You may have noticed that `master` is not the default branch, instead, you would get a branch named like `ck-4.19.y`. This is due to our 'rebase' approach, every time we rebase from an LTS version, a new branch will be created and then be used as the default branch. ### 2.2 Build kernel @@ -88,6 +88,6 @@ Next, you can just reboot and run into the new kernel. Please make sure you have ### 2.3 Propose a patch -During your daily using of ALK, you might have found some bugs and you are managed to find a way to fix it. So you probably want to propose a patch to us. +During your daily using of Cloud Kernel, you might have found some bugs and you are managed to find a way to fix it. So you probably want to propose a patch to us. You can follow the [submitting patches guide from kernel.org](https://www.kernel.org/doc/html/latest/process/submitting-patches.html), when your code is ready, you can just subscribe to our [developer's mailing list](MAILLIST.md#alibaba-cloud-linux-os-kernel-developers-group) and send the patch to us. diff --git a/README.md b/README.md index 1ee3c86a0574..092c14f42a95 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -Alibaba Cloud Linux Kernel -========================== +Alibaba Cloud Kernel +==================== + [中文版](zh/README.md) Table of Contents ----------------- -1. [What is Alibaba Cloud Linux Kernel](#1-what-is-alibaba-cloud-linux-kernel) +1. [What is Alibaba Cloud Kernel](#1-what-is-alibaba-cloud-kernel) 2. [Getting Started](#2-getting-started) 1. [Run with pre-built RPMs (recommended)](#21-run-with-pre-built-rpms-recommended) 2. [Compile from source](#22-compile-from-source) @@ -17,17 +17,17 @@ Table of Contents --------------------------------- -## 1. What is Alibaba Cloud Linux Kernel +## 1. What is Alibaba Cloud Kernel -Alibaba Cloud Linux Kernel (ALK), a customized and optimized version of Linux kernel, is originated by Alibaba Operating System Team (formerly known as Taobao Kernel Team). ALK is installed as the default kernel in Alibaba Cloud Linux OS version 2 (a.k.a Aliyun Linux 2), which is running on Alibaba Cloud Elastic Compute Service (ECS) product. In ALK, several features and enhancements adapted to specific Alibaba Cloud infrastructre and products have been made to help Alibaba Cloud customers to achieve better user experiences. +Alibaba Cloud Kernel(a.k.a. the "Cloud Kernel"), a customized and optimized version of Linux kernel, is originated by Alibaba Operating System Team (formerly known as Taobao Kernel Team). Cloud Kernel is installed as the default kernel in Alibaba Cloud Linux OS version 2 (or Aliyun Linux 2), which is running on Alibaba Cloud Elastic Compute Service (ECS) product. In Cloud Kernel, several features and enhancements adapted to specific Alibaba Cloud infrastructre and products have been made to help Alibaba Cloud customers to achieve better user experiences. -Like many other kernels, ALK should work with almost all commonly-used Linux distributions, however, we highly recommend you run it in Alibaba Cloud Linux OS with Alibaba Cloud ECS instances to get best functionality, performance and stability. +Like many other kernels, Cloud Kernel should work with almost all commonly-used Linux distributions, however, we highly recommend you run it in Alibaba Cloud Linux OS with Alibaba Cloud ECS instances to get best functionality, performance and stability. To get more information about Alibaba Cloud Linux OS, please refer to [this](os.md) link. ## 2. Getting Started -To use ALK, you may want either to run a pre-built version or to compile it from source codes. Note that the default kernel configuration file is a customized version for Alibaba Cloud ECS instances, you might need to enable specific drivers and re-compile the kernel if you want to run it on non-ECS platforms. +To use Cloud Kernel, you may want either to run a pre-built version or to compile it from source codes. Note that the default kernel configuration file is a customized version for Alibaba Cloud ECS instances, you might need to enable specific drivers and re-compile the kernel if you want to run it on non-ECS platforms. ### 2.1 Run with pre-built RPMs (recommended) @@ -56,7 +56,7 @@ gpgkey=http://mirrors.aliyun.com/alinux/RPM-GPG-KEY-ALIYUN sudo yum install -y kernel kernel-devel kernel-headers ``` -+ Step 4: Reboot system and enjoy ALK. ++ Step 4: Reboot system and enjoy Cloud Kernel. ### 2.2 Compile from source @@ -76,11 +76,11 @@ sudo make modules_install sudo make install ``` -+ Step 4: Reboot system and enjoy ALK. ++ Step 4: Reboot system and enjoy Cloud Kernel. ## 3. Contributing -There are different ways to contribute to ALK project, please read [CONTRIBUTING](CONTRIBUTING.md) file to get more details. +There are different ways to contribute to Cloud Kernel project, please read [CONTRIBUTING](CONTRIBUTING.md) file to get more details. ## 4. Credits diff --git a/zh/CONTRIBUTING.md b/zh/CONTRIBUTING.md index 5494d593cd3d..a89f254a2253 100644 --- a/zh/CONTRIBUTING.md +++ b/zh/CONTRIBUTING.md @@ -19,7 +19,7 @@ ## 1. 报告 BUG -参与本项目最直接的方式就是使用 ALK 和 Alibaba Cloud Linux 操作系统并向我们报告使用中遇到的 BUG. 不过在提交 BUG 报告之前，需要先了解一些基本原则： +参与本项目最直接的方式就是使用 Cloud Kernel 和 Alibaba Cloud Linux 操作系统并向我们报告使用中遇到的 BUG. 不过在提交 BUG 报告之前，需要先了解一些基本原则： ### 1.1 报告安全漏洞 @@ -41,7 +41,7 @@ ### 1.4 报告 Alibaba Cloud Linux 操作系统 BUG -ALK 与 Alibaba Cloud Linux 操作系统关系紧密，如果您遇到任何 Alibaba Cloud Linux 操作系统相关的问题，也请在项目的 [issues](https://github.com/alibaba/cloud-kernel/issues) 页面提交 BUG 报告，或者在[邮件列表](MAILLIST.md)及[阿里云开发者论坛](https://bbs.aliyun.com/thread/450.html)参与讨论。 +Cloud Kernel 与 Alibaba Cloud Linux 操作系统关系紧密，如果您遇到任何 Alibaba Cloud Linux 操作系统相关的问题，也请在项目的 [issues](https://github.com/alibaba/cloud-kernel/issues) 页面提交 BUG 报告，或者在[邮件列表](MAILLIST.md)及[阿里云开发者论坛](https://bbs.aliyun.com/thread/450.html)参与讨论。 ## 2. 帮助改进项目 @@ -50,7 +50,7 @@ ALK 与 Alibaba Cloud Linux 操作系统关系紧密，如果您遇到任何 Ali 在决定参与内核开发之前，建议您先获取内核源码并构建内核。您可以从 [Releases](https://github.com/alibaba/cloud-kernel/releases) 页面下载到稳定版内核的压缩包，然后解压缩到某个目录： ```shell -tar xzf alk-release-7.tar.gz +tar xzf ck-release-7.tar.gz ``` 或者您也可以从我们的 Git 仓库 Clone 代码： @@ -60,7 +60,7 @@ git clone git@github.com:alibaba/cloud-kernel.git cd cloud-kernel ``` -> 您或许已经注意到项目的默认分支并非 `master` 分支而是形如 `alk-4.19.y` 格式的分支。这是由于我们采用了 "rebase" 策略来更新我们的代码，每次从 Upstream LTS 版本同步代码后，我们都会 rebase 到新的代码分支，并将此分支作为新的默认分支。 +> 您或许已经注意到项目的默认分支并非 `master` 分支而是形如 `ck-4.19.y` 格式的分支。这是由于我们采用了 "rebase" 策略来更新我们的代码，每次从 Upstream LTS 版本同步代码后，我们都会 rebase 到新的代码分支，并将此分支作为新的默认分支。 ### 2.2 构建内核 @@ -89,6 +89,6 @@ sudo make install ### 2.3 提交补丁 -在您日常使用 ALK 过程中，您或许发现了一些内核 BUG，并且找到了修复它的方法。欢迎将修复整理成补丁发送给我们。 +在您日常使用 Cloud Kernel 过程中，您或许发现了一些内核 BUG，并且找到了修复它的方法。欢迎将修复整理成补丁发送给我们。 -ALK 的开发和 Linux 内核社区开发模式基本一致，您可以参阅 kernel.org 上的 "[submitting patches guide](https://www.kernel.org/doc/html/latest/process/submitting-patches.html)" 一文，在您制作完补丁之后，您可以将补丁发送到我们的[开发者邮件列表](MAILLIST.md#alibaba-cloud-linux-os-kernel-developers-group)中提交审阅。 +Cloud Kernel 的开发和 Linux 内核社区开发模式基本一致，您可以参阅 kernel.org 上的 "[submitting patches guide](https://www.kernel.org/doc/html/latest/process/submitting-patches.html)" 一文，在您制作完补丁之后，您可以将补丁发送到我们的[开发者邮件列表](MAILLIST.md#alibaba-cloud-linux-os-kernel-developers-group)中提交审阅。 diff --git a/zh/CREDITS.md b/zh/CREDITS.md index 49cd23d5c417..dedc590b301b 100644 --- a/zh/CREDITS.md +++ b/zh/CREDITS.md @@ -1,7 +1,7 @@ 致谢 ==== -> 本文件包含了在 Alibaba Cloud Linux 操作系统和 ALK 项目中作出贡献的个人和团队开发者名单。该名单会不断更新，如有遗漏请联系 alicloud-linux-os@service.aliyun.com . +> 本文件包含了在 Alibaba Cloud Linux 操作系统和 Cloud Kernel 项目中作出贡献的个人和团队开发者名单。该名单会不断更新，如有遗漏请联系 alicloud-linux-os@service.aliyun.com . ---------------------------- diff --git a/zh/README.md b/zh/README.md index 676716802d58..bb1318c568eb 100644 --- a/zh/README.md +++ b/zh/README.md @@ -1,11 +1,11 @@ -阿里云 Linux 内核 (Alibaba Cloud Linux Kernel) -============================================== +阿里云内核 (Alibaba Cloud Kernel) +================================= + [English Version](../README.md) 目录 ---- -1. [阿里云 Linux 内核是什么](#1-阿里云-linux-内核是什么) +1. [阿里云内核是什么](#1-阿里云内核是什么) 2. [快速运行指南](#2-快速运行指南j) 1. [运行预编译二进制内核包(推荐)](#21-运行预编译二进制内核包推荐) 2. [从源码编译内核](#22-从源码编译内核) @@ -17,17 +17,17 @@ --------------------------------- -## 1. 阿里云 Linux 内核是什么 +## 1. 阿里云内核是什么 -阿里云 Linux 内核 (Alibaba Cloud Linux Kernel, ALK) 是由阿里巴巴操作系统团队（原淘宝内核组）开发的一款定制优化版的内核产品，默认运行在带 Alibaba Cloud Linux 2 操作系统（即 Aliyun Linux 2）的阿里云 ECS 产品中。在 ALK 中实现了若干针对阿里云基础设施和产品而优化的特性和改进功能，旨在提高阿里云客户的使用体验。 +阿里云内核 (Alibaba Cloud Kernel, 以下简称 Cloud Kernel) 是由阿里巴巴操作系统团队（原淘宝内核组）开发的一款定制优化版的内核产品，默认运行在带 Alibaba Cloud Linux 2 操作系统（即 Aliyun Linux 2）的阿里云 ECS 产品中。在 Cloud Kernel 中实现了若干针对阿里云基础设施和产品而优化的特性和改进功能，旨在提高阿里云客户的使用体验。 -与其他 Linux 内核产品类似，ALK 理论上可以运行于几乎所有常见的 Linux 发行版中。为了获得更好的功能、性能和稳定性，我们强烈建议您将其运行在带 Alibaba Cloud Linux 2 的阿里云 ECS 实例中。 +与其他 Linux 内核产品类似，Cloud Kernel 理论上可以运行于几乎所有常见的 Linux 发行版中。为了获得更好的功能、性能和稳定性，我们强烈建议您将其运行在带 Alibaba Cloud Linux 2 的阿里云 ECS 实例中。 如需了解 Alibaba Cloud Linux 2 操作系统，请访问[此链接](os.md)。 ## 2. 快速运行指南 -想要使用 ALK，您既可以运行预编译的二进制内核包，也可以从源码编译内核。请注意我们提供的默认内核配置文件是为阿里云 ECS 实例定制的版本，如果您想要将内核运行于非 ECS 平台上，您需要自行打开相关的内核模块开关并且重新编译内核。 +想要使用 Cloud Kernel，您既可以运行预编译的二进制内核包，也可以从源码编译内核。请注意我们提供的默认内核配置文件是为阿里云 ECS 实例定制的版本，如果您想要将内核运行于非 ECS 平台上，您需要自行打开相关的内核模块开关并且重新编译内核。 ### 2.1 运行预编译二进制内核包(推荐) @@ -56,11 +56,11 @@ gpgkey=http://mirrors.aliyun.com/alinux/RPM-GPG-KEY-ALIYUN sudo yum install -y kernel kernel-devel kernel-headers ``` -+ 第四步，重启并使用 ALK. ++ 第四步，重启并使用 Cloud Kernel. ### 2.2 从源码编译内核 -+ 第一步，从以下两种途径之一获取 ALK 源码： ++ 第一步，从以下两种途径之一获取 Cloud Kernel 源码： + 从 [Releases](https://github.com/alibaba/cloud-kernel/releases) 页面获取最新的稳定版内核代码压缩包，并解压到当前目录； + 或者从项目 Git 树 Clone 代码： `git clone git@github.com:alibaba/cloud-kernel.git`. @@ -76,15 +76,15 @@ sudo make modules_install sudo make install ``` -+ 第四步，重启并使用 ALK. ++ 第四步，重启并使用 Cloud Kernel. ## 3. 参与本项目 -参与 ALK 项目的方式有很多，具体信息可以从 [CONTRIBUTING](CONTRIBUTING.md) 页面获取。 +参与 Cloud Kernel 项目的方式有很多，具体信息可以从 [CONTRIBUTING](CONTRIBUTING.md) 页面获取。 ## 4. 致谢 -ALK 和 Alibaba Cloud Linux OS 项目是“站在巨人的肩膀上”且聚合了阿里巴巴集团内外众多个人贡献者和团队开发者之力完成的项目。致谢名单可以在 [CREDITS](CREDITS.md) 页面获取，我们也会不断更新该名单。此外，我们需要特别致谢下列项目： +Cloud Kernel 和 Alibaba Cloud Linux OS 项目是“站在巨人的肩膀上”且聚合了阿里巴巴集团内外众多个人贡献者和团队开发者之力完成的项目。致谢名单可以在 [CREDITS](CREDITS.md) 页面获取，我们也会不断更新该名单。此外，我们需要特别致谢下列项目： + [CentOS project](https://www.centos.org/); + [Clear Linux project](https://clearlinux.org/); diff --git a/zh/os.md b/zh/os.md index d20a191548a3..ad2d9fe9b4a4 100644 --- a/zh/os.md +++ b/zh/os.md @@ -39,7 +39,7 @@ sudo yum install -y yum-utils sudo yumdownloader --source <包名> ``` -此外，您还可以从 [Alibaba Cloud Linux Kernel](https://github.com/alibaba/cloud-kernel) 的 Github 项目中获取阿里云 Linux 内核(ALK)源码。 +此外，您还可以从 [Alibaba Cloud Linux Kernel](https://github.com/alibaba/cloud-kernel) 的 Github 项目中获取阿里云内核(Cloud Kernel)源码。 ## 4. 获取帮助 -- GitLab