Changeset 33777


Ignore:
Timestamp:
2012-10-15T15:19:45+02:00 (5 years ago)
Author:
nbd
Message:

build: add back the package/cleanup step to remove the root staging dir for mklibs

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r33631 r33777  
    4141$(toolchain/stamp-install): $(tools/stamp-install) 
    4242$(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install) $(BUILD_DIR)/.prepared 
    43 $(package/stamp-compile): $(target/stamp-compile) 
     43$(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup) 
    4444$(package/stamp-install): $(package/stamp-compile) 
    4545$(target/stamp-install): $(package/stamp-compile) $(package/stamp-install) 
  • trunk/package/Makefile

    r33631 r33777  
    7474PACKAGE_INSTALL_FILES:=$(patsubst %,$(PKG_INFO_DIR)/%.install,$(PACKAGE_INSTALL)) 
    7575 
     76$(curdir)/cleanup: $(TMP_DIR)/.build 
     77        rm -rf $(STAGING_DIR_ROOT) 
     78 
    7679$(curdir)/install: $(TMP_DIR)/.build 
    7780        - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755 
    78         rm -rf $(TARGET_DIR) $(STAGING_DIR_ROOT) 
     81        rm -rf $(TARGET_DIR) 
    7982        [ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp 
    8083        $(OPKG) install `cat $(PACKAGE_INSTALL_FILES) | sed -e 's,^\(.*\)$$,$(PACKAGE_DIR)/\1_*.ipk,'` 
     
    122125 
    123126$(eval $(call stampfile,$(curdir),package,prereq,.config)) 
     127$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build)) 
    124128$(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build)) 
    125129$(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build)) 
Note: See TracChangeset for help on using the changeset viewer.