From 5bcada21fc2c1a551d16ff7a24c5cd2623ad71fb Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sun, 22 Feb 2015 16:18:16 +0100 Subject: 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 --- core/mk/pkg-macros/install.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) -- cgit v1.2.3