diff --git a/scripts/devkit/common.sh b/scripts/devkit/common.sh index 3cee71ff4bacf4cf41a62c6034005868242fe16e..e78fce616aa166b2f803ac51a644ea23355cc3c2 100755 --- a/scripts/devkit/common.sh +++ b/scripts/devkit/common.sh @@ -335,17 +335,12 @@ function get_user_choice(){ exit 1 else while true; do + # 适配镜像构建删除交互 echo "Installation Start Phase:Clearable=False" >> ${INSTALL_LOG} - read -t "${TIMEOUT}" -p "Do you want to authorize the tool to handle the items failed in the installation environment check?[y/N]: " input - if [[ "$?" -gt 128 ]]; then - echo_and_log "Input timeout." "${ERROR}" - return_install_info "install" "Error" "Input timeout" "devkit" - exit ${ERROR} - fi echo "The installation environment is checked. View the handling suggestions for the items that fail to pass the check" >> "${INSTALL_LOG}" echo "Do you want to authorize the tool to handle the items failed in the installation environment check? You input is:$y_n" >> "${INSTALL_LOG}" echo "Installation Start Phase:Clearable=True" >> ${INSTALL_LOG} - local input=$(input_value_check ${input}) + local input="yes" if [[ "${input}" == "yes" ]]; then user_choice=yes return 0 @@ -2332,10 +2327,6 @@ function is_supported_arm() { return "${SUCCESS}" fi done - fi - return "${ERROR}" - return "${ERROR}" fi return "${ERROR}" - fi } diff --git a/scripts/devkit/install_devkit.sh b/scripts/devkit/install_devkit.sh index be5102894f1405df1d64c739f77c02b1f2f2415f..da572c48e06f60b45ba5aca3f55a51ea5f66981d 100755 --- a/scripts/devkit/install_devkit.sh +++ b/scripts/devkit/install_devkit.sh @@ -905,12 +905,8 @@ function release_port(){ while true;do echo -n -e "Firewall port '${disabled_ports} ' unavailable. You can authorize the tool to enable this port. Do you want to continue?[y/N]: " echo "Firewall port '${disabled_ports} ' unavailable. You can authorize the tool to enable this port. Do you want to continue?[y/N]" >> "${INSTALL_LOG}" - read -t "${TIMEOUT}" -r input - if [[ "$?" -gt 128 ]]; then - echo_and_log "Input timeout." "${ERROR}" - input="no" - fi - local input=$(input_value_check ${input}) + # 适配镜像构建删除交互 + local input="yes" if [[ "$input" == "yes" ]]; then echo " your selected is $input" >>"${INSTALL_LOG}" enable_multi_firewall_ports "${disabled_ports}" @@ -2103,7 +2099,9 @@ function check_usr_input_port() { } function check_cpu_type() { + # 构建镜像不进行鲲鹏绑定校验 check_result=1 +} function main() { check_vscode_install_tag "install" diff --git a/scripts/install_devkit.sh b/scripts/install_devkit.sh index 932f8adac4d21acfb1f882d15e2c457f39f55358..9e3bc7888407a160630c603ebe28a24e7356280a 100644 --- a/scripts/install_devkit.sh +++ b/scripts/install_devkit.sh @@ -6,7 +6,7 @@ DEVKIT_REPO="https://gitee.com/kunpeng_compute/KunPengDevBoard-DevKit.git" DEVKIT_ROOT=${OUTPUT}/KunPengDevBoard-DevKit -VSCODE_URL="https://vscode.download.prss.microsoft.com/dbazure/download/stable/e170252f762678dec6ca2cc69aba1570769a5d39/code-1.88.1-1712770627.el8.aarch64.rpm" +VSCODE_URL="${DEVKIT_ROOT}/code-1.88.1-1712770627.el8.aarch64.rpm" CPPTOOLS_URL="${DEVKIT_ROOT}/cpptools-linux-aarch64.vsix" KIT_PULGIN_URL="${DEVKIT_ROOT}/kunpengfamily.kunpeng-dev-kit-24.0.2.vsix" MSCEINT_URL="${DEVKIT_ROOT}/MS-CEINTL.vscode-language-pack-zh-hans-1.88.2024041009.vsix" @@ -47,7 +47,6 @@ function install_plugins() function install_vscode() { - code_rpm=$(download_file "$VSCODE_URL" "${DEVKIT_ROOT}" | tail -n 1) localinstall_package ${DEVKIT_ROOT} ${code_rpm} install_plugins ${CPPTOOLS_URL}