Merged
统一配置ops-ras安装目录及文件权限 #93
qinhanAdd on Sep 3
统一配置ops-ras安装目录及文件权限 #93
Merged
Merged fromqinhan123/ops-ras_v1masterintocann/ops-rasmaster
Total: 3 files changed+2-22
| @@ -14,7 +14,7 @@ if(NOT PROJECT_SOURCE_DIR) | |||
| 14 | else() | 14 | else() |
| 15 | include(FetchContent) | 15 | include(FetchContent) |
| 16 | 16 | ||
| 17 | - set(CANN_CMAKE_TAG "master-015") | 17 | + set(CANN_CMAKE_TAG "master-057") |
| 18 | if(CANN_3RD_LIB_PATH AND EXISTS "${CANN_3RD_LIB_PATH}/cmake-${CANN_CMAKE_TAG}.tar.gz") | 18 | if(CANN_3RD_LIB_PATH AND EXISTS "${CANN_3RD_LIB_PATH}/cmake-${CANN_CMAKE_TAG}.tar.gz") |
| 19 | FetchContent_Declare( | 19 | FetchContent_Declare( |
| 20 | cann-cmake | 20 | cann-cmake |
| @@ -106,7 +106,6 @@ get_installed_info() { | |||
| 106 | local key="$1" | 106 | local key="$1" |
| 107 | local res="" | 107 | local res="" |
| 108 | if [ -f "${INSTALL_INFO_FILE}" ]; then | 108 | if [ -f "${INSTALL_INFO_FILE}" ]; then |
| 109 | - chmod 644 "${INSTALL_INFO_FILE}" >/dev/null 2>&1 | ||
| 110 | res=$(cat ${INSTALL_INFO_FILE} | grep "${key}" | awk -F = '{print $2}') | 109 | res=$(cat ${INSTALL_INFO_FILE} | grep "${key}" | awk -F = '{print $2}') |
| 111 | fi | 110 | fi |
| 112 | echo "${res}" | 111 | echo "${res}" |
| @@ -560,11 +559,6 @@ install_package() { | |||
| 560 | if [ $(id -u) -eq 0 ]; then | 559 | if [ $(id -u) -eq 0 ]; then |
| 561 | chown -R "root":"root" "${TARGET_SHARED_INFO_DIR}/${OPP_PLATFORM_DIR}/script" 2>/dev/null | 560 | chown -R "root":"root" "${TARGET_SHARED_INFO_DIR}/${OPP_PLATFORM_DIR}/script" 2>/dev/null |
| 562 | chown "root":"root" "${TARGET_SHARED_INFO_DIR}/${OPP_PLATFORM_DIR}" 2>/dev/null | 561 | chown "root":"root" "${TARGET_SHARED_INFO_DIR}/${OPP_PLATFORM_DIR}" 2>/dev/null |
| 563 | - chmod -R 555 "${TARGET_SHARED_INFO_DIR}/${OPP_PLATFORM_DIR}/script" 2>/dev/null | ||
| 564 | - chmod 444 "${TARGET_SHARED_INFO_DIR}/${OPP_PLATFORM_DIR}/script/filelist.csv" 2>/dev/null | ||
| 565 | - else | ||
| 566 | - chmod -R 550 "${TARGET_SHARED_INFO_DIR}/${OPP_PLATFORM_DIR}/script" 2>/dev/null | ||
| 567 | - chmod 440 "${TARGET_SHARED_INFO_DIR}/${OPP_PLATFORM_DIR}/script/filelist.csv" 2>/dev/null | ||
| 568 | fi | 562 | fi |
| 569 | comm_log_operation "Install" "${IN_INSTALL_TYPE}" "OpsRas" "$?" "${CMD_LIST}" | 563 | comm_log_operation "Install" "${IN_INSTALL_TYPE}" "OpsRas" "$?" "${CMD_LIST}" |
| 570 | } | 564 | } |
| @@ -98,7 +98,7 @@ init_install_env() { | |||
| 98 | if [ "$(id -u)" != "0" ]; then | 98 | if [ "$(id -u)" != "0" ]; then |
| 99 | LOG_PATH_PERM="740" | 99 | LOG_PATH_PERM="740" |
| 100 | LOG_FILE_PERM="640" | 100 | LOG_FILE_PERM="640" |
| 101 | - INSTALL_INFO_PERM="600" | 101 | + INSTALL_INFO_PERM="640" |
| 102 | else | 102 | else |
| 103 | LOG_PATH_PERM="750" | 103 | LOG_PATH_PERM="750" |
| 104 | LOG_FILE_PERM="640" | 104 | LOG_FILE_PERM="640" |
| @@ -348,9 +348,7 @@ install_es_whl() { | |||
| 348 | fi | 348 | fi |
| 349 | 349 | ||
| 350 | local python_es_whl_name="es_ras" | 350 | local python_es_whl_name="es_ras" |
| 351 | - chmod u+w "${TARGET_VERSION_DIR}/python" 2> /dev/null | ||
| 352 | local whl_install_dir_path="${TARGET_VERSION_DIR}/python/site-packages" | 351 | local whl_install_dir_path="${TARGET_VERSION_DIR}/python/site-packages" |
| 353 | - chmod u+w "${whl_install_dir_path}" 2> /dev/null | ||
| 354 | install_whl_package "${es_whl_path}" "${python_es_whl_name}" "${whl_install_dir_path}" | 352 | install_whl_package "${es_whl_path}" "${python_es_whl_name}" "${whl_install_dir_path}" |
| 355 | 353 | ||
| 356 | if [ -d "${TARGET_VERSION_DIR}/ops_ras" ]; then | 354 | if [ -d "${TARGET_VERSION_DIR}/ops_ras" ]; then |
| @@ -402,9 +400,6 @@ add_init_py() { | |||
| 402 | fi | 400 | fi |
| 403 | 401 | ||
| 404 | opp_builtin_mod=$(stat -c %a ${built_in_impl_path}) | 402 | opp_builtin_mod=$(stat -c %a ${built_in_impl_path}) |
| 405 | - if [ "$(id -u)" != 0 ] && [ ! -w "${built_in_impl_path}" ]; then | ||
| 406 | - chmod u+w -R "${built_in_impl_path}" 2>/dev/null | ||
| 407 | - fi | ||
| 408 | touch ${built_in_impl_path}/__init__.py | 403 | touch ${built_in_impl_path}/__init__.py |
| 409 | 404 | ||
| 410 | [ -d ${built_in_impl_path}/dynamic ] && touch ${built_in_impl_path}/dynamic/__init__.py | 405 | [ -d ${built_in_impl_path}/dynamic ] && touch ${built_in_impl_path}/dynamic/__init__.py |
| @@ -459,15 +454,6 @@ main() { | |||
| 459 | 454 | ||
| 460 | install_opp | 455 | install_opp |
| 461 | 456 | ||
| 462 | - # change log dir and file owner and rights | ||
| 463 | - chmod "${LOG_PATH_PERM}" "${COMM_LOG_DIR}" 2>/dev/null | ||
| 464 | - chmod "${LOG_FILE_PERM}" "${COMM_LOGFILE}" 2>/dev/null | ||
| 465 | - chmod "${LOG_FILE_PERM}" "${COMM_OPERATION_LOGFILE}" 2>/dev/null | ||
| 466 | - | ||
| 467 | - chmod "${ONLYREAD_PERM}" "${TARGET_SHARED_INFO_DIR}/${OPP_PLATFORM_DIR}/scene.info" 2>/dev/null | ||
| 468 | - chmod "${ONLYREAD_PERM}" "${TARGET_SHARED_INFO_DIR}/${OPP_PLATFORM_DIR}/version.info" 2>/dev/null | ||
| 469 | - chmod "${ONLYREAD_PERM}" "${INSTALL_INFO_FILE}" 2>/dev/null | ||
| 470 | - | ||
| 471 | # change installed folder's owner and group except aicpu | 457 | # change installed folder's owner and group except aicpu |
| 472 | log_with_errorlevel "$?" "error" "[ERROR]: ERR_NO:${INSTALL_FAILED};ERR_DES:Change opp onwership failed.." | 458 | log_with_errorlevel "$?" "error" "[ERROR]: ERR_NO:${INSTALL_FAILED};ERR_DES:Change opp onwership failed.." |
| 473 | 459 | ||