Repository navigation
build: align the attach and updiff machinery on infrabase - #374
Merged
Merged
Conversation
The classes had fallen behind infrabase since #333. updiff now finds edits from the attach manifest instead of a diff against ${S}.pristine, so a series updated behind the tree is no longer reverted, merges the chains left in one patch set, and refuses a tree built with another series or edits on a file whose patches moved. The attach and clean guards move to the shared python helpers, and IB_PATCHDIR, which nothing here sets, gives way to IB_PATCHSET_DIR. The so3 recipe stays out of this: it builds in place, with no attach and no patch set. The :lvgl clean of usr-so3 also stays, as it restores from the git index because so3/usr is versioned here.
A blank line after the comment blocks of these classes, and a short description for the two functions local to do_updiff.
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.
Aligns the attach and updiff machinery on infrabase (infrabase #70);
patch.bbclass,base.bbclassandusr.bbclassare now the same files.What changes for fetched components (u-boot, qemu, linux, buildroot):
updifffinds edits from the attach manifest, not from a diff against${S}.pristine, so a series updated behind the tree is no longer reverted;N unchanged, N rewritten, N merged away, N appended.IB_PATCHDIRgoes away forIB_PATCHSET_DIR; nothing here set it.What stays: the so3 recipe builds in place, with no attach and no patch set. The
:lvglclean of usr-so3 restores from the git index, asso3/usris versioned here, unlike infrabase.Tested: U-Boot 2022.04 on a copy of the tree: attach, no edit, edit plus new file; usr-so3 attach and
updiff, with:lvgl.Not tested: no compile and no boot on this branch; the same classes passed a full virt64 build and QEMU boot on infrabase, whose so3 recipes differ.