diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-28 15:59:16 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-28 15:59:16 +0100 |
| commit | 77d579fc66ff54971bc85e797d8d443b847962c0 (patch) | |
| tree | 0cf6459afd21bc1665db7f1f937c707443b1e4eb /mk | |
| parent | 111b6b80d7838207459a289319b29893cb39f29b (diff) | |
| parent | 91dd4bc6d8f52d62171e721839505f1a80c5a83a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 18 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
2 files changed, 17 insertions, 3 deletions
diff --git a/mk/build.mk b/mk/build.mk index 6397d78bb..e8309afba 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -44,16 +44,20 @@ noconfig_targets:= menuconfig \ distclean \ tags -MAKECLEAN_SYMBOLS= ADK_TARGET_LIB_UCLIBC \ +MAKECLEANDIR_SYMBOLS= ADK_TARGET_LIB_UCLIBC \ ADK_TARGET_LIB_GLIBC \ ADK_TARGET_LIB_ECLIBC \ ADK_DEBUG +MAKECLEAN_SYMBOLS= ADK_TARGET_PACKAGE_IPKG \ + ADK_TARGET_PACKAGE_RPM \ + ADK_TARGET_PACKAGE_TGZ + POSTCONFIG= -@ \ if [ -f .config.old ];then \ if [ -d .cfg ];then \ what=cleantarget; \ - for symbol in ${MAKECLEAN_SYMBOLS}; do \ + for symbol in ${MAKECLEANDIR_SYMBOLS}; do \ newval=$$(grep -e "^$$symbol=" -e "^\# $$symbol " .config); \ oldval=$$(cat .cfg/"$$symbol" 2>&-); \ [[ $$newval = $$oldval ]] && continue; \ @@ -62,6 +66,16 @@ POSTCONFIG= -@ \ "$$what' might be required!"; \ break; \ done; \ + what=clean; \ + for symbol in ${MAKECLEAN_SYMBOLS}; do \ + newval=$$(grep -e "^$$symbol=" -e "^\# $$symbol " .config); \ + oldval=$$(cat .cfg/"$$symbol" 2>&-); \ + [[ $$newval = $$oldval ]] && continue; \ + echo; \ + echo >&2 "WARNING: Package backend related options have changed, 'make" \ + "$$what' might be required!"; \ + break; \ + done; \ fi; \ if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \ if [ -f build_*/w-busybox*/busybox*/.configure_done ];then \ diff --git a/mk/vars.mk b/mk/vars.mk index 7661ebb71..cfc1d2632 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -84,7 +84,7 @@ PKG_INSTALL:= IPKG_TMP=$(BUILD_DIR)/tmp \ PKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/ipkg else PKG_BUILD:= ${BASH} ${SCRIPT_DIR}/tarpkg build -PKG_INSTALL:= INSTROOT=$(TARGET_DIR) \ +PKG_INSTALL:= PKG_INSTROOT=$(TARGET_DIR) \ ${BASH} ${SCRIPT_DIR}/tarpkg install PKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/pkg endif |