diff mbox

[07/11] ext-tool.mk: add fancy messages

Message ID 1342963719-1810-8-git-send-email-s.martin49@gmail.com
State Superseded
Headers show

Commit Message

Samuel Martin July 22, 2012, 1:28 p.m. UTC 
Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Comments

Thomas Petazzoni July 22, 2012, 2:26 p.m. UTC | #1 
Le Sun, 22 Jul 2012 15:28:35 +0200,
Samuel Martin <s.martin49@gmail.com> a écrit :

> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> 
> diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
> index 293bf4f..0861673 100644
> --- a/package/pkg-utils.mk
> +++ b/package/pkg-utils.mk
> @@ -65,6 +65,7 @@ INFLATE.tar  = cat
>  
>  # MESSAGE Macro -- display a message in bold type
>  MESSAGE     = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
> +MESSAGE2    = echo "$(TERM_BOLD)>>> $(1) $(2)$(TERM_RESET)"
>  TERM_BOLD  := $(shell tput smso)
>  TERM_RESET := $(shell tput rmso)

Maybe we need:

MESSAGE	= echo "$(TERM_BOLD)>>> $(1) $(2)$(TERM_RESET)"
PKG_MESSAGE = $(call MESSAGE,$($(PKG)_NAME) $($(PKG)_VERSION),$(1))

And then use PKG_MESSAGE in the package infrastructure, and MESSAGE in
other places. But definitely MESSAGE vs. MESSAGE2 is ugly.

And maybe the MESSAGE definition would have to be somewhere outside of
pkg-utils.mk since it's not package related anymore.

Best regards,

Thomas
Arnout Vandecappelle July 25, 2012, 4:25 p.m. UTC | #2 
On 07/22/12 16:26, Thomas Petazzoni wrote:
> Le Sun, 22 Jul 2012 15:28:35 +0200,
> Samuel Martin<s.martin49@gmail.com>  a écrit :
>
>>
>> Signed-off-by: Samuel Martin<s.martin49@gmail.com>
>>
>> diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
>> index 293bf4f..0861673 100644
>> --- a/package/pkg-utils.mk
>> +++ b/package/pkg-utils.mk
>> @@ -65,6 +65,7 @@ INFLATE.tar  = cat
>>
>>   # MESSAGE Macro -- display a message in bold type
>>   MESSAGE     = echo "$(TERM_BOLD)>>>  $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
>> +MESSAGE2    = echo "$(TERM_BOLD)>>>  $(1) $(2)$(TERM_RESET)"
>>   TERM_BOLD  := $(shell tput smso)
>>   TERM_RESET := $(shell tput rmso)
>
> Maybe we need:
>
> MESSAGE	= echo "$(TERM_BOLD)>>>  $(1) $(2)$(TERM_RESET)"
> PKG_MESSAGE = $(call MESSAGE,$($(PKG)_NAME) $($(PKG)_VERSION),$(1))
>
> And then use PKG_MESSAGE in the package infrastructure, and MESSAGE in
> other places. But definitely MESSAGE vs. MESSAGE2 is ugly.

  +1 for that.


> And maybe the MESSAGE definition would have to be somewhere outside of
> pkg-utils.mk since it's not package related anymore.

  In fact everything in pkg-* is not strictly package-related anymore, since
it's also used by bootloaders and kernel, and download helpers are also used
by the external toolchains.  So if we start moving stuff around, probably
everything should just go into e.g. support/make/

  Regards,
  Arnout
Thomas Petazzoni July 25, 2012, 4:32 p.m. UTC | #3 
Le Wed, 25 Jul 2012 18:25:25 +0200,
Arnout Vandecappelle <arnout@mind.be> a écrit :

> > And maybe the MESSAGE definition would have to be somewhere outside of
> > pkg-utils.mk since it's not package related anymore.
> 
>   In fact everything in pkg-* is not strictly package-related anymore, since
> it's also used by bootloaders and kernel, and download helpers are also used
> by the external toolchains.  So if we start moving stuff around, probably
> everything should just go into e.g. support/make/

Well, even though boot/ and linux/ are outside package/, they still use
the normal package infrastructures, so I am not terribly shocked to see
those things being called pkg-* in package/. However, I agree that the
download helpers now have a more wisdespread usage.

The thing with support/make/ is that it seems to me a little bit hidden
behind the scenes.

Thomas
diff mbox

Patch

diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 293bf4f..0861673 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -65,6 +65,7 @@  INFLATE.tar  = cat
 
 # MESSAGE Macro -- display a message in bold type
 MESSAGE     = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
+MESSAGE2    = echo "$(TERM_BOLD)>>> $(1) $(2)$(TERM_RESET)"
 TERM_BOLD  := $(shell tput smso)
 TERM_RESET := $(shell tput rmso)
 
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 3f58aad..6e23994 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -265,12 +265,14 @@  endif
 # components than usual.
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1),y)
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1):
+	@$(call MESSAGE2,External toolchain,Downloading)
 	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1)/$(TOOLCHAIN_EXTERNAL_SOURCE_1))
 
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2):
 	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_2)/$(TOOLCHAIN_EXTERNAL_SOURCE_2))
 
 $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2)
+	@$(call MESSAGE2,External toolchain,Extracting)
 	mkdir -p $(@D)
 	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE_1))) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) | \
 		$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) -
@@ -291,9 +293,11 @@  endif
 else
 # Download and extraction of a toolchain
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE):
+	@$(call MESSAGE2,External toolchain,Downloading)
 	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE)$(TOOLCHAIN_EXTERNAL_SOURCE),$(TOOLCHAIN_EXTERNAL_SOURCE))
 
 $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE)
+	@$(call MESSAGE2,External toolchain,Extracting)
 	mkdir -p $(@D)
 	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE))) $^ | \
 		$(TAR) $(TAR_STRIP_COMPONENTS)=1 --exclude='usr/lib/locale/*' -C $(@D) $(TAR_OPTIONS) -
@@ -305,7 +309,7 @@  endif
 # matches the configuration provided in Buildroot: ABI, C++ support,
 # type of C library and all C library features.
 $(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
-	@echo "Checking external toolchain settings"
+	@$(call MESSAGE2,External toolchain,Checking external toolchain settings)
 	$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
 	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
@@ -394,7 +398,7 @@  $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
 	mkdir -p $(TARGET_DIR)/lib ; \
 	if test -z "$(BR2_PREFER_STATIC_LIB)" ; then \
-		echo "Copy external toolchain libraries to target..." ; \
+		$(call MESSAGE2,External toolchain,Copying external toolchain libraries to target) ; \
 		for libs in $(LIB_EXTERNAL_LIBS); do \
 			$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${SUPPORT_LIB_DIR},$${ARCH_LIB_DIR},$$libs,/lib); \
 		done ; \
@@ -402,7 +406,7 @@  $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 			$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${SUPPORT_LIB_DIR},$${ARCH_LIB_DIR},$$libs,/usr/lib); \
 		done ; \
 	fi ; \
-	echo "Copy external toolchain sysroot to staging..." ; \
+	$(call MESSAGE2,External toolchain,Copying external toolchain sysroot to staging) ; \
 	$(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) ; \
 	if [ -L $${ARCH_SYSROOT_DIR}/lib64 ] ; then \
 		$(call create_lib64_symlinks) ; \
@@ -426,6 +430,7 @@  $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 # Build toolchain wrapper for preprocessor, C and C++ compiler, and setup
 # symlinks for everything else
 $(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(STAMP_DIR)/ext-toolchain-installed
+	@$(call MESSAGE2,External toolchain,Installing toolchain wrapper) ; \
 	mkdir -p $(HOST_DIR)/usr/bin; cd $(HOST_DIR)/usr/bin; \
 	for i in $(TOOLCHAIN_EXTERNAL_CROSS)*; do \
 		base=$${i##*/}; \