qos-scripts update - fix enabling/disabling of interfaces, make the overhead calculat...

[openwrt.git] / include / unpack.mk

diff --git a/include/unpack.mk b/include/unpack.mk
index 10e6c25..b8349c9 100644 (file)
--- a/include/unpack.mk
+++ b/include/unpack.mk
@@ -27,7 +27,6 @@ ifeq ($(strip $(PKG_UNPACK)),)
       UNPACK:=bzcat $(DL_DIR)/$(PKG_SOURCE) |
     endif
     ifeq ($(filter tgz tbz tbz2,$(EXT1)),$(EXT1))
       UNPACK:=bzcat $(DL_DIR)/$(PKG_SOURCE) |
     endif
     ifeq ($(filter tgz tbz tbz2,$(EXT1)),$(EXT1))

-      $(error FOO: $(filter tgz tbz tbz2,$(EXT1)),$(EXT1))

       EXT:=tar
     endif
     UNPACK ?= cat $(DL_DIR)/$(PKG_SOURCE) |
       EXT:=tar
     endif
     UNPACK ?= cat $(DL_DIR)/$(PKG_SOURCE) |


@@ -43,7 +42,7 @@ ifeq ($(strip $(PKG_UNPACK)),)
   endif
  
   # compatibility code for packages that set PKG_CAT
   endif
  
   # compatibility code for packages that set PKG_CAT

-  ifeq ($(strip $(PKG_CAT)$(PKG_UNPACK)),)
+  ifeq ($(strip $(PKG_UNPACK)),)

     # use existing PKG_CAT
     PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD)
     ifeq ($(PKG_CAT),unzip)
     # use existing PKG_CAT
     PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD)
     ifeq ($(PKG_CAT),unzip)