diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-01-21 17:17:33 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-01-21 17:17:33 +0100 |
| commit | 07b392e518ddfe0cb5963a08f12568fd62bcc108 (patch) | |
| tree | 863db158a1c6e690d389f7da3565819e7bd20329 /mk | |
| parent | e474a0dee5def098ea16226ede75a535f34e7cd8 (diff) | |
| download | embtoolkit-07b392e518ddfe0cb5963a08f12568fd62bcc108.tar.gz embtoolkit-07b392e518ddfe0cb5963a08f12568fd62bcc108.tar.bz2 embtoolkit-07b392e518ddfe0cb5963a08f12568fd62bcc108.tar.xz | |
Build system: little internal macros tweak and add
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildsystem.mk | 4 | ||||
| -rw-r--r-- | mk/macros.packages.mk | 25 | ||||
| -rw-r--r-- | mk/toolchain.mk | 2 |
3 files changed, 20 insertions, 11 deletions
diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk index 772faef..11b79f0 100644 --- a/mk/buildsystem.mk +++ b/mk/buildsystem.mk @@ -102,12 +102,12 @@ define __embtk_mk_startbuild $(call embtk_echo_blue," ~~~~~~~~~~~~ ") $(call embtk_echo_blue,"| Host tools |") $(call embtk_echo_blue," ~~~~~~~~~~~~ ") - $(call embtk_echo_blue,"\tNumber of host tools packages needed:$(__embtk_hosttools_nrpackages)") + $(call embtk_echo_blue,"\tNumber of host tools packages needed:$(__embtk_hosttools_nrpkgs-y)") $(if $(CONFIG_EMBTK_HAVE_ROOTFS), $(call embtk_echo_blue," ~~~~~~~~~~~~~~~~~~ ") $(call embtk_echo_blue,"| Root FS packages |") $(call embtk_echo_blue," ~~~~~~~~~~~~~~~~~~ ") - $(call embtk_echo_blue,"\tNumber of root FS packages:$(__embtk_rootfs_nrpackages)") + $(call embtk_echo_blue,"\tNumber of root FS packages:$(__embtk_rootfs_nrpkgs-y)") $(call embtk_echo_blue," ~~~~~~~~~~~~~~~ ") $(call embtk_echo_blue,"| Root FS types |") $(call embtk_echo_blue," ~~~~~~~~~~~~~~~ ") diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index 4b3e903..c3de108 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -169,16 +169,25 @@ __embtk_pkg_dotinstalled_f = $(__embtk_pkg_builddir)/.installed __embtk_pkg_dotpkgkconfig_f = $(__embtk_pkg_builddir)/.embtk.$(__embtk_pkg_name).kconfig # Some useful macros about packages -__embtk_rootfs_packages = $(patsubst %_install,%,$(ROOTFS_COMPONENTS-y)) -__embtk_rootfs_nrpackages = $(if $(__embtk_rootfs_packages), \ - $(shell echo $(__embtk_rootfs_packages) \ - | wc -w), \ - 0) -__embtk_hosttools_packages = $(patsubst %_install,%,$(HOSTTOOLS_COMPONENTS-y)) -__embtk_hosttools_nrpackages = $(if $(__embtk_hosttools_packages), \ - $(shell echo $(__embtk_hosttools_packages) \ +__embtk_rootfs_pkgs-y = $(patsubst %_install,%,$(ROOTFS_COMPONENTS-y)) +__embtk_rootfs_nrpkgs-y = $(if $(__embtk_rootfs_pkgs-y), \ + $(shell echo $(__embtk_rootfs_pkgs-y) \ | wc -w),0) +__embtk_hosttools_pkgs-y = $(patsubst %_install,%,$(HOSTTOOLS_COMPONENTS-y)) +__embtk_hosttools_nrpkgs-y = $(if $(__embtk_hosttools_pkgs-y), \ + $(shell echo $(__embtk_hosttools_pkgs-y) \ + | wc -w),0) + +__embtk_rootfs_pkgs-n = $(patsubst %_install,%,$(ROOTFS_COMPONENTS-)) +__embtk_rootfs_nrpkgs-n = $(if $(__embtk_rootfs_pkgs-n), \ + $(shell echo $(__embtk_rootfs_pkgs-n) \ + | wc -w),0) + +__embtk_hosttools_pkgs-n = $(patsubst %_install,%,$(HOSTTOOLS_COMPONENTS-)) +__embtk_hosttools_nrpkgs-n = $(if $(__embtk_hosttools_pkgs-n), \ + $(shell echo $(__embtk_hosttools_pkgs-n) \ + | wc -w),0) # # A macro to get packages version from .config file. # usage: $(call embtk_get_pkgversion,PACKAGE) diff --git a/mk/toolchain.mk b/mk/toolchain.mk index 9f5ee6b..7520552 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -148,7 +148,7 @@ define __embtk_toolchain_build rm -rf $(TOOLCHAIN_DIR)/.installed $(foreach dep,$(patsubst %_install,%,$(TOOLCHAIN_DEPS)), rm -rf $(call __embtk_pkg_builddir,$(dep));) - $(foreach pkg,$(__embtk_rootfs_packages),$(MAKE) $(pkg)_clean;) + $(foreach pkg,$(__embtk_rootfs_pkgs-y),$(MAKE) $(pkg)_clean;) rm -rf $(SYSROOT) $(__embtk_mk_initsysrootdirs) $(MAKE) mkinitialpath $(TOOLCHAIN_PRE_DEPS) $(TOOLCHAIN_DEPS) |