From 894d58a15c9678bb34ce40f093d7aa39dd4cb1e8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 26 Feb 2020 20:43:43 +0100 Subject: [PATCH] package/pkg-generic.mk: simplify step_pkg_size Use the same trick in step_pkg_size as the one used in check_bin_arch: factorize the two $(filter ...) calls into one, checking in one step the step and whether it's the beginning or end of the step. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f4f525f41a..6687ac9198 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -95,12 +95,12 @@ define step_pkg_size_inner endef define step_pkg_size - $(if $(filter install-target,$(2)),\ - $(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(TARGET_DIR)))) - $(if $(filter install-staging,$(2)),\ - $(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(STAGING_DIR),-staging))) - $(if $(filter install-host,$(2)),\ - $(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(HOST_DIR),-host))) + $(if $(filter end-install-target,$(1)-$(2)),\ + $(call step_pkg_size_inner,$(3),$(TARGET_DIR))) + $(if $(filter end-install-staging,$(1)-$(2)),\ + $(call step_pkg_size_inner,$(3),$(STAGING_DIR),-staging)) + $(if $(filter end-install-host,$(1)-$(2)),\ + $(call step_pkg_size_inner,$(3),$(HOST_DIR),-host)) endef GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size -- 2.30.2