From 83311128c1dbddead835cbc23f0ef11cb4626d00 Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 01:41:11 +0000 Subject: [PATCH 1/9] update component/DevKitWeb/devkit_installer/installer_command_line.py. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- component/DevKitWeb/devkit_installer/installer_command_line.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component/DevKitWeb/devkit_installer/installer_command_line.py b/component/DevKitWeb/devkit_installer/installer_command_line.py index 049c3db..56b82fe 100644 --- a/component/DevKitWeb/devkit_installer/installer_command_line.py +++ b/component/DevKitWeb/devkit_installer/installer_command_line.py @@ -1,6 +1,6 @@ import argparse -PACKAGE_NAME = "DevKit-All-24.0.RC3-Linux-Kunpeng.tar.gz" +PACKAGE_NAME = "DevKit-All-24.0.T50-Linux-Kunpeng.tar.gz" class CommandLine: -- Gitee From 302a1b8d7eda9f30415c372dd4ea0a1b7545f57f Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 01:42:03 +0000 Subject: [PATCH 2/9] update tools/download_and_deploy/src/download/download_config.py. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- .../src/download/download_config.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/download_and_deploy/src/download/download_config.py b/tools/download_and_deploy/src/download/download_config.py index 9469e82..59f77f0 100644 --- a/tools/download_and_deploy/src/download/download_config.py +++ b/tools/download_and_deploy/src/download/download_config.py @@ -21,32 +21,32 @@ BiShengJDK17 = { CompatibilityTesting = { "component_name": "CompatibilityTesting", - "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.4/compatibility_testing.tar.gz", + "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.1/compatibility_testing.tar.gz", "file_size": "37157928", } DevKitTester = { "component_name": "DevKitTester", - "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.4/devkit_tester.tar.gz", + "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.1/devkit_tester.tar.gz", "file_size": "36155839", } A_FOT = { "component_name": "A-FOT", - "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.4/a-fot.tar.gz", + "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.1/a-fot.tar.gz", "file_size": "15740", } DevKitWeb = { "component_name": "DevKitWeb", - "file": "https://mirrors.huaweicloud.com/kunpeng/archive/DevKit/Packages/Kunpeng_DevKit/DevKit-All-24.0.RC3-Linux-Kunpeng.tar.gz", - "file_size": "1279995524", + "file": "https://mirrors.huaweicloud.com/kunpeng/archive/DevKit/Packages/Kunpeng_DevKit/DevKit-All-24.0.T50-Linux-Kunpeng.tar.gz", + "file_size": "1363766065", } DevKitCLI = { "component_name": "DevKitCLI", - "file": "https://mirrors.huaweicloud.com/kunpeng/archive/DevKit/Packages/Kunpeng_DevKit/DevKit-CLI-24.0.RC3-Linux-Kunpeng.tar.gz", - "file_size": "649281376", + "file": "https://mirrors.huaweicloud.com/kunpeng/archive/DevKit/Packages/Kunpeng_DevKit/DevKit-CLI-24.0.T50-Linux-Kunpeng.tar.gz", + "file_size": "783553392", } -- Gitee From bf301a3b2e9b9887a6cd35180ec504aabf51c93d Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 01:43:42 +0000 Subject: [PATCH 3/9] update tools/download_and_deploy/src/component_install/devkitweb_deploy.py. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- .../src/component_install/devkitweb_deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/download_and_deploy/src/component_install/devkitweb_deploy.py b/tools/download_and_deploy/src/component_install/devkitweb_deploy.py index 98ae1f0..b0178d9 100644 --- a/tools/download_and_deploy/src/component_install/devkitweb_deploy.py +++ b/tools/download_and_deploy/src/component_install/devkitweb_deploy.py @@ -10,7 +10,7 @@ from utils import base_path, CHECK_OPT_SPACE_SUFFICIENT_FOR_PACKAGE, CHECK_SUDO_ class DevkitWebDeploy(DeployBase): component_name = "DevKitWeb" remote_file_list = [ - os.path.join("/opt", "DevKit-All-24.0.RC3-Linux-Kunpeng.tar.gz") + os.path.join("/opt", "DevKit-All-24.0.T50-Linux-Kunpeng.tar.gz") ] @classmethod -- Gitee From a0962841ddf436ad9f6a93110789d5875ab30b58 Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 01:45:12 +0000 Subject: [PATCH 4/9] update component/DevKitCLI/install.sh. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- component/DevKitCLI/install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/component/DevKitCLI/install.sh b/component/DevKitCLI/install.sh index 390fc6f..7ebad08 100644 --- a/component/DevKitCLI/install.sh +++ b/component/DevKitCLI/install.sh @@ -4,14 +4,14 @@ cd /tmp/devkitdependencies/ function main() { mkdir -p ${HOME}/.local - echo "Decompress DevKit-CLI-24.0.RC3-Linux-Kunpeng.tar.gz to ${HOME}/.local" - tar --no-same-owner -zxf /tmp/devkitdependencies/DevKit-CLI-24.0.RC3-Linux-Kunpeng.tar.gz -C ${HOME}/.local - echo "Decompress DevKit-CLI-24.0.RC3-Linux-Kunpeng.tar.gz to ${HOME}/.local finished." + echo "Decompress DevKit-CLI-24.0.T50-Linux-Kunpeng.tar.gz to ${HOME}/.local" + tar --no-same-owner -zxf /tmp/devkitdependencies/DevKit-CLI-24.0.T50-Linux-Kunpeng.tar.gz -C ${HOME}/.local + echo "Decompress DevKit-CLI-24.0.T50-Linux-Kunpeng.tar.gz to ${HOME}/.local finished." echo "change ${HOME}/.bashrc" - sed -i '/DevKit-CLI-24.0.RC3-Linux-Kunpeng/d' ${HOME}/.bashrc + sed -i '/DevKit-CLI-24.0.T50-Linux-Kunpeng/d' ${HOME}/.bashrc cat >> ${HOME}/.bashrc <<'EOF' -export PATH=${HOME}/.local/DevKit-CLI-24.0.RC3-Linux-Kunpeng:${PATH} +export PATH=${HOME}/.local/DevKit-CLI-24.0.T50-Linux-Kunpeng:${PATH} EOF echo "source ${HOME}/.bashrc" -- Gitee From c95724ca27f35a502ff53a7f48df3b05a0e675a9 Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 01:45:56 +0000 Subject: [PATCH 5/9] update component/DevKitCLI/check_install_result.sh. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- component/DevKitCLI/check_install_result.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component/DevKitCLI/check_install_result.sh b/component/DevKitCLI/check_install_result.sh index 1891d28..db3af57 100644 --- a/component/DevKitCLI/check_install_result.sh +++ b/component/DevKitCLI/check_install_result.sh @@ -1,7 +1,7 @@ #!/bin/bash devkit_path=$(which devkit) -if [[ ${devkit_path} == ${HOME}/.local/DevKit-CLI-24.0.RC3-Linux-Kunpeng/devkit ]]; then +if [[ ${devkit_path} == ${HOME}/.local/DevKit-CLI-24.0.T50-Linux-Kunpeng/devkit ]]; then echo "true" else echo "false" -- Gitee From e41d10d31a3b5a314cb94d6d5e82114d383d0c38 Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 01:49:23 +0000 Subject: [PATCH 6/9] update build.sh. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 1fc8e07..e09b24d 100644 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ set -e current_dir=$(cd $(dirname "$0"); pwd) -tag="v1.0.4" +tag="v1.1" rm -rf "${current_dir}"/build mkdir -p "${current_dir}"/build -- Gitee From ecc982e36fc9ad7ce33b4043fc9ed00faf98c29b Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 01:51:19 +0000 Subject: [PATCH 7/9] =?UTF-8?q?update=20Binscope=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8C=87=E5=8D=97.md.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: devkit-pipeline <3361635964@qq.com> --- ...50\346\210\267\346\214\207\345\215\227.md" | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git "a/Binscope\347\224\250\346\210\267\346\214\207\345\215\227.md" "b/Binscope\347\224\250\346\210\267\346\214\207\345\215\227.md" index 32774c9..d28a577 100644 --- "a/Binscope\347\224\250\346\210\267\346\214\207\345\215\227.md" +++ "b/Binscope\347\224\250\346\210\267\346\214\207\345\215\227.md" @@ -35,14 +35,14 @@ Binscope支持ELF格式和PE格式文件的安全编译选项实施结果的扫 |选项名|对应的编译选项|编译选项解释| |--|--|--| |Stack Protect|-fstack-protector-strong/-fstack-protector-all|栈保护选项，简称为SP选项。| -|Fortify Source|-D_FORTIFY_SOURCE=2 -O2|危险函数替换选项，简称为FS选项。| -|Integer Overflows|-ftrapv|整数溢出检测选项。该选项不支持检测clang编译器编译的产物。| -|RELRO|-Wl,-z,relro,-z,now|Got表只读选项，分为 “RELRO” 和 “BIND_NOW”两个选项。| +|RELRO|-Wl,-z,relro,-z,now|分为 “RELRO” 和 “BIND_NOW”两个选项。
-Wl,-z,relro 为GOT表保护选项，又称“RELRO”。
-Wl,-z,now 为立即加载选项，又称“BIND_NOW”。| |NX|-Wl,-z,noexecstack|堆栈不可执行选项，简称为NX选项。| -|PIC|-fPIC|适用于动态库的地址无关代码选项。| -|PIE|-fPIE -pie|适用于可执行文件的地址无关可执行选项。| -|No Rpath/Runpath|-Wl,-rpath|此选项为禁选项，使用了该选项扫描会不通过。| +|PIC|-fPIC|地址无关代码选项。适用于动态库。| +|PIE|-fPIE -pie|地址无关可执行选项。适用于可执行文件。| +|No Rpath/Runpath|-Wl,-rpath|动态库搜索路径选项。此选项为禁选项，即用了该选项扫描会不通过。| |Strip|-s|删除符号表选项。| +|Fortify Source|-D_FORTIFY_SOURCE=2 -O2|危险函数替换选项，简称为FS选项。| +|Integer Overflows|-ftrapv|整数溢出检测选项。该选项不支持检测clang编译器编译的产物。| |LLVMCFI|-fsanitize=cfi -flto -fuse-ld=gold -fvisibility=hidden|llvm提供的控制流保护方案。该选项暂不支持powerpc/powerpc64架构下编译产物检测。| @@ -92,10 +92,10 @@ Binscope支持将扫描结果直接打印在屏幕上，也支持输出JSON格 **获取软件包** -|软件包名称|链接| -|:-|--| -|binscope_aarch64.tar.gz| https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.4/binscope_aarch64.tar.gz | -|binscope_x86_64.tar.gz|https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.4/binscope_x86_64.tar.gz| +|软件包名称| 链接 | +|:-|--------------------------------------------------------------------------------------------| +|binscope_aarch64.tar.gz| https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.1/binscope_aarch64.tar.gz | +|binscope_x86_64.tar.gz| https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.1/binscope_x86_64.tar.gz | **部署** @@ -142,7 +142,7 @@ Usage: binscope {-d|-f} [-asj]... -e, --exclude= Set exclude directory. Multiple paths are supported and separated by ','. If the scan directory is an absolute path, the exclude path must also be an absolute path. Otherwise, the exclude option does not take effect. - -o, --out== Set the dirtory that output result located. + -o, --out= Set the directory that output result located. -x, --excludeSuffix Exclude file with suffix. -a, --afile Show detail of archive file. -s, --silent Turn off screen printing. @@ -599,7 +599,7 @@ JSON文件示例如下： "PeFiles": [], "command": "./binscope -d test/ -j", "time": "2024-07-31 14:10:39", - "version": "BinScope 24.0.RC3" + "version": "BinScope 24.0.0" } ``` @@ -640,7 +640,8 @@ Binscope不处理软链接文件、软链接目录，遇见软链接文件直接 # 修订记录 -|**文档版本**|**发布日期**|**修改说明**| -|--|--|--| -|01|2024-09-30|第一次正式发布。| +| **文档版本** | **发布日期** | **修改说明** | +|----------|------------|----------| +| 01 | 2024-09-30 | 第一次正式发布。 | +| 02 | 2024-12-30 | 第二次正式发布。 | -- Gitee From c1a54f56fb4a6fbc27c7a61c8e530ec411020544 Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 01:51:53 +0000 Subject: [PATCH 8/9] update .gitee/ISSUE_TEMPLATE/bug.yml. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- .gitee/ISSUE_TEMPLATE/bug.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml index 9541337..f450c5f 100644 --- a/.gitee/ISSUE_TEMPLATE/bug.yml +++ b/.gitee/ISSUE_TEMPLATE/bug.yml @@ -50,6 +50,7 @@ body: options: - 1.0.2 (默认) - 1.0.3 (迭代) - - 1.0.4 (最新) + - 1.0.4 (迭代) + - 1.1 (最新)= validations: required: true \ No newline at end of file -- Gitee From 1fdd62f349b1675827a17aaed439ffa389e7342e Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 01:53:06 +0000 Subject: [PATCH 9/9] update README.md. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9825770..56f60e6 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,8 @@ https://www.hikunpeng.com/document/detail/zh/nativedevp/userguide/devkitpipepre/ ###### 1.下载原生开发流水线工具安装包并解压 ``` -目前支持版本（1.0.1、1.0.2、1.0.3、1.0.4） -wget -c https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.x/devkit-pipeline-v1.0.x.tar.gz && tar -xzvf devkit-pipeline-v1.0.x.tar.gz +目前支持版本（1.0.1、1.0.2、1.0.3、1.0.4、1.1） +wget -c https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.x/devkit-pipeline-v1.0.x（或1.x）.tar.gz && tar -xzvf devkit-pipeline-v1.0.x（或1.x）.tar.gz ``` ###### 2.进入`devkit-pipeline-v1.0.x/linux`文件夹，根据实际情况修改machine.yaml配置文件，以下是具体配置项说明 -- Gitee