diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-15 13:19:45 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-15 13:19:45 +0000 |
| commit | 23861d53179cd93974d5e827d9f7c1d3b06853b6 (patch) | |
| tree | 32b49ebd6bc359c61217c541757b72101a38d580 | |
| parent | 07540fb955825e1ecdb47b39c0e0c2186b17e790 (diff) | |
build: add back the package/cleanup step to remove the root staging dir for mklibs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33777 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | package/Makefile | 6 |
2 files changed, 6 insertions, 2 deletions
@@ -40,7 +40,7 @@ else $(toolchain/stamp-install): $(tools/stamp-install) $(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install) $(BUILD_DIR)/.prepared -$(package/stamp-compile): $(target/stamp-compile) +$(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-install): $(package/stamp-compile) $(target/stamp-install): $(package/stamp-compile) $(package/stamp-install) diff --git a/package/Makefile b/package/Makefile index 63fdb92ba..46bcb9d3c 100644 --- a/package/Makefile +++ b/package/Makefile @@ -73,9 +73,12 @@ OPKG:= \ PACKAGE_INSTALL:=$(sort $(foreach pkg,$(package-y),$(lastword $(subst /,$(space),$(pkg))))) PACKAGE_INSTALL_FILES:=$(patsubst %,$(PKG_INFO_DIR)/%.install,$(PACKAGE_INSTALL)) +$(curdir)/cleanup: $(TMP_DIR)/.build + rm -rf $(STAGING_DIR_ROOT) + $(curdir)/install: $(TMP_DIR)/.build - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755 - rm -rf $(TARGET_DIR) $(STAGING_DIR_ROOT) + rm -rf $(TARGET_DIR) [ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp $(OPKG) install `cat $(PACKAGE_INSTALL_FILES) | sed -e 's,^\(.*\)$$,$(PACKAGE_DIR)/\1_*.ipk,'` @for pkg in $(PACKAGE_INSTALL); do \ @@ -121,6 +124,7 @@ $(curdir)/preconfig: $(curdir)/flags-install:= -j1 $(eval $(call stampfile,$(curdir),package,prereq,.config)) +$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build)) $(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build)) $(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build)) |