projects
/
openwrt
/
staging
/
stintel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 5.15 to 5.15.130
[openwrt/staging/stintel.git]
/
include
/
unpack.mk
diff --git
a/include/unpack.mk
b/include/unpack.mk
index 01516757771a17f40692e424b14f860781676406..5959d55f4b1dc11f8a4a7f4d78ff6850f0506ba1 100644
(file)
--- a/
include/unpack.mk
+++ b/
include/unpack.mk
@@
-1,18
+1,10
@@
-#
-# Copyright (C) 2006-2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# SPDX-License-Identifier: GPL-2.0-only
#
#
+# Copyright (C) 2006-2020 OpenWrt.org
-# unpacking files with +s may break on some platforms. this typically emits error code 2
-ifneq ($(HOST_OS),Linux)
- HOST_TAR:=trapret 2 $(TAR)
-else
- HOST_TAR:=$(TAR)
-endif
+HOST_TAR:=$(TAR)
TAR_CMD=$(HOST_TAR) -C $(1)/.. $(TAR_OPTIONS)
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
ifeq ($(PKG_SOURCE),)
PKG_UNPACK ?= true
@@
-26,7
+18,7
@@
ifeq ($(strip $(UNPACK_CMD)),)
ifeq ($(filter gz tgz,$(EXT)),$(EXT))
EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
ifeq ($(filter gz tgz,$(EXT)),$(EXT))
EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
- DECOMPRESS_CMD:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) |
+ DECOMPRESS_CMD:=
$(STAGING_DIR_HOST)/bin/libdeflate-
gzip -dc $(DL_DIR)/$(PKG_SOURCE) |
endif
ifeq ($(filter bzip2 bz2 bz tbz2 tbz,$(EXT)),$(EXT))
EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
endif
ifeq ($(filter bzip2 bz2 bz tbz2 tbz,$(EXT)),$(EXT))
EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
@@
-36,6
+28,10
@@
ifeq ($(strip $(UNPACK_CMD)),)
EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
DECOMPRESS_CMD:=xzcat $(DL_DIR)/$(PKG_SOURCE) |
endif
EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
DECOMPRESS_CMD:=xzcat $(DL_DIR)/$(PKG_SOURCE) |
endif
+ ifeq (zst,$(EXT))
+ EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
+ DECOMPRESS_CMD:=zstdcat $(DL_DIR)/$(PKG_SOURCE) |
+ endif
ifeq ($(filter tgz tbz tbz2 txz,$(EXT1)),$(EXT1))
EXT:=tar
endif
ifeq ($(filter tgz tbz tbz2 txz,$(EXT1)),$(EXT1))
EXT:=tar
endif
@@
-44,7
+40,7
@@
ifeq ($(strip $(UNPACK_CMD)),)
UNPACK_CMD=$(DECOMPRESS_CMD) $(TAR_CMD)
endif
ifeq ($(EXT),cpio)
UNPACK_CMD=$(DECOMPRESS_CMD) $(TAR_CMD)
endif
ifeq ($(EXT),cpio)
- UNPACK_CMD=$(DECOMPRESS_CMD) (cd $(1)/..; cpio -i -d)
+ UNPACK_CMD=$(DECOMPRESS_CMD) (cd $(1)/..;
$(STAGING_DIR_HOST)/bin/
cpio -i -d)
endif
ifeq ($(EXT),zip)
UNPACK_CMD=$(UNZIP_CMD)
endif
ifeq ($(EXT),zip)
UNPACK_CMD=$(UNZIP_CMD)
@@
-60,21
+56,16
@@
ifeq ($(strip $(UNPACK_CMD)),)
endif
# replace zcat with $(ZCAT), because some system don't support it properly
ifeq ($(PKG_CAT),zcat)
endif
# replace zcat with $(ZCAT), because some system don't support it properly
ifeq ($(PKG_CAT),zcat)
- UNPACK_CMD=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD)
+ UNPACK_CMD=
$(STAGING_DIR_HOST)/bin/libdeflate-
gzip -dc $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD)
endif
endif
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
endif
ifdef PKG_BUILD_DIR
- PKG_UNPACK ?= $(
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
endif
ifdef HOST_BUILD_DIR
- HOST_UNPACK ?= $(
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
endif
endif # PKG_SOURCE