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 <thomas.petazzoni@bootlin.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index f4f525f41a0825672a447496b68fbb53bd0419b0..6687ac919879dc360454211f3cd3d80ac8385d6b 100644 (file)
--- 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