summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2015-02-22 16:18:16 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2015-02-22 16:18:16 +0100
commit5bcada21fc2c1a551d16ff7a24c5cd2623ad71fb (patch)
tree1621b1282961a07de0529b98cadcafd6b8fc508f
parent620817291b044db6ae902ba49d7e6841e77bbdef (diff)
downloadembtoolkit-5bcada21fc2c1a551d16ff7a24c5cd2623ad71fb.tar.gz
embtoolkit-5bcada21fc2c1a551d16ff7a24c5cd2623ad71fb.tar.bz2
embtoolkit-5bcada21fc2c1a551d16ff7a24c5cd2623ad71fb.tar.xz
Build system: improve __embtk_pkg_installed-y
This give us the ability to issue the following sequence: $(call embtk_cleanup_pkg,xxx) $(call embtk_install_pkg,xxx) and see the package reinstalled, which is not currently the case. Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--core/mk/pkg-macros/install.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/mk/pkg-macros/install.mk b/core/mk/pkg-macros/install.mk
index 15b41f4..c8f2fc7 100644
--- a/core/mk/pkg-macros/install.mk
+++ b/core/mk/pkg-macros/install.mk
@@ -127,7 +127,7 @@ endef
# A macro to test if a package build recipe needs to be run or not.
#
__embtk_pkg_runrecipe-y = $(or $(__embtk_pkg_ninstalled-y),$(__embtk_pkg_confchanged-y),$(__embtk_pkg_configurechanged-y))
-__embtk_pkg_installed-y = $(or $(__embtk_$(pkgv)_installed),$(wildcard $(__embtk_pkg_dotinstalled_f)))
+__embtk_pkg_installed-y = $(or $(__embtk_$(pkgv)_installed),$(and $(wildcard $(__embtk_pkg_dotinstalled_f)),$(__embtk_$(pkgv)_installed)))
__embtk_pkg_ninstalled-y = $(if $(__embtk_pkg_installed-y),,y)
__embtk_pkg_confchanged-y = $(call __embtk_strneq,$(__embtk_pkg_kconfigs_all_v),$(__embtk_$(pkgv)_okconfigs))
__embtk_pkg_configurechanged-y = $(call __embtk_strneq,$(__embtk_pkg_configureopts),$(__embtk_$(pkgv)_oconfigureopts))