mirror of https://github.com/openwrt/openwrt.git
image: respect DEFAULT and BROKEN when Default profile is selected
Currently, when you select the Default profile it does not honor DEFAULT:=n nor BROKEN:=y in device profiles but rather just tries to build all of them. This may work when building directly, but when using Image Builder it will always fail since no kernel or anything else is present for devices that have DEFAULT:=n or BROKEN:=Y set since those are skipped during build. So, lets look for DEFAULT being set to "n" or BROKEN being set to "y" and then remove clear _PROFILE_SET so they dont end up being marked for installation. Fixes: #18410 Link: https://github.com/openwrt/openwrt/pull/18814 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
fb90296c32
commit
f060615a78
|
@ -567,6 +567,13 @@ 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 :=
|
||||
endif
|
||||
DEVICE_PACKAGES += $$(call extra_packages,$$(DEVICE_PACKAGES))
|
||||
ifdef TARGET_PER_DEVICE_ROOTFS
|
||||
$$(eval $$(call merge_packages,_PACKAGES,$$(DEVICE_PACKAGES) $$(call DEVICE_EXTRA_PACKAGES,$(1))))
|
||||
|
|
Loading…
Reference in New Issue