diff --git a/anolis/configs/scripts/anolis_kconfig.py b/anolis/configs/scripts/anolis_kconfig.py index 8da9dd14e4ad648719e596108f0691a2f2b2e738..bc92e4806e0d7d8761ab86733c6edaeedd28d416 100644 --- a/anolis/configs/scripts/anolis_kconfig.py +++ b/anolis/configs/scripts/anolis_kconfig.py @@ -485,7 +485,7 @@ class ImportOpTranslater(): if refresh == "REFRESH": cmd += f"make KCONFIG_CONFIG={new_path} ARCH={arch} CROSS_COMPILE=scripts/dummy-tools/ " cmd += f"PAHOLE=scripts/dummy-tools/pahole " - cmd += f"-C {self.src_root} olddefconfig > /dev/null\n" + cmd += f"-C {self.src_root} olddefconfig > /dev/null 2>&1\n" cmd += f"rm -f {new_path}.old \n" return cmd @@ -669,10 +669,10 @@ class GenerateTranslater(): cmd += f" > {final_path} \n" # refresh configs - cmd += f"echo \"* generated file: {final_path}\"\n" + # cmd += f"echo \"* generated file: {final_path}\"\n" cmd += f"make KCONFIG_CONFIG={final_path} ARCH={e.arch} CROSS_COMPILE=scripts/dummy-tools/ " cmd += f"PAHOLE=scripts/dummy-tools/pahole " - cmd += f"-C {self.src_root} olddefconfig > /dev/null\n" + cmd += f"-C {self.src_root} olddefconfig > /dev/null 2>&1\n" cmd += f"rm -f {final_path}.old \n" cmd += f"echo \"* processed file: {final_path}\"\n" diff --git a/anolis/configs/scripts/generate_configs.sh b/anolis/configs/scripts/generate_configs.sh index a101b469c51142681ba20a57ddf563735ab21100..90617cd7bd5fb9316bf097cd18f7f6d4f1a1e4a5 100644 --- a/anolis/configs/scripts/generate_configs.sh +++ b/anolis/configs/scripts/generate_configs.sh @@ -33,6 +33,6 @@ fi sh ${DIST_OUTPUT}/generate.sh | tee ${FILE_LIST} if [ "x${DIST_DO_GENERATE_DOT_CONFIG}" = "xY" ]; then - file=$(cat ${FILE_LIST} | grep "generated" | awk '{print $4}' | head -1) + file=$(cat ${FILE_LIST} | grep "processed" | awk '{print $4}' | head -1) cp -f ${file} ${DIST_SRCROOT}.config fi diff --git a/anolis/configs/scripts/update_configs.sh b/anolis/configs/scripts/update_configs.sh index b7ab61fa9e9520cd40e6272845d9065e0b78dec0..451b7394eaab17c02ba7136521bb3ad928a09b1c 100644 --- a/anolis/configs/scripts/update_configs.sh +++ b/anolis/configs/scripts/update_configs.sh @@ -40,14 +40,14 @@ function prepare_env() { } function generate_configs() { - log "collect all old configs..." + # log "collect all old configs..." # generate old config files sh ${SCRIPT_DIR}/generate_configs.sh } function split_new_configs() { # split new config files - echo "split new configs..." + # echo "split new configs..." cp ${IMPORT_ACTION} ${DIST_OUTPUT}/kconfig_import sed -i "s#%%DIST_OUTPUT%%#\${DIST_OUTPUT}#" ${DIST_OUTPUT}/kconfig_import sed -i "s#%%DIST_SRCROOT%%#\${DIST_SRCROOT}#" ${DIST_OUTPUT}/kconfig_import @@ -59,7 +59,7 @@ function split_new_configs() { } function replace_with_new_configs() { - log "replace old configs with new configs...." + # log "replace old configs with new configs...." rm -rf ${BACKUP_CONFIG_DIR} mkdir -p ${BACKUP_CONFIG_DIR}