On 2/19/24 11:21, Gerd Hoffmann wrote: >>> -!if $(BUILD_SHELL) == TRUE >>> +!if $(BUILD_SHELL) == TRUE && $(SECURE_BOOT_ENABLE) == FALSE >>> >>> !if $(TOOL_CHAIN_TAG) != "XCODE5" >>> !if $(NETWORK_ENABLE) == TRUE >> >> This does the job: >> >> Reviewed-by: Laszlo Ersek <ler...@redhat.com> >> >> An alternative could be (perhaps informing the user better): >> >> !if $(BUILD_SHELL) == TRUE >> !if $(SECURE_BOOT_ENABLE) == TRUE >> !error BUILD_SHELL and SECURE_BOOT_ENABLE conflict >> !endif >> ... >> !endif > > That would break CI. > > Patch 11/12 depends on the shell being built even if not included in the > firmware image, so it can be copied to the virtual drive used by the > qemu test.
Ah, understood. We don't conditionalize in the DSC files, only in the FDFs. Laszlo > >> A repost might be worth your while either way, because some of the >> patches are identical to their first versions, and Jiewen's v1 Acked-by, >> from [1], is missing from the unchanged (or trivially rebased) patches >> in v2. > > Oops, right, went over all individual patches updating them, then forgot > the Jiewen's ack for the whole series. > > take care, > Gerd > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115597): https://edk2.groups.io/g/devel/message/115597 Mute This Topic: https://groups.io/mt/104370218/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
