From 90bf4456c05ceec38fcaf631fe19b8b83eeecbe1 Mon Sep 17 00:00:00 2001 From: saarloos <9090-90-90-9090@163.com> Date: Fri, 10 Jun 2022 15:19:42 +0800 Subject: [PATCH 1/2] fix yajl patch name change Signed-off-by: saarloos <9090-90-90-9090@163.com> --- meta-openeuler/recipes-core/yajl/yajl_2.1.0.bb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta-openeuler/recipes-core/yajl/yajl_2.1.0.bb b/meta-openeuler/recipes-core/yajl/yajl_2.1.0.bb index 5f77805e097..555830a5fbd 100644 --- a/meta-openeuler/recipes-core/yajl/yajl_2.1.0.bb +++ b/meta-openeuler/recipes-core/yajl/yajl_2.1.0.bb @@ -4,12 +4,13 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "file://yajl/${PV}.tar.gz \ - file://yajl/yajl-2.1.0-pkgconfig-location.patch \ - file://yajl/yajl-2.1.0-pkgconfig-includedir.patch \ - file://yajl/yajl-2.1.0-test-location.patch \ - file://yajl/yajl-2.1.0-dynlink-binaries.patch \ - file://yajl/yajl-2.1.0-fix-memory-leak.patch \ - file://yajl/backport-fix-memory-leaks.patch \ + file://yajl/0001-yajl-2.1.0-pkgconfig-location.patch \ + file://yajl/0002-yajl-2.1.0-pkgconfig-includedir.patch \ + file://yajl/0003-yajl-2.1.0-test-location.patch \ + file://yajl/0004-yajl-2.1.0-dynlink-binaries.patch \ + file://yajl/0005-yajl-2.1.0-fix-memory-leak.patch \ + file://yajl/0006-fix-memory-leak-of-ctx-root.patch \ + file://yajl/0007-add-cmake-option-for-test-and-binary.patch \ " S = "${WORKDIR}/${BPN}-${PV}" -- Gitee From c14f69919e90db7ad83dd45031e6416117779730 Mon Sep 17 00:00:00 2001 From: alichinese Date: Thu, 30 Jun 2022 16:53:26 +0800 Subject: [PATCH 2/2] docs: add new index.rst for commit msg specification add new file in docs for commit msg specification Signed-off-by: lixinyu lixinyu44@huawei.com --- docs/source/commit_msg/index.rst | 32 ++++++++++++++++++++++++ docs/source/contribute_doc.rst | 1 + docs/source/index.rst | 1 + docs/source/introduction/index.rst | 2 +- docs/source/security_hardening/index.rst | 1 - 5 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 docs/source/commit_msg/index.rst diff --git a/docs/source/commit_msg/index.rst b/docs/source/commit_msg/index.rst new file mode 100644 index 00000000000..bf2e4fdca80 --- /dev/null +++ b/docs/source/commit_msg/index.rst @@ -0,0 +1,32 @@ +.. _commit_msg: + +commit提交规范 +###################################### + +开发人员提交带有修复程序的gitee pr，其commit msg需遵循相同的准则，该检查是基于gitlint工具来检查 + +- **commit msg规范** + +commit msg提交规范由三部分组成:title, body, foot + +title简明说明该次pr提交信息，（：）号前面是模块儿名，后面是简要信息 + +body详细说明该次提交的信息 + +foot由固定格式组成,第一部分是Signed-off-by，空格后是开发者用户名，再空格后是开发者邮箱 + + script: this is title + + this is body + + Signed-off-by: xxx xxx@yy.com + +- **范例** + +以下是一个提交范例 + + yocto: support compile xxx + + support compile xxx, this module is new and deal some archs now not supporting + + Signed-off-by: xxx xxx@xxx.com \ No newline at end of file diff --git a/docs/source/contribute_doc.rst b/docs/source/contribute_doc.rst index d8fc2681c4b..042afdeba6a 100644 --- a/docs/source/contribute_doc.rst +++ b/docs/source/contribute_doc.rst @@ -1,5 +1,6 @@ .. _contribute_doc: + 如何撰写并贡献文档 ################## diff --git a/docs/source/index.rst b/docs/source/index.rst index 4b5e083301d..1424c6ff553 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -23,6 +23,7 @@ openEuler Embedded在内核版本、软件包版本等代码层面会与openEule features/index.rst yocto/index.rst qemu/index.rst + commit_msg/index.rst contribute_doc.rst security_hardening/index.rst releases/index.rst diff --git a/docs/source/introduction/index.rst b/docs/source/introduction/index.rst index 0124cfe6d6e..4840ad12e67 100644 --- a/docs/source/introduction/index.rst +++ b/docs/source/introduction/index.rst @@ -1,4 +1,4 @@ -.. _introducing_openeuler_embedded: +.. _introducing: 总体介绍 diff --git a/docs/source/security_hardening/index.rst b/docs/source/security_hardening/index.rst index 93783341ca1..3f641d95844 100644 --- a/docs/source/security_hardening/index.rst +++ b/docs/source/security_hardening/index.rst @@ -1,6 +1,5 @@ .. _security_hardening: - 安全加固说明 ################################ -- Gitee