From bfeeafe5634f5d2ce7bc20be223d9e040c6ed907 Mon Sep 17 00:00:00 2001 From: JasonChio Date: Fri, 15 Apr 2022 17:18:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?docs(repo):=20=E6=9B=B4=E6=96=B0=20Readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 增加替换 openEuler 软件包源的方法 2. 增加 openEuler 可用软件包源，路径doc/whut/openeuler_x86-64.repo.txt --- README.md | 25 ++++++++++++--- docs/whut/openeuler_x86-64.repo.txt | 50 +++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 docs/whut/openeuler_x86-64.repo.txt diff --git a/README.md b/README.md index 1891d6f..6f4c9c7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,3 @@ -### OSS-Fuzz 项目简介 - - - ### OSS-Fuzz 移植项目简介 #### 项目需求 @@ -22,6 +18,10 @@ 5. 自动化用例 6. 测试报告 +#### 项目相关链接 + + + ### OSS-Fuzz 官方介绍 [OSS-Fuzz-README.md](https://gitee.com/jasonchio/oss-fuzz-openeuler/blob/master/OSS-Fuzz-README.md) @@ -38,6 +38,23 @@ - 如果没有同名包，则安装相同作用的包（`apt-get install -y libc6-dev` --> `yum install -y glibc-devel`） 4. 构建基于 openEuler 的镜像（`docker build -t fuzz-base-image:alpha1 .`），根据构建过程中的错误 log 修改 Dockerfile 直至镜像构建成功 +### 项目仓库的 fork 及基本设置 + +### openEuler repo 源替换 + +备份 repo 源 + +```shell +cp /ect/yum.repo.d/openEuler.repo /ect/yum.repo.d/openEuler.repo.bak +``` + +将仓库中 doc/whut/openeuler_x86-64.repo.txt 文件中的内容复制到 openEuler.repo 中（检查是否复制完全），重新生成缓存 + +```shell +yum clean all +yum makecache +``` + ### 设置 git 用户名及邮箱 ```bash diff --git a/docs/whut/openeuler_x86-64.repo.txt b/docs/whut/openeuler_x86-64.repo.txt new file mode 100644 index 0000000..c224610 --- /dev/null +++ b/docs/whut/openeuler_x86-64.repo.txt @@ -0,0 +1,50 @@ +#generic-repos is licensed under the Mulan PSL v2. +#You can use this software according to the terms and conditions of the Mulan PSL v2. +#You may obtain a copy of Mulan PSL v2 at: +# http://license.coscl.org.cn/MulanPSL2 +#THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR +#PURPOSE. +#See the Mulan PSL v2 for more details. + +[OS] +name=OS +baseurl=https://repo.huaweicloud.com/openeuler/openEuler-20.03-LTS-SP1/OS/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=https://repo.huaweicloud.com/openeuler/openEuler-20.03-LTS-SP1/OS/$basearch/RPM-GPG-KEY-openEuler + +[everything] +name=everything +baseurl=https://repo.huaweicloud.com/openeuler/openEuler-20.03-LTS-SP1/everything/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=https://repo.huaweicloud.com/openeuler/openEuler-20.03-LTS-SP1/everything/$basearch/RPM-GPG-KEY-openEuler + +[EPOL] +name=EPOL +baseurl=https://repo.huaweicloud.com/openeuler/openEuler-20.03-LTS-SP1/EPOL/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=https://repo.huaweicloud.com/openeuler/openEuler-20.03-LTS-SP1/OS/$basearch/RPM-GPG-KEY-openEuler + +[debuginfo] +name=debuginfo +baseurl=https://repo.huaweicloud.com/openeuler/openEuler-20.03-LTS-SP1/debuginfo/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=https://repo.huaweicloud.com/openeuler/openEuler-20.03-LTS-SP1/debuginfo/$basearch/RPM-GPG-KEY-openEuler + +[source] +name=source +baseurl=https://repo.huaweicloud.com/openeuler/openEuler-20.03-LTS-SP1/source/ +enabled=1 +gpgcheck=1 +gpgkey=https://repo.huaweicloud.com/openeuler/openEuler-20.03-LTS-SP1/source/RPM-GPG-KEY-openEuler + +[update] +name=update +baseurl=https://repo.huaweicloud.com/openeuler/openEuler-20.03-LTS-SP1/update/$basearch/ +enabled=0 +gpgcheck=1 +gpgkey=https://repo.huaweicloud.com/openeuler/openEuler-20.03-LTS-SP1/OS/$basearch/RPM-GPG-KEY-openEuler \ No newline at end of file -- Gitee From f623d3e5d546f36860a91b0989f8151d55351d09 Mon Sep 17 00:00:00 2001 From: JasonChio Date: Fri, 15 Apr 2022 22:10:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat(base-image):=20=E7=A7=BB=E6=A4=8D=20ba?= =?UTF-8?q?se-image=20=E8=87=B3=20openEuler=2020.03=20LTS=20SP3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. ubuntu:20.04 基础镜像替换为 openEuler:20.03-lts-sp3; 2. 包管理工具替换为 yum; 3. libc6-dev 替换为 glibc-devel，libgcc-9-dev 替换为 gcc; --- infra/base-images/base-image/Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/infra/base-images/base-image/Dockerfile b/infra/base-images/base-image/Dockerfile index bc6035b..cb30aca 100644 --- a/infra/base-images/base-image/Dockerfile +++ b/infra/base-images/base-image/Dockerfile @@ -16,12 +16,11 @@ # Base image for all other images. -FROM ubuntu:20.04 +FROM openeuler/openeuler:20.03-lts-sp3 ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get install -y libc6-dev binutils libgcc-9-dev && \ - apt-get autoremove -y +RUN yum clean all && \ + yum makecache && \ + yum install -y glibc-devel binutils gcc ENV OUT=/out ENV SRC=/src -- Gitee From b7983de07d7641014c92d0c0fe52dcb5a35003b2 Mon Sep 17 00:00:00 2001 From: JasonChio Date: Fri, 15 Apr 2022 20:39:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?docs(repo):=20=E6=9B=B4=E6=96=B0=20Readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 增加 项目仓库的 fork 及基本设置 相关教程 --- .git-commit-template | 2 +- README.md | 93 +++++++++++++++++++++++++--- docs/images/copy-gitee-link.png | Bin 0 -> 2389885 bytes docs/images/git-add.png | Bin 0 -> 922949 bytes docs/images/git-commit.png | Bin 0 -> 683548 bytes docs/images/git-status.png | Bin 0 -> 1226610 bytes docs/images/gitee-private-repos.png | Bin 0 -> 2170786 bytes 7 files changed, 86 insertions(+), 9 deletions(-) create mode 100644 docs/images/copy-gitee-link.png create mode 100644 docs/images/git-add.png create mode 100644 docs/images/git-commit.png create mode 100644 docs/images/git-status.png create mode 100644 docs/images/gitee-private-repos.png diff --git a/.git-commit-template b/.git-commit-template index 457b43f..4338fd1 100644 --- a/.git-commit-template +++ b/.git-commit-template @@ -27,5 +27,5 @@ # 5. body 每行 72 个字 # 6. body 用于解释为什么和是什么,而不是怎么做 # 7. footer 暂时无需填写 -# 8. scope 可选，建议填写为受影响的 base-image 或 project +# 8. scope 可选，建议填写为受影响的 base-image 或 repo # ----------------------------------------- diff --git a/README.md b/README.md index 6f4c9c7..281b59b 100644 --- a/README.md +++ b/README.md @@ -20,13 +20,14 @@ #### 项目相关链接 - +- [项目管理文档](https://docs.qq.com/sheet/DSEdBWHJYbFdBa2xj?u=3e90927134394f638bdb49b5eeb21229&tab=BB08J2) +- [OSS-Fuzz GitHub 主页](https://github.com/google/oss-fuzz) ### OSS-Fuzz 官方介绍 [OSS-Fuzz-README.md](https://gitee.com/jasonchio/oss-fuzz-openeuler/blob/master/OSS-Fuzz-README.md) -### Ubuntu --> openEuler 移植思路 +### 基础镜像移植思路 移植思路： @@ -38,8 +39,6 @@ - 如果没有同名包，则安装相同作用的包（`apt-get install -y libc6-dev` --> `yum install -y glibc-devel`） 4. 构建基于 openEuler 的镜像（`docker build -t fuzz-base-image:alpha1 .`），根据构建过程中的错误 log 修改 Dockerfile 直至镜像构建成功 -### 项目仓库的 fork 及基本设置 - ### openEuler repo 源替换 备份 repo 源 @@ -48,21 +47,41 @@ cp /ect/yum.repo.d/openEuler.repo /ect/yum.repo.d/openEuler.repo.bak ``` -将仓库中 doc/whut/openeuler_x86-64.repo.txt 文件中的内容复制到 openEuler.repo 中（检查是否复制完全），重新生成缓存 +将仓库中 docs/whut/openeuler_x86-64.repo.txt 文件中的内容复制到 openEuler.repo 中（检查是否复制完全），重新生成缓存 ```shell yum clean all yum makecache ``` -### 设置 git 用户名及邮箱 +### 项目仓库的 fork 及基本设置 + +#### fork 项目 + +加入项目主仓库之后，界面右上角（头像下面）会有 Fork 按钮，点击该按钮将项目 fork 到个人仓库中。 + +![Gitee 个人仓库](docs\images\gitee-private-repos.png) + +#### clone + +在项目主页复制项目 Git 链接 + +![copy-gitee-link](docs\images\copy-gitee-link.png) + +将项目克隆到本地 + +```shell +git clone repo_link +``` + +#### 设置 git 用户名及邮箱 ```bash git config --global user.name "你的用户名" git config --global user.email "你注册时候的邮箱" ``` -### 免密 push +#### 免密 push 解决 git push 时每次都需要输入用户名和密码的问题 ```bash # oss-fuzz-openeuler 目录下输入 @@ -72,7 +91,65 @@ git push # 输入账号密码后，下次 push 就不用输入了 ```` -### git commit message 规范 +#### 提交修改 + +1. `git status`查看有变动的文件 + + ![git-status](docs\images\git-status.png) + +2. `git add .`将所有有变动的文件都加入到暂存区 + + ![git-add](docs\images\git-add.png) + +3. `git commit`填写 commit message，将修改提交 + + ![git-commit](docs\images\git-commit.png) + +4. `git push`将修改提交到 Gitee 仓库（支持多次 commit 操作之后一起提交到 Gitee 仓库） + + ![git-push](docs\images\git-push.png) + +5. 完成一次变动提交 + +#### git commit message 规范 + +设定项目提交模板 + +```shell +git config --global commit.template .git-commit-template +``` + +在编写 commit message 时，遵循以下规范 + +```shell +():space +blank line + +blank line +