diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-10-06 18:37:03 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-10-06 18:37:03 +0200 |
| commit | 7e248f0cbb04d705cbaf8bc180098bb59e67c4c6 (patch) | |
| tree | 4834ea791c91de97502d5aba1d7b77605a75439d /mk | |
| parent | b2ca5d142fd4af6ae5da806dffc3ee499353d7f1 (diff) | |
| download | embtoolkit-7e248f0cbb04d705cbaf8bc180098bb59e67c4c6.tar.gz embtoolkit-7e248f0cbb04d705cbaf8bc180098bb59e67c4c6.tar.bz2 embtoolkit-7e248f0cbb04d705cbaf8bc180098bb59e67c4c6.tar.xz | |
Toolchain: replace __embtk_mk_unquotestr -> __embtk_mk_uquote
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/arch/arm/arm.mk | 2 | ||||
| -rw-r--r-- | mk/buildsystem.mk | 2 | ||||
| -rw-r--r-- | mk/macros.mk | 6 | ||||
| -rw-r--r-- | mk/macros.packages.mk | 16 |
4 files changed, 13 insertions, 13 deletions
diff --git a/mk/arch/arm/arm.mk b/mk/arch/arm/arm.mk index 52bd258..8d27d5d 100644 --- a/mk/arch/arm/arm.mk +++ b/mk/arch/arm/arm.mk @@ -24,7 +24,7 @@ LINUX_ARCH := arm GNU_TARGET_ARCH := arm -EMBTK_MCU_FLAG := $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_ARM_MCU_STRING)) +EMBTK_MCU_FLAG := $(call __embtk_mk_uquote,$(CONFIG_EMBTK_ARM_MCU_STRING)) ifeq ($(CONFIG_EMBTK_CLIB_EGLIBC),y) # EGLIBC C library diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk index 18c8dda..f816a68 100644 --- a/mk/buildsystem.mk +++ b/mk/buildsystem.mk @@ -43,7 +43,7 @@ embtk_pkgb := $(PACKAGES_BUILD) embtk_generated := $(EMBTK_GENERATED) embtk_rootfs := $(ROOTFS) embtk_htools := $(HOSTTOOLS) -__embtk_dldir := $(patsubst %/,%,$(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_DOWNLOAD_DIR))) +__embtk_dldir := $(patsubst %/,%,$(call __embtk_mk_uquote,$(CONFIG_EMBTK_DOWNLOAD_DIR))) embtk_dldir := $(or $(__embtk_dldir),$(EMBTK_ROOT)/dl) diff --git a/mk/macros.mk b/mk/macros.mk index 349396f..26d03d2 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -68,11 +68,11 @@ __embtk_mk_pathexist = $(shell test -e $(1) && echo y) __embtk_mk_pathnotexist = $(shell test -e $(1) || echo y) # -# __embtk_mk_unquotestr +# __embtk_mk_uquote # A macro to unquote a string. -# Usage: $(call __embtk_mk_unquotestr,$(myquotedvar)) +# Usage: $(call __embtk_mk_uquote,$(myquotedvar)) # -__embtk_mk_unquotestr = $(subst ",,$(strip $(1))) +__embtk_mk_uquote = $(subst ",,$(strip $(1))) # Macro to print messages embtk_pwarning = $(call embtk_echo_yellow,"$(__embtk_msg_h)\\n~~ EmbToolkit ~~ WARNING: $(1)\\n$(__embtk_msg_h)") diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index 4122650..291fa4d 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -122,19 +122,19 @@ __embtk_pkg_mirror2 = $(strip $($(PKGV)_MIRROR2)) __embtk_pkg_mirror3 = $(strip $($(PKGV)_MIRROR3)) __embtk_pkg_package = $(strip $($(PKGV)_PACKAGE)) -__embtk_pkg_refspec = $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_REFSPEC)) +__embtk_pkg_refspec = $(call __embtk_mk_uquote,$(CONFIG_EMBTK_$(PKGV)_REFSPEC)) __embtk_pkg_usesvn = $(if $(CONFIG_EMBTK_$(PKGV)_VERSION_SVN),svn) -__embtk_pkg_svnsite = $(or $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_SVN_SITE)),$(strip $($(PKGV)_SVN_SITE))) -__embtk_pkg_svnbranch = $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_SVN_BRANCH)) -__embtk_pkg_svnrev = $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_SVN_REVISION)) +__embtk_pkg_svnsite = $(or $(call __embtk_mk_uquote,$(CONFIG_EMBTK_$(PKGV)_SVN_SITE)),$(strip $($(PKGV)_SVN_SITE))) +__embtk_pkg_svnbranch = $(call __embtk_mk_uquote,$(CONFIG_EMBTK_$(PKGV)_SVN_BRANCH)) +__embtk_pkg_svnrev = $(call __embtk_mk_uquote,$(CONFIG_EMBTK_$(PKGV)_SVN_REVISION)) __embtk_pkg_localsvn = $(strip $(if $(__embtk_pkg_usesvn), \ $(EMBTK_ROOT)/src/$(__embtk_pkg_refspec)/$(__embtk_pkg_name)-$(notdir $(__embtk_pkg_svnbranch)).svn)) __embtk_pkg_usegit = $(if $(CONFIG_EMBTK_$(PKGV)_VERSION_GIT),git) -__embtk_pkg_gitsite = $(or $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_GIT_SITE)),$(strip $($(PKGV)_GIT_SITE))) -__embtk_pkg_gitbranch = $(or $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_GIT_BRANCH)),master) -__embtk_pkg_gitrev = $(or $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_GIT_REVISION)),HEAD) +__embtk_pkg_gitsite = $(or $(call __embtk_mk_uquote,$(CONFIG_EMBTK_$(PKGV)_GIT_SITE)),$(strip $($(PKGV)_GIT_SITE))) +__embtk_pkg_gitbranch = $(or $(call __embtk_mk_uquote,$(CONFIG_EMBTK_$(PKGV)_GIT_BRANCH)),master) +__embtk_pkg_gitrev = $(or $(call __embtk_mk_uquote,$(CONFIG_EMBTK_$(PKGV)_GIT_REVISION)),HEAD) __embtk_pkg_localgit = $(strip $(if $(__embtk_pkg_usegit), \ $(EMBTK_ROOT)/src/$(__embtk_pkg_refspec)/$(__embtk_pkg_name).git)) @@ -196,7 +196,7 @@ __embtk_pkgs_nrall-y = $(words $(__embtk_pkgs_all-y)) # A macro to get packages version from .config file. # usage: $(call embtk_get_pkgversion,PACKAGE) # -embtk_get_pkgversion = $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_VERSION_STRING)) +embtk_get_pkgversion = $(call __embtk_mk_uquote,$(CONFIG_EMBTK_$(PKGV)_VERSION_STRING)) # |