image: only filter out images when ImageBuilder is used

Currently, we are filtering out images if DEFAULT:=n or BROKEN:=y are set,
so if you are building from scratch and want to build custom images that
are stripped down to fit, you must edit the image recipe or its just
filtered out.

So, to allow this behaviour when building from scratch as we can assume
that person doing that knows what they are attempting to do lets just limit
the filtering to ImageBuilder.

Fixes: f060615a78e5 ("image: respect DEFAULT and BROKEN when Default profile is selected")
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit d0d1f190683ad5923182140c40afb479907a1c2b)

diff --git a/include/image.mk b/include/image.mk
index 7293432085d27c1b3b2b44ee8c61d147c276338b..6a62f47f66af0293049e9cd7c87aab33c16928c3 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -487,12 +487,14 @@ endef
 
 define Device/Check/Common
   _PROFILE_SET = $$(strip $$(foreach profile,$$(PROFILES) DEVICE_$(1),$$(call DEVICE_CHECK_PROFILE,$$(profile))))
-  # Check if device is disabled and if so do not mark to be installed
-  ifeq ($$(DEFAULT),n)
-    _PROFILE_SET :=
-  endif
-  ifeq ($$(BROKEN),y)
-    _PROFILE_SET :=
+  # Check if device is disabled and if so do not mark to be installed when ImageBuilder is used
+  ifeq ($(IB),1)
+    ifeq ($$(DEFAULT),n)
+      _PROFILE_SET :=
+    endif
+    ifeq ($$(BROKEN),y)
+      _PROFILE_SET :=
+    endif
   endif
   DEVICE_PACKAGES += $$(call extra_packages,$$(DEVICE_PACKAGES))
   ifdef TARGET_PER_DEVICE_ROOTFS