fix(lvgl): re-pin submodule to upstream-fetchable commit + edk2 shims#39
Merged
Conversation
PR #38 pinned External/lvgl at 4cdddfe, a local PR-branch SHA that does not exist on upstream lvgl/lvgl, so fresh clones can't fetch the submodule. Re-pin to the upstream merged commit 0b1ea312d (v9.5.0-273, PR #10221). That commit carries unrelated v9.5.0->273 churn, handled edk2-side without patching the submodule: drop dead wayland sources from LvglCoreLib.inf, add a documented empty efi.h shim for PR #10041's unconditional gnu-efi include, and switch spike sources to the <lvgl/lvgl.h> umbrella instead of deprecated lvgl/src/drivers/uefi/* headers. Validated: OVMF X64 lvgl-mode build, LoongArch lvgl spike build, smoke. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
PR #38 pinned
External/lvglat4cdddfe— a local PR-branch SHA that does not exist on upstreamlvgl/lvgl..gitmodulespoints at upstream, so a fresh clone ofmain+git submodule updatefails to fetch the submodule. (The same change was merged upstream, but as a different SHA.)Fix
Re-pin to the upstream merged commit
0b1ea312d(v9.5.0-273), which is upstream master carrying the LoongArch64/RISC-V64 UEFI build support (PR #10221). Genuinely pristine and fetchable.That commit carries unrelated v9.5.0→273 churn, handled edk2-side without patching the submodule:
wayland/*sources fromLvglCoreLib.inf(upstream refactored that dir away).efi.hshim (Experimental/LvglSpikePkg/Library/LvglLib/efi.h) for the header-reorg PR #10041, which made<lvgl/lvgl.h>unconditionally#include <efi.h>even when the EDK2 framework is selected viaLV_USE_UEFI_INCLUDE. The shim pulls in no gnu-efi types.<lvgl/lvgl.h>umbrella instead of the now-deprecatedlvgl/src/drivers/uefi/*public headers (they became#warningstubs failing under-Werror=cpp).Both shims are removable once upstream gates the gnu-efi include behind the framework selection.
Validation
MODERN_SETUP_DISPLAY_ENGINE=lvglbuild — cleanLvglSpikeProbe.efispike build — cleansmoke_validate.py— PASSNotes
External/edk2baseline intentionally untouched.LvglSpikeRiscV.dsc) is pre-existing incomplete (missingLvglCoreLib/HII libs) — unrelated to this fix, not addressed here.🤖 Generated with Claude Code