From 9a26bfc5f2d7c6a5749cd6359cc4e0fef76196f6 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sun, 1 Mar 2015 10:22:09 +0100 Subject: Build system: __embtk_pkg_refspec: take into account CONFIG_EMBTK_{PKGV}_CATEGORY kconfig Signed-off-by: Abdoulaye Walsimou Gaye --- core/mk/pkg-macros/vars.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/mk/pkg-macros/vars.mk b/core/mk/pkg-macros/vars.mk index e622c1c..3fdd108 100644 --- a/core/mk/pkg-macros/vars.mk +++ b/core/mk/pkg-macros/vars.mk @@ -79,7 +79,10 @@ __embtk_pkg_tarball_tarxz = $(if $(filter %.tar.xz,$(__embtk_pkg_package)),tar.x __embtk_pkg_tarball_txz = $(if $(filter %.txz,$(__embtk_pkg_package)),txz) __embtk_pkg_tarball_tar = $(if $(filter %.tar,$(__embtk_pkg_package)),tar) -__embtk_pkg_refspec = $(or $(call __embtk_mk_uquote,$(CONFIG_EMBTK_$(PKGV)_REFSPEC)),$(__embtk_$(pkgv)_category)) +__embtk_pkg_category = $(call embtk_uquote,$(CONFIG_EMBTK_$(PKGV)_CATEGORY)) +# FIXME: drop __embtk_pkg_refspec in favor of __embtk_pkg_category +___embtk_pkg_refspec = $(call embtk_uquote,$(CONFIG_EMBTK_$(PKGV)_REFSPEC)) +__embtk_pkg_refspec = $(or $(___embtk_pkg_refspec),$(__embtk_pkg_category),$(__embtk_$(pkgv)_category)) __embtk_pkg_usesvn = $(if $(CONFIG_EMBTK_$(PKGV)_VERSION_SVN),svn) __embtk_pkg_svnsite = $(or $(call __embtk_mk_uquote,$(CONFIG_EMBTK_$(PKGV)_SVN_SITE)),$(strip $($(PKGV)_SVN_SITE))) -- cgit v1.2.3