ADFA-4664: add upstream patch staging and wire it into iiab-android#188
Merged
Merged
Conversation
Add tools/upstream-patches/ (README, idempotent applier, patches/, overlays/) to carry in-flight iiab/iiab changes into rootfs builds before they merge upstream. First carry: 0001-kolibri-trust-system-ca.patch, mirroring iiab/iiab #4442 (a patch of a patch, validated to apply and be idempotent). iiab-android pre-seeds /opt/iiab/iiab and runs the applier before the generic installer runs Ansible; safe because that installer clones iiab only if absent and never pulls/resets an existing checkout.
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
1 participant
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.
Add tools/upstream-patches/ (README, idempotent applier, patches/, overlays/) to carry in-flight iiab/iiab changes into rootfs builds before they merge upstream. First carry: 0001-kolibri-trust-system-ca.patch, mirroring iiab/iiab #4442 (a patch of a patch, validated to apply and be idempotent). iiab-android pre-seeds /opt/iiab/iiab and runs the applier before the generic installer runs Ansible; safe because that installer clones iiab only if absent and never pulls/resets an existing checkout.