From 5614f148dc4cb92b53a3e8817e03d81a5715b29c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 30 Jun 2014 10:25:32 +0200 Subject: remove cleandir comment, add postconfig logic to inform user about rebuild --- Config.in | 3 --- mk/build.mk | 20 +++++++++++++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Config.in b/Config.in index 22809cb0c..e177307fa 100644 --- a/Config.in +++ b/Config.in @@ -25,9 +25,6 @@ source "target/config/Config.in.qemu" source "target/config/Config.in.kernelversion" source "target/config/Config.in.toolchain" -comment "changes made below do not require make cleandir after reconfiguration" -depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM - menu "Target configuration" depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM source "target/config/Config.in.qemuopts" diff --git a/mk/build.mk b/mk/build.mk index c69f35011..ac03c6881 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -103,6 +103,7 @@ POSTCONFIG= -@\ if [ -f .config.old ];then \ $(ADK_TOPDIR)/adk/tools/pkgrebuild;\ rebuild=0; \ + cleandir=0; \ if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \ touch .rebuild.busybox;\ rebuild=1;\ @@ -130,10 +131,27 @@ POSTCONFIG= -@\ rebuild=1;\ fi; \ if [ "$$(grep ^ADK_KERNEL_VERSION .config|md5sum)" != "$$(grep ^ADK_KERNEL_VERSION .config.old|md5sum)" ];then \ - echo "You should rebuild with 'make cleandir'";\ + cleandir=1;\ + rebuild=1;\ fi; \ if [ "$$(grep ^ADK_KERNEL_ADDON .config|md5sum)" != "$$(grep ^ADK_KERNEL_ADDON .config.old|md5sum)" ];then \ echo "You should rebuild the kernel with 'make cleankernel'";\ + rebuild=1;\ + fi; \ + if [ "$$(grep ^ADK_TARGET_USE .config|md5sum)" != "$$(grep ^ADK_TARGET_USE .config.old|md5sum)" ];then \ + cleandir=1;\ + rebuild=1;\ + fi; \ + if [ "$$(grep ^ADK_TARGET_ARCH .config|md5sum)" != "$$(grep ^ADK_TARGET_ARCH .config.old|md5sum)" ];then \ + cleandir=1;\ + rebuild=1;\ + fi; \ + if [ "$$(grep ^ADK_TARGET_SYSTEM .config|md5sum)" != "$$(grep ^ADK_TARGET_SYSTEM .config.old|md5sum)" ];then \ + cleandir=1;\ + rebuild=1;\ + fi; \ + if [ $$cleandir -eq 1 ];then \ + echo "You should rebuild with 'make cleandir'";\ fi; \ if [ $$rebuild -eq 1 ];then \ cp .config .config.old;\ -- cgit v1.2.3