diff options
| author | Robert Marko | 2025-05-24 10:20:54 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-05-24 10:25:49 +0000 |
| commit | 8e272a6d839af59615d83ac580aab1b9a7272db7 (patch) | |
| tree | ad262d5bbdf10167c8d6e368ee2a066b89a145b9 | |
| parent | 0ccd68f9baedc3c9515694a4f77872ff54b53d9c (diff) | |
| download | openwrt-8e272a6d839af59615d83ac580aab1b9a7272db7.tar.gz | |
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>
| -rw-r--r-- | include/image.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/image.mk b/include/image.mk index c1d71f1cc4..6408719bdc 100644 --- a/include/image.mk +++ b/include/image.mk @@ -569,12 +569,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 |