NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Fabio Porcedda 2014-10-29 10:18:41 +01:00 committed by Peter Korsgaard
parent f787b51af5
commit ac9621d995
16 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot/at91bootstrap/at91bootstrap.mk
View File

@ -17,7 +17,7 @@ AT91BOOTSTRAP_INSTALL_IMAGES = YES
AT91BOOTSTRAP_INSTALL_TARGET = NO AT91BOOTSTRAP_INSTALL_TARGET = NO
define AT91BOOTSTRAP_EXTRACT_CMDS 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) mv $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION)/* $(@D)
rmdir $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION) rmdir $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION)
endef endef

1
package/Makefile.in
View File

@ -221,6 +221,7 @@ INSTALL := $(shell which install || type -p install)
FLEX := $(shell which flex || type -p flex) FLEX := $(shell which flex || type -p flex)
BISON := $(shell which bison || type -p bison) BISON := $(shell which bison || type -p bison)
SED := $(shell which sed || type -p sed) -i -e 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) APPLY_PATCHES = support/scripts/apply-patches.sh $(if $(QUIET),-s)

2
package/espeak/espeak.mk
View File

@ -21,7 +21,7 @@ ESPEAK_DEPENDENCIES = pulseaudio
endif endif
define ESPEAK_EXTRACT_CMDS 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) mv $(@D)/espeak-$(ESPEAK_VERSION)-source/* $(@D)
$(RM) -r $(@D)/espeak-$(ESPEAK_VERSION)-source $(RM) -r $(@D)/espeak-$(ESPEAK_VERSION)-source
endef endef

2
package/explorercanvas/explorercanvas.mk
View File

@ -11,7 +11,7 @@ EXPLORERCANVAS_LICENSE = Apache-2.0
EXPLORERCANVAS_LICENSE_FILES = COPYING EXPLORERCANVAS_LICENSE_FILES = COPYING
define EXPLORERCANVAS_EXTRACT_CMDS define EXPLORERCANVAS_EXTRACT_CMDS
unzip -d $(@D) $(DL_DIR)/$(EXPLORERCANVAS_SOURCE) $(UNZIP) -d $(@D) $(DL_DIR)/$(EXPLORERCANVAS_SOURCE)
endef endef
define EXPLORERCANVAS_INSTALL_TARGET_CMDS define EXPLORERCANVAS_INSTALL_TARGET_CMDS

2
package/gtest/gtest.mk
View File

@ -22,7 +22,7 @@ GTEST_LICENSE_FILES = LICENSE
GTEST_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF GTEST_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF
define GTEST_EXTRACT_CMDS define GTEST_EXTRACT_CMDS
unzip $(DL_DIR)/$(GTEST_SOURCE) -d $(BUILD_DIR) $(UNZIP) $(DL_DIR)/$(GTEST_SOURCE) -d $(BUILD_DIR)
endef endef
define GTEST_INSTALL_STAGING_CMDS define GTEST_INSTALL_STAGING_CMDS

2
package/jquery-mobile/jquery-mobile.mk
View File

@ -10,7 +10,7 @@ JQUERY_MOBILE_SOURCE = jquery.mobile-$(JQUERY_MOBILE_VERSION).zip
JQUERY_MOBILE_LICENSE = MIT JQUERY_MOBILE_LICENSE = MIT
define JQUERY_MOBILE_EXTRACT_CMDS define JQUERY_MOBILE_EXTRACT_CMDS
unzip -d $(@D) $(DL_DIR)/$(JQUERY_MOBILE_SOURCE) $(UNZIP) -d $(@D) $(DL_DIR)/$(JQUERY_MOBILE_SOURCE)
endef endef
JQUERY_MOBILE_INSTALLED_FILES = \ JQUERY_MOBILE_INSTALLED_FILES = \

2
package/jquery-ui-themes/jquery-ui-themes.mk
View File

@ -12,7 +12,7 @@ JQUERY_UI_THEMES_LICENSE_FILES = MIT-LICENSE.txt
JQUERY_UI_THEMES_DEPENDENCIES = jquery-ui JQUERY_UI_THEMES_DEPENDENCIES = jquery-ui
define JQUERY_UI_THEMES_EXTRACT_CMDS 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) mv $(@D)/jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION)/* $(@D)
$(RM) -r $(@D)/jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION) $(RM) -r $(@D)/jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION)
endef endef

2
package/jquery-ui/jquery-ui.mk
View File

@ -14,7 +14,7 @@ JQUERY_UI_LICENSE = MIT
JQUERY_UI_LICENSE_FILES = MIT-LICENSE.txt JQUERY_UI_LICENSE_FILES = MIT-LICENSE.txt
define JQUERY_UI_EXTRACT_CMDS 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) mv $(@D)/jquery-ui-$(JQUERY_UI_VERSION)/* $(@D)
$(RM) -r $(@D)/jquery-ui-$(JQUERY_UI_VERSION) $(RM) -r $(@D)/jquery-ui-$(JQUERY_UI_VERSION)
endef endef

2
package/jquery-validation/jquery-validation.mk
View File

@ -11,7 +11,7 @@ JQUERY_VALIDATION_LICENSE = MIT
JQUERY_VALIDATION_LICENSE_FILES = README.md JQUERY_VALIDATION_LICENSE_FILES = README.md
define JQUERY_VALIDATION_EXTRACT_CMDS define JQUERY_VALIDATION_EXTRACT_CMDS
unzip -d $(@D) $(DL_DIR)/$(JQUERY_VALIDATION_SOURCE) $(UNZIP) -d $(@D) $(DL_DIR)/$(JQUERY_VALIDATION_SOURCE)
endef endef
define JQUERY_VALIDATION_INSTALL_TARGET_CMDS define JQUERY_VALIDATION_INSTALL_TARGET_CMDS

2
package/libjson/libjson.mk
View File

@ -23,7 +23,7 @@ endif
LIBJSON_MAKE_OPTS += BUILD_TYPE= CXXFLAGS="$(LIBJSON_CXXFLAGS)" LIBJSON_MAKE_OPTS += BUILD_TYPE= CXXFLAGS="$(LIBJSON_CXXFLAGS)"
define LIBJSON_EXTRACT_CMDS define LIBJSON_EXTRACT_CMDS
unzip -d $(@D) $(DL_DIR)/$(LIBJSON_SOURCE) $(UNZIP) -d $(@D) $(DL_DIR)/$(LIBJSON_SOURCE)
mv $(@D)/libjson/* $(@D) mv $(@D)/libjson/* $(@D)
$(RM) -r $(@D)/libjson $(RM) -r $(@D)/libjson
$(SED) '/ldconfig/d' $(@D)/makefile $(SED) '/ldconfig/d' $(@D)/makefile

2
package/opentyrian-data/opentyrian-data.mk
View File

@ -10,7 +10,7 @@ OPENTYRIAN_DATA_SOURCE = tyrian21.zip
OPENTYRIAN_DATA_LICENSE = Freeware OPENTYRIAN_DATA_LICENSE = Freeware
define OPENTYRIAN_DATA_EXTRACT_CMDS define OPENTYRIAN_DATA_EXTRACT_CMDS
unzip -d $(@D) $(DL_DIR)/$(OPENTYRIAN_DATA_SOURCE) $(UNZIP) -d $(@D) $(DL_DIR)/$(OPENTYRIAN_DATA_SOURCE)
endef endef
define OPENTYRIAN_DATA_INSTALL_TARGET_CMDS define OPENTYRIAN_DATA_INSTALL_TARGET_CMDS

2
package/python-keyring/python-keyring.mk
View File

@ -11,7 +11,7 @@ PYTHON_KEYRING_SETUP_TYPE = setuptools
PYTHON_KEYRING_LICENSE = python software foundation license PYTHON_KEYRING_LICENSE = python software foundation license
define PYTHON_KEYRING_EXTRACT_CMDS 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) mv $(@D)/keyring-$(PYTHON_KEYRING_VERSION)/* $(@D)
$(RM) -r $(@D)/keyring-$(PYTHON_KEYRING_VERSION) $(RM) -r $(@D)/keyring-$(PYTHON_KEYRING_VERSION)
endef endef

2
package/rapidjson/rapidjson.mk
View File

@ -13,7 +13,7 @@ RAPIDJSON_INSTALL_TARGET = NO
RAPIDJSON_INSTALL_STAGING = YES RAPIDJSON_INSTALL_STAGING = YES
define RAPIDJSON_EXTRACT_CMDS define RAPIDJSON_EXTRACT_CMDS
unzip -d $(@D) $(DL_DIR)/$(RAPIDJSON_SOURCE) $(UNZIP) -d $(@D) $(DL_DIR)/$(RAPIDJSON_SOURCE)
mv $(@D)/rapidjson/* $(@D) mv $(@D)/rapidjson/* $(@D)
$(RM) -r $(@D)/rapidjson $(RM) -r $(@D)/rapidjson
endef endef

2
package/sam-ba/sam-ba.mk
View File

@ -12,7 +12,7 @@ SAM_BA_LICENSE = BSD-like (partly binary-only)
SAM_BA_LICENSE_FILES = doc/readme.txt SAM_BA_LICENSE_FILES = doc/readme.txt
define HOST_SAM_BA_EXTRACT_CMDS 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) mv $(BUILD_DIR)/sam-ba_cdc_cdc_linux/* $(@D)
rmdir $(BUILD_DIR)/sam-ba_cdc_cdc_linux/ rmdir $(BUILD_DIR)/sam-ba_cdc_cdc_linux/
endef endef

2
package/urg/urg.mk
View File

@ -25,7 +25,7 @@ URG_CONFIG_SCRIPTS = c_urg-config urg-config
define URG_EXTRACT_CMDS define URG_EXTRACT_CMDS
$(RM) -rf $(URG_DIR) $(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) || \ test -d $(URG_DIR) || \
mv $(BUILD_DIR)/$(subst .zip,,$(URG_SOURCE)) $(URG_DIR) mv $(BUILD_DIR)/$(subst .zip,,$(URG_SOURCE)) $(URG_DIR)
endef endef

2
package/zxing/zxing.mk
View File

@ -22,7 +22,7 @@ endif
endif endif
define ZXING_EXTRACT_CMDS define ZXING_EXTRACT_CMDS
unzip -d $(BUILD_DIR) $(DL_DIR)/$(ZXING_SOURCE) $(UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(ZXING_SOURCE)
endef endef
define ZXING_BUILD_CMDS define ZXING_BUILD_CMDS