X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Funpack.mk;h=6141b1c7225db7ecee4e73bd493d736897871b2a;hb=b6cdc042af3451c82562a3310fd8f70b925b475f;hp=41ff439242f548671624ec5389f71fb5d61929cf;hpb=15d8d9c271507cd272b264e0bf9deb20030723a2;p=oweals%2Fopenwrt.git diff --git a/include/unpack.mk b/include/unpack.mk index 41ff439242..6141b1c722 100644 --- a/include/unpack.mk +++ b/include/unpack.mk @@ -7,7 +7,7 @@ HOST_TAR:=$(TAR) TAR_CMD=$(HOST_TAR) -C $(1)/.. $(TAR_OPTIONS) -UNZIP_CMD=unzip -d $(1)/.. $(DL_DIR)/$(PKG_SOURCE) +UNZIP_CMD=unzip -q -d $(1)/.. $(DL_DIR)/$(PKG_SOURCE) ifeq ($(PKG_SOURCE),) PKG_UNPACK ?= true @@ -58,18 +58,13 @@ ifeq ($(strip $(UNPACK_CMD)),) UNPACK_CMD=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD) endif endif - ifneq ($(strip $(CRLF_WORKAROUND)),) - CRLF_CMD := && find $(PKG_BUILD_DIR) -type f -print0 | xargs -0 perl -pi -e 's!\r$$$$!!g' - else - CRLF_CMD := - endif endif ifdef PKG_BUILD_DIR - PKG_UNPACK ?= $(SH_FUNC) $(call UNPACK_CMD,$(PKG_BUILD_DIR)) $(call CRLF_CMD,$(PKG_BUILD_DIR)) + PKG_UNPACK ?= $(SH_FUNC) $(call UNPACK_CMD,$(PKG_BUILD_DIR)) endif ifdef HOST_BUILD_DIR - HOST_UNPACK ?= $(SH_FUNC) $(call UNPACK_CMD,$(HOST_BUILD_DIR)) $(call CRLF_CMD,$(HOST_BUILD_DIR)) + HOST_UNPACK ?= $(SH_FUNC) $(call UNPACK_CMD,$(HOST_BUILD_DIR)) endif endif # PKG_SOURCE