From ff00491ad97ab865cc844c2ca2d44d47353ebcaf Mon Sep 17 00:00:00 2001 From: sunghan Date: Tue, 19 Sep 2017 15:30:29 +0900 Subject: [PATCH] apps/tools: fix update_config.sh for issue on update entry point When user entry point is changed through make applist/appupdate, CONFIG_ENTRY_XX is not updated, only CONFIG_USER_ENTRYPOINT is. So, it looks not changed on menuconfig. Let's change it to manaul when entry is changed. --- apps/tools/update_config.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/tools/update_config.sh b/apps/tools/update_config.sh index 33df40f..92a1d2d 100755 --- a/apps/tools/update_config.sh +++ b/apps/tools/update_config.sh @@ -29,7 +29,13 @@ function write_config(){ UPDATED_ENTRYPOINT=`sed -n '/USER_ENTRYPOINT/p' $file_path | sed -n 's/.*=//p'` sed -i "s/CONFIG_USER_ENTRYPOINT.*/CONFIG_USER_ENTRYPOINT=$UPDATED_ENTRYPOINT/" $config_path - # update .config' use config from metafile; + CONFIG_ENTRY_LIST=`sed -n '/^CONFIG_ENTRY_/p' $config_path` + if [ "$CONFIG_ENTRY_LIST" != "CONFIG_ENTRY_MANUAL" ]; then + sed -i '/^CONFIG_ENTRY_/{ s/CONFIG/# CONFIG/g; s/=y/ is not set/g }' $config_path + sed -i '/CONFIG_ENTRY_MANUAL/{ s/# //g ; s/ is not set/=y/g }' $config_path + fi + + # update .config use config from metafile; # if OLD_CONFIG_USE is not updated => maintain origin CONFIG_USE; # else OLD_CONFIG and NEW_CONFIG are not equal => change CONFIG_USE; -- 2.7.4