From 277fa391df89987f28545b131035755e5d7cea51 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Jul 2022 15:46:30 +0200 Subject: [PATCH] - add $(pkgname) to console messages --- package/pkg-autotools.mk | 6 +++--- package/pkg-cmake.mk | 4 ++-- package/pkg-generic.mk | 8 ++++---- package/pkg-individual.mk | 2 +- package/pkg-kernel-module.mk | 2 +- package/pkg-meson.mk | 12 ++++++------ package/pkg-utils.mk | 20 ++++++++++---------- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 3ec3aa66..5344e363 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -6,7 +6,7 @@ define AUTORECONF_HOOK if [ "$($(PKG)_AUTORECONF)" == "YES" ]; then \ - $(call MESSAGE,"Autoreconfiguring"); \ + $(call MESSAGE,"Autoreconfiguring $(pkgname)"); \ $(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \ $($(PKG)_AUTORECONF_ENV) \ $($(PKG)_AUTORECONF_CMD) \ @@ -82,7 +82,7 @@ define TARGET_CONFIGURE_CMDS_DEFAULT endef define TARGET_CONFIGURE - @$(call MESSAGE,"Configuring") + @$(call MESSAGE,"Configuring $(pkgname)") $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(Q)$(call AUTORECONF_HOOK) $(Q)$(call $(PKG)_CONFIGURE_CMDS) @@ -139,7 +139,7 @@ define HOST_CONFIGURE_CMDS_DEFAULT endef define HOST_CONFIGURE - @$(call MESSAGE,"Configuring") + @$(call MESSAGE,"Configuring $(pkgname)") $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(Q)$(call AUTORECONF_HOOK) $(Q)$(call $(PKG)_CONFIGURE_CMDS) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index e2bcc75b..b66d3028 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -53,7 +53,7 @@ define TARGET_CMAKE_CMDS_DEFAULT endef define TARGET_CMAKE - @$(call MESSAGE,"Configuring") + @$(call MESSAGE,"Configuring $(pkgname)") $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(Q)$(call $(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) @@ -100,7 +100,7 @@ define HOST_CMAKE_CMDS_DEFAULT endef define HOST_CMAKE - @$(call MESSAGE,"Configuring") + @$(call MESSAGE,"Configuring $(pkgname)") $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(Q)$(call $(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 2b6a0683..e27d0613 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -14,7 +14,7 @@ define TARGET_MAKE_BUILD_CMDS_DEFAULT endef define TARGET_MAKE_BUILD - @$(call MESSAGE,"Building") + @$(call MESSAGE,"Building $(pkgname)") $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) $(Q)$(call $(PKG)_BUILD_CMDS) $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) @@ -28,7 +28,7 @@ define TARGET_MAKE_INSTALL_CMDS_DEFAULT endef define TARGET_MAKE_INSTALL - @$(call MESSAGE,"Installing") + @$(call MESSAGE,"Installing $(pkgname)") $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) $(Q)$(call $(PKG)_INSTALL_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) @@ -56,7 +56,7 @@ define HOST_MAKE_BUILD_CMDS_DEFAULT endef define HOST_MAKE_BUILD - @$(call MESSAGE,"Compiling") + @$(call MESSAGE,"Building $(pkgname)") $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) $(Q)$(call $(PKG)_BUILD_CMDS) $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) @@ -70,7 +70,7 @@ define HOST_MAKE_INSTALL_CMDS_DEFAULT endef define HOST_MAKE_INSTALL - @$(call MESSAGE,"Installing") + @$(call MESSAGE,"Installing $(pkgname)") $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) $(Q)$(call $(PKG)_INSTALL_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) diff --git a/package/pkg-individual.mk b/package/pkg-individual.mk index 286994b3..34c256be 100644 --- a/package/pkg-individual.mk +++ b/package/pkg-individual.mk @@ -5,7 +5,7 @@ ################################################################################ define INDIVIDUAL - @$(call MESSAGE,"Individual build and/or install") + @$(call MESSAGE,"Individual build and/or install $(pkgname)") $(foreach hook,$($(PKG)_INDIVIDUAL_HOOKS),$(call $(hook))$(sep)) endef diff --git a/package/pkg-kernel-module.mk b/package/pkg-kernel-module.mk index 5f0bffa7..7e066a9e 100644 --- a/package/pkg-kernel-module.mk +++ b/package/pkg-kernel-module.mk @@ -25,7 +25,7 @@ define KERNEL_MODULE_BUILD_CMDS_DEFAULT endef define KERNEL_MODULE_BUILD - @$(call MESSAGE,"Building kernel module") + @$(call MESSAGE,"Building $(pkgname) kernel module") $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) $(Q)$(call $(PKG)_BUILD_CMDS) $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index fabf3b65..a9d1d037 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -56,7 +56,7 @@ define TARGET_MESON_CMDS_DEFAULT endef define TARGET_MESON_CONFIGURE - @$(call MESSAGE,"Configuring") + @$(call MESSAGE,"Configuring $(pkgname)") $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(Q)$(call MESON_CROSS_CONFIG_HOOK,$(PKG_BUILD_DIR)/build) $(Q)$(call $(PKG)_CONFIGURE_CMDS) @@ -71,7 +71,7 @@ define TARGET_NINJA_BUILD_CMDS_DEFAULT endef define TARGET_NINJA_BUILD - @$(call MESSAGE,"Building") + @$(call MESSAGE,"Building $(pkgname)") $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) $(Q)$(call $(PKG)_BUILD_CMDS) $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) @@ -86,7 +86,7 @@ define TARGET_NINJA_INSTALL_CMDS_DEFAULT endef define TARGET_NINJA_INSTALL - @$(call MESSAGE,"Installing") + @$(call MESSAGE,"Installing $(pkgname)") $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) $(Q)$(call $(PKG)_INSTALL_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) @@ -119,7 +119,7 @@ define HOST_MESON_CMDS_DEFAULT endef define HOST_MESON_CONFIGURE - @$(call MESSAGE,"Configuring") + @$(call MESSAGE,"Configuring $(pkgname)") $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(Q)$(call $(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) @@ -133,7 +133,7 @@ define HOST_NINJA_BUILD_CMDS_DEFAULT endef define HOST_NINJA_BUILD - @$(call MESSAGE,"Building") + @$(call MESSAGE,"Building $(pkgname)") $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) $(Q)$(call $(PKG)_BUILD_CMDS) $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) @@ -147,7 +147,7 @@ define HOST_NINJA_INSTALL_CMDS_DEFAULT endef define HOST_NINJA_INSTALL - @$(call MESSAGE,"Installing") + @$(call MESSAGE,"Installing $(pkgname)") $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) $(Q)$(call $(PKG)_INSTALL_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 9f6aebf8..dfa362b4 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -212,7 +212,7 @@ PKG_NO_INSTALL = pkg-no-install define CLEANUP $(Q)( \ if [ "$($(PKG)_DIR)" ]; then \ - $(call MESSAGE,"Clean-up"); \ + $(call MESSAGE,"Clean-up $(pkgname)"); \ rm -rf $(BUILD_DIR)/$($(PKG)_DIR); \ fi; \ ) @@ -222,7 +222,7 @@ endef # start-up build define STARTUP - @$(call MESSAGE,"Start-up build") + @$(call MESSAGE,"Start-up build $(pkgname)") $(call CLEANUP) endef @@ -230,8 +230,8 @@ endef # resolve dependencies define DEPENDENCIES - @$(call MESSAGE,"Resolving dependencies") - $(foreach dependency,$($(PKG)_DEPENDENCIES),$(MAKE) $(dependency)$(sep)) + @$(call MESSAGE,"Resolving dependencies for $(pkgname)") + $(foreach dependency,$($(PKG)_DEPENDENCIES),$(Q)$(MAKE) $(dependency)$(sep)) endef # ----------------------------------------------------------------------------- @@ -240,7 +240,7 @@ endef GET_ARCHIVE = wget --no-check-certificate -t3 -T60 -c -P define DOWNLOAD - @$(call MESSAGE,"Downloading") + @$(call MESSAGE,"Downloading $(pkgname)") $(foreach hook,$($(PKG)_PRE_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) $(Q)( \ if [ "$($(PKG)_VERSION)" == "ni-git" ]; then \ @@ -268,7 +268,7 @@ download-package = $(call DOWNLOAD,$($(PKG)_SOURCE)) # unpack archives into given directory define EXTRACT # (directory) - @$(call MESSAGE,"Extracting") + @$(call MESSAGE,"Extracting $(pkgname)") $(foreach hook,$($(PKG)_PRE_EXTRACT_HOOKS),$(call $(hook))$(sep)) $(Q)( \ EXTRACT_DIR=$(1); \ @@ -312,7 +312,7 @@ define EXTRACT # (directory) fi; \ ;; \ *) \ - $(call MESSAGE,"Cannot extract $($(PKG)_SOURCE)"); \ + $(call WARNING,"Cannot extract $($(PKG)_SOURCE)"); \ false ;; \ esac \ ) @@ -332,7 +332,7 @@ PATCHES = \ # apply single patches or patch sets define APPLY_PATCHES # (patches or directory) - @$(call MESSAGE,"Patching") + @$(call MESSAGE,"Patching $(pkgname)") $(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep)) $(Q)( \ $(CHDIR)/$($(PKG)_DIR); \ @@ -430,7 +430,7 @@ endef # follow-up build define HOST_FOLLOWUP - @$(call MESSAGE,"Follow-up build") + @$(call MESSAGE,"Follow-up build $(pkgname)") $(foreach hook,$($(PKG)_PRE_FOLLOWUP_HOOKS),$(call $(hook))$(sep)) $(call CLEANUP) $(foreach hook,$($(PKG)_HOST_FINALIZE_HOOKS),$(call $(hook))$(sep)) @@ -439,7 +439,7 @@ define HOST_FOLLOWUP endef define TARGET_FOLLOWUP - @$(call MESSAGE,"Follow-up build") + @$(call MESSAGE,"Follow-up build $(pkgname)") $(foreach hook,$($(PKG)_PRE_FOLLOWUP_HOOKS),$(call $(hook))$(sep)) $(call REWRITE_CONFIG_SCRIPTS) $(call REWRITE_LIBTOOL)