OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 79... Line 79...
79 STAGING_FILES_LIST:=$(PKG_DIR_NAME)$(if $(BUILD_VARIANT),.$(BUILD_VARIANT),).list 79 STAGING_FILES_LIST:=$(PKG_DIR_NAME)$(if $(BUILD_VARIANT),.$(BUILD_VARIANT),).list
Line 80... Line 80...
80   80  
81 define CleanStaging 81 define CleanStaging
82 rm -f $(STAMP_INSTALLED) 82 rm -f $(STAMP_INSTALLED)
83 @-(\ -  
84 if [ -f $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) ]; then \ 83 @-(\
85 $(SCRIPT_DIR)/clean-package.sh \ 84 cd "$(STAGING_DIR)"; \
86 "$(STAGING_DIR)/packages/$(STAGING_FILES_LIST)" \ 85 if [ -f packages/$(STAGING_FILES_LIST) ]; then \
87 "$(STAGING_DIR)"; \ 86 cat packages/$(STAGING_FILES_LIST) | xargs -r rm -f 2>/dev/null; \
88 fi; \ 87 fi; \
89 ) 88 )
Line 143... Line 142...
143 $(1) : export STAGING_PREFIX=$$(STAGING_DIR)/usr 142 $(1) : export STAGING_PREFIX=$$(STAGING_DIR)/usr
144 $(1) : export PATH=$$(TARGET_PATH_PKG) 143 $(1) : export PATH=$$(TARGET_PATH_PKG)
145 $(1) : export CONFIG_SITE:=$$(CONFIG_SITE) 144 $(1) : export CONFIG_SITE:=$$(CONFIG_SITE)
146 $(1) : export PKG_CONFIG_PATH:=$$(PKG_CONFIG_PATH) 145 $(1) : export PKG_CONFIG_PATH:=$$(PKG_CONFIG_PATH)
147 $(1) : export PKG_CONFIG_LIBDIR:=$$(PKG_CONFIG_PATH) 146 $(1) : export PKG_CONFIG_LIBDIR:=$$(PKG_CONFIG_PATH)
148 $(if $(CONFIG_CCACHE),$(1) : export CCACHE_DIR:=$(STAGING_DIR)/ccache) 147 $(1) : export CCACHE_DIR:=$(STAGING_DIR)/ccache
149 endef 148 endef
150 Build/Exports=$(Build/Exports/Default) 149 Build/Exports=$(Build/Exports/Default)
Line 151... Line 150...
151   150  
152 define Build/CoreTargets 151 define Build/CoreTargets