unzip: Use the "-q" option to silence unzipping of source files

Add and use the "UNZIP" variable instead of calling directly unzip
because the variable contains the "-q" option to silence "unzip" so it
doesn't show the list of files extracted just like when tar files are
being unpacked.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index e3f9dc0386b59c179bd4c822568e6b51922abe39..50bbc26570bef34f48c6744cf0bbeadca80370d7 100644 (file)
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -17,7 +17,7 @@ AT91BOOTSTRAP_INSTALL_IMAGES = YES
 AT91BOOTSTRAP_INSTALL_TARGET = NO
 
 define AT91BOOTSTRAP_EXTRACT_CMDS
-       unzip -d $(BUILD_DIR) $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
+       $(UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
        mv $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION)/* $(@D)
        rmdir $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION)
 endef

diff --git a/package/Makefile.in b/package/Makefile.in
index ff2ee2d4a85e3aab2a1deb828e94ddee1eac446a..df39afd67b8aed645643155738cb95d30f136481 100644 (file)
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -221,6 +221,7 @@ INSTALL := $(shell which install || type -p install)
 FLEX := $(shell which flex || type -p flex)
 BISON := $(shell which bison || type -p bison)
 SED := $(shell which sed || type -p sed) -i -e
+UNZIP := $(shell which unzip || type -p unzip) -q
 
 APPLY_PATCHES = support/scripts/apply-patches.sh $(if $(QUIET),-s)
 

diff --git a/package/espeak/espeak.mk b/package/espeak/espeak.mk
index 9a83d4f799ffaf755d8000632e8d9191ae774d52..bb9a247a0a37fb6c0287b773b3bb3e64a63eeed9 100644 (file)
--- a/package/espeak/espeak.mk
+++ b/package/espeak/espeak.mk
@@ -21,7 +21,7 @@ ESPEAK_DEPENDENCIES = pulseaudio
 endif
 
 define ESPEAK_EXTRACT_CMDS
-       unzip -d $(@D) $(DL_DIR)/$(ESPEAK_SOURCE)
+       $(UNZIP) -d $(@D) $(DL_DIR)/$(ESPEAK_SOURCE)
        mv $(@D)/espeak-$(ESPEAK_VERSION)-source/* $(@D)
        $(RM) -r $(@D)/espeak-$(ESPEAK_VERSION)-source
 endef

diff --git a/package/explorercanvas/explorercanvas.mk b/package/explorercanvas/explorercanvas.mk
index e45621b0be4f74d2cb867790874b44bf42ff5b3d..083d9a3893faa11fd7085aa59a65e1a18bf2fa67 100644 (file)
--- a/package/explorercanvas/explorercanvas.mk
+++ b/package/explorercanvas/explorercanvas.mk
@@ -11,7 +11,7 @@ EXPLORERCANVAS_LICENSE = Apache-2.0
 EXPLORERCANVAS_LICENSE_FILES = COPYING
 
 define EXPLORERCANVAS_EXTRACT_CMDS
-       unzip -d $(@D) $(DL_DIR)/$(EXPLORERCANVAS_SOURCE)
+       $(UNZIP) -d $(@D) $(DL_DIR)/$(EXPLORERCANVAS_SOURCE)
 endef
 
 define EXPLORERCANVAS_INSTALL_TARGET_CMDS

diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk
index 6a953504371ff66c77b282c5ca156d672d4c712e..3f3e8896d36029a6fd5462aa70480ea4c3e2cf15 100644 (file)
--- a/package/gtest/gtest.mk
+++ b/package/gtest/gtest.mk
@@ -22,7 +22,7 @@ GTEST_LICENSE_FILES = LICENSE
 GTEST_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF
 
 define GTEST_EXTRACT_CMDS
-       unzip $(DL_DIR)/$(GTEST_SOURCE) -d $(BUILD_DIR)
+       $(UNZIP) $(DL_DIR)/$(GTEST_SOURCE) -d $(BUILD_DIR)
 endef
 
 define GTEST_INSTALL_STAGING_CMDS

diff --git a/package/jquery-mobile/jquery-mobile.mk b/package/jquery-mobile/jquery-mobile.mk
index 3a634ed5efc4b3472f1684648d235e3699663082..10679529041d2a8426c49e175242cfbe4d7c4880 100644 (file)
--- a/package/jquery-mobile/jquery-mobile.mk
+++ b/package/jquery-mobile/jquery-mobile.mk
@@ -10,7 +10,7 @@ JQUERY_MOBILE_SOURCE = jquery.mobile-$(JQUERY_MOBILE_VERSION).zip
 JQUERY_MOBILE_LICENSE = MIT
 
 define JQUERY_MOBILE_EXTRACT_CMDS
-       unzip -d $(@D) $(DL_DIR)/$(JQUERY_MOBILE_SOURCE)
+       $(UNZIP) -d $(@D) $(DL_DIR)/$(JQUERY_MOBILE_SOURCE)
 endef
 
 JQUERY_MOBILE_INSTALLED_FILES = \

diff --git a/package/jquery-ui-themes/jquery-ui-themes.mk b/package/jquery-ui-themes/jquery-ui-themes.mk
index 269ef698549713fcd6ab66e79b567d55d3727116..cd3dab6d876784cf2b79f0078c0f34bff0dd6692 100644 (file)
--- a/package/jquery-ui-themes/jquery-ui-themes.mk
+++ b/package/jquery-ui-themes/jquery-ui-themes.mk
@@ -12,7 +12,7 @@ JQUERY_UI_THEMES_LICENSE_FILES = MIT-LICENSE.txt
 JQUERY_UI_THEMES_DEPENDENCIES = jquery-ui
 
 define JQUERY_UI_THEMES_EXTRACT_CMDS
-       unzip -d $(@D) $(DL_DIR)/$(JQUERY_UI_THEMES_SOURCE)
+       $(UNZIP) -d $(@D) $(DL_DIR)/$(JQUERY_UI_THEMES_SOURCE)
        mv $(@D)/jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION)/* $(@D)
        $(RM) -r $(@D)/jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION)
 endef

diff --git a/package/jquery-ui/jquery-ui.mk b/package/jquery-ui/jquery-ui.mk
index d40158b274013d5e82512d1162db234b802a480b..e4d3370a951f3f41f1cad24517273bbfb1b69f4a 100644 (file)
--- a/package/jquery-ui/jquery-ui.mk
+++ b/package/jquery-ui/jquery-ui.mk
@@ -14,7 +14,7 @@ JQUERY_UI_LICENSE = MIT
 JQUERY_UI_LICENSE_FILES = MIT-LICENSE.txt
 
 define JQUERY_UI_EXTRACT_CMDS
-       unzip -d $(@D) $(DL_DIR)/$(JQUERY_UI_SOURCE)
+       $(UNZIP) -d $(@D) $(DL_DIR)/$(JQUERY_UI_SOURCE)
        mv $(@D)/jquery-ui-$(JQUERY_UI_VERSION)/* $(@D)
        $(RM) -r $(@D)/jquery-ui-$(JQUERY_UI_VERSION)
 endef

diff --git a/package/jquery-validation/jquery-validation.mk b/package/jquery-validation/jquery-validation.mk
index ca8cbdc8462d9eb519a0ac806a7b41e1efb3b937..b496b0a2d0958119957a42c0b459b0647d799250 100644 (file)
--- a/package/jquery-validation/jquery-validation.mk
+++ b/package/jquery-validation/jquery-validation.mk
@@ -11,7 +11,7 @@ JQUERY_VALIDATION_LICENSE = MIT
 JQUERY_VALIDATION_LICENSE_FILES = README.md
 
 define JQUERY_VALIDATION_EXTRACT_CMDS
-       unzip -d $(@D) $(DL_DIR)/$(JQUERY_VALIDATION_SOURCE)
+       $(UNZIP) -d $(@D) $(DL_DIR)/$(JQUERY_VALIDATION_SOURCE)
 endef
 
 define JQUERY_VALIDATION_INSTALL_TARGET_CMDS

diff --git a/package/libjson/libjson.mk b/package/libjson/libjson.mk
index cfb839d1f73198049979f9f9536983064ea052ee..17a1e9a78c36d687a0106aa277942debe5ef10e5 100644 (file)
--- a/package/libjson/libjson.mk
+++ b/package/libjson/libjson.mk
@@ -23,7 +23,7 @@ endif
 LIBJSON_MAKE_OPTS += BUILD_TYPE= CXXFLAGS="$(LIBJSON_CXXFLAGS)"
 
 define LIBJSON_EXTRACT_CMDS
-       unzip -d $(@D) $(DL_DIR)/$(LIBJSON_SOURCE)
+       $(UNZIP) -d $(@D) $(DL_DIR)/$(LIBJSON_SOURCE)
        mv $(@D)/libjson/* $(@D)
        $(RM) -r $(@D)/libjson
        $(SED) '/ldconfig/d' $(@D)/makefile

diff --git a/package/opentyrian-data/opentyrian-data.mk b/package/opentyrian-data/opentyrian-data.mk
index aa3bd69d65051c574f8caa648cb5f1f2f791b321..4b879df1c3a89e2973547c0eaaa882b13bb41661 100644 (file)
--- a/package/opentyrian-data/opentyrian-data.mk
+++ b/package/opentyrian-data/opentyrian-data.mk
@@ -10,7 +10,7 @@ OPENTYRIAN_DATA_SOURCE = tyrian21.zip
 OPENTYRIAN_DATA_LICENSE = Freeware
 
 define OPENTYRIAN_DATA_EXTRACT_CMDS
-       unzip -d $(@D) $(DL_DIR)/$(OPENTYRIAN_DATA_SOURCE)
+       $(UNZIP) -d $(@D) $(DL_DIR)/$(OPENTYRIAN_DATA_SOURCE)
 endef
 
 define OPENTYRIAN_DATA_INSTALL_TARGET_CMDS

diff --git a/package/python-keyring/python-keyring.mk b/package/python-keyring/python-keyring.mk
index a2e0af81296dd65c4a8f0954610b57e6deced28f..ef8b8af261425fae014f71370e292d9fcf36553a 100644 (file)
--- a/package/python-keyring/python-keyring.mk
+++ b/package/python-keyring/python-keyring.mk
@@ -11,7 +11,7 @@ PYTHON_KEYRING_SETUP_TYPE = setuptools
 PYTHON_KEYRING_LICENSE = python software foundation license
 
 define PYTHON_KEYRING_EXTRACT_CMDS
-       unzip -d $(@D) $(DL_DIR)/$(PYTHON_KEYRING_SOURCE)
+       $(UNZIP) -d $(@D) $(DL_DIR)/$(PYTHON_KEYRING_SOURCE)
        mv $(@D)/keyring-$(PYTHON_KEYRING_VERSION)/* $(@D)
        $(RM) -r $(@D)/keyring-$(PYTHON_KEYRING_VERSION)
 endef

diff --git a/package/rapidjson/rapidjson.mk b/package/rapidjson/rapidjson.mk
index 5e5d8f6f9d35348c2d086d84379be20d03f62347..68e010ede193dcdc3f8a734574de24fd74f6ebed 100644 (file)
--- a/package/rapidjson/rapidjson.mk
+++ b/package/rapidjson/rapidjson.mk
@@ -13,7 +13,7 @@ RAPIDJSON_INSTALL_TARGET = NO
 RAPIDJSON_INSTALL_STAGING = YES
 
 define RAPIDJSON_EXTRACT_CMDS
-       unzip -d $(@D) $(DL_DIR)/$(RAPIDJSON_SOURCE)
+       $(UNZIP) -d $(@D) $(DL_DIR)/$(RAPIDJSON_SOURCE)
        mv $(@D)/rapidjson/* $(@D)
        $(RM) -r $(@D)/rapidjson
 endef

diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk
index 905a6cbf3eff64e751b2528883f96368316581bf..f46cbce78ea816d710deb3fc40544e8e83339dc2 100644 (file)
--- a/package/sam-ba/sam-ba.mk
+++ b/package/sam-ba/sam-ba.mk
@@ -12,7 +12,7 @@ SAM_BA_LICENSE = BSD-like (partly binary-only)
 SAM_BA_LICENSE_FILES = doc/readme.txt
 
 define HOST_SAM_BA_EXTRACT_CMDS
-       unzip -d $(BUILD_DIR) $(DL_DIR)/$(SAM_BA_SOURCE)
+       $(UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(SAM_BA_SOURCE)
        mv $(BUILD_DIR)/sam-ba_cdc_cdc_linux/* $(@D)
        rmdir $(BUILD_DIR)/sam-ba_cdc_cdc_linux/
 endef

diff --git a/package/urg/urg.mk b/package/urg/urg.mk
index 2db96d5668536e65e8948b5f2b5663d4c4d85656..f831f749b82cbacb6189b0e8f5a20cd707745147 100644 (file)
--- a/package/urg/urg.mk
+++ b/package/urg/urg.mk
@@ -25,7 +25,7 @@ URG_CONFIG_SCRIPTS = c_urg-config urg-config
 
 define URG_EXTRACT_CMDS
        $(RM) -rf $(URG_DIR)
-       unzip -q -d $(BUILD_DIR)/ $(DL_DIR)/$(URG_SOURCE)
+       $(UNZIP) -d $(BUILD_DIR)/ $(DL_DIR)/$(URG_SOURCE)
        test -d $(URG_DIR) || \
                mv $(BUILD_DIR)/$(subst .zip,,$(URG_SOURCE)) $(URG_DIR)
 endef

diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk
index 234f7803762c981b4483e751284c7befd38ca166..94e8b1f724e32d905c31fc91bf18088e69b9dd07 100644 (file)
--- a/package/zxing/zxing.mk
+++ b/package/zxing/zxing.mk
@@ -22,7 +22,7 @@ endif
 endif
 
 define ZXING_EXTRACT_CMDS
-       unzip -d $(BUILD_DIR) $(DL_DIR)/$(ZXING_SOURCE)
+       $(UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(ZXING_SOURCE)
 endef
 
 define ZXING_BUILD_CMDS