aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-10-15 13:19:45 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-10-15 13:19:45 +0000
commit0f6e5b76f8aac652a2ee9ff274ee0d5d3e632921 (patch)
tree9135757fa8c6eeec26bfa700aa0f0baf73de8230
parent6d1884c583d7de97aecb6ea7c4cba9bf6de08e2a (diff)
downloadupstream-0f6e5b76f8aac652a2ee9ff274ee0d5d3e632921.tar.gz
upstream-0f6e5b76f8aac652a2ee9ff274ee0d5d3e632921.tar.bz2
upstream-0f6e5b76f8aac652a2ee9ff274ee0d5d3e632921.zip
build: add back the package/cleanup step to remove the root staging dir for mklibs
SVN-Revision: 33777
-rw-r--r--Makefile2
-rw-r--r--package/Makefile6
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 57575eac54..348e645005 100644
--- a/Makefile
+++ b/Makefile
@@ -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 63fdb92bae..46bcb9d3c7 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))