Date:2010-08-16 11:45:21 (13 years 7 months ago)
Author:lars
Commit:4c8a665c4a3224ed35ff11f12c581813d01d2ebc
Message:Add build variants support to InstallDev

Before building a build variant would have removed the staging files installed
by the previous build variant from the same makefile.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22668 3c298f89-4303-0410-b956-a3cf2f4a3e73
Files: include/package.mk (3 diffs)

Change Details

include/package.mk
2121STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
2222STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed
2323
24STAGING_FILES_LIST:=$(PKG_NAME)$(if $(BUILD_VARIANT),.$(BUILD_VARIANT),).list
25
2426include $(INCLUDE_DIR)/download.mk
2527include $(INCLUDE_DIR)/quilt.mk
2628include $(INCLUDE_DIR)/package-defaults.mk
...... 
122124        $(call $(hook),$(TMP_DIR)/stage-$(PKG_NAME),$(TMP_DIR)/stage-$(PKG_NAME)/host)$(sep)\
123125    )
124126    if [ -d $(TMP_DIR)/stage-$(PKG_NAME) ]; then \
125        (cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(STAGING_DIR)/packages/$(PKG_NAME).list); \
127        (cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(STAGING_DIR)/packages/$(STAGING_FILES_LIST)); \
126128        $(CP) $(TMP_DIR)/stage-$(PKG_NAME)/* $(STAGING_DIR)/; \
127129    fi
128130    rm -rf $(TMP_DIR)/stage-$(PKG_NAME)
...... 
210212    rm -f $(STAMP_INSTALLED)
211213    @-(\
212214        cd "$(STAGING_DIR)"; \
213        if [ -f packages/$(PKG_NAME).list ]; then \
214            cat packages/$(PKG_NAME).list | xargs -r rm -f 2>/dev/null; \
215        if [ -f packages/$(STAGING_FILES_LIST) ]; then \
216            cat packages/$(STAGING_FILES_LIST) | xargs -r rm -f 2>/dev/null; \
215217        fi; \
216218    )
217219
218220clean: clean-staging FORCE
219221    $(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST))
220222    $(Build/Clean)
221    rm -f $(STAGING_DIR)/packages/$(PKG_NAME).list $(STAGING_DIR_HOST)/packages/$(PKG_NAME).list
223    rm -f $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) $(STAGING_DIR_HOST)/packages/$(STAGING_FILES_LIST)
222224    rm -rf $(PKG_BUILD_DIR)
223225
224226dist:

Archive Download the corresponding diff file



interactive