summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2015-03-01 10:22:09 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2015-03-01 10:22:09 +0100
commit9a26bfc5f2d7c6a5749cd6359cc4e0fef76196f6 (patch)
tree27cefd1b821255f2a2ce07c30ba866bc65fb7eb8 /core
parentc0ff6b75d416eee13e0f563c9611a9876570528f (diff)
downloadembtoolkit-9a26bfc5f2d7c6a5749cd6359cc4e0fef76196f6.tar.gz
embtoolkit-9a26bfc5f2d7c6a5749cd6359cc4e0fef76196f6.tar.bz2
embtoolkit-9a26bfc5f2d7c6a5749cd6359cc4e0fef76196f6.tar.xz
Build system: __embtk_pkg_refspec: take into account CONFIG_EMBTK_{PKGV}_CATEGORY kconfig
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'core')
-rw-r--r--core/mk/pkg-macros/vars.mk5
1 files changed, 4 insertions, 1 deletions
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)))