X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2FMakefile;h=e0bd75ba7f6bfc72e6740552b52cce438c6cbee9;hb=16e4da0f617efe36c7c653c5b6d7154f800d9da5;hp=1a78fde47a6a281623d0517bfd8e32868584cd73;hpb=97c4fcd1a8d92b1ffd02c8c5659f00d6b8bccf55;p=openwrt.git diff --git a/package/Makefile b/package/Makefile index 1a78fde47a..e0bd75ba7f 100644 --- a/package/Makefile +++ b/package/Makefile @@ -20,8 +20,11 @@ ifneq ($(IGNORE_ERRORS),) package-n-filter := $(filter-out $(package-y) $(package-m),$(package-)) package-ignore-errors := $(filter n m y,$(IGNORE_ERRORS)) package-ignore-errors := $(if $(package-ignore-errors),$(package-ignore-errors),n m) - $(curdir)/builddirs-ignore-download := $(foreach m,$(package-ignore-errors),$(package-$(m)-filter)) - $(curdir)/builddirs-ignore-compile := $(foreach m,$(package-ignore-errors),$(package-$(m)-filter)) + package-ignore-subdirs := $(sort $(foreach m,$(package-ignore-errors),$(package-$(m)-filter))) + $(curdir)/builddirs-ignore-download := $(package-ignore-subdirs) + $(curdir)/builddirs-ignore-compile := $(package-ignore-subdirs) + $(curdir)/builddirs-ignore-host-download := $(package-ignore-subdirs) + $(curdir)/builddirs-ignore-host-compile := $(package-ignore-subdirs) endif ifdef CONFIG_USE_MKLIBS @@ -120,6 +123,7 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/install $(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(TARGET_DIR)/usr/lib/opkg/status) @-find $(TARGET_DIR) -name CVS | $(XARGS) rm -rf @-find $(TARGET_DIR) -name .svn | $(XARGS) rm -rf + @-find $(TARGET_DIR) -name .git | $(XARGS) rm -rf @-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst* rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.prerm*