kodi: Update RBP commits #506
Merged
Conversation
This file contains 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
|
is this good to go? |
|
Yes |
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.
This updates the
gen-rpi-kodi-patch.shscript so that it acts a little more like thegen-rpi-linux-patch.shscript, with support for a rebase script (rpi-kodi-rebase.sh) although this does nothing as there are currently no commits we need to drop (but there may be in future).In addition, the
gen-rpi-kodi-patch.shscript will retrieve all commits up to the commit with the descriptionUNSTABLE: This is a placeholder. Commits after this point are considered experimental.. This should allow popcornmix to migrate commits into the "stable" category as they are tested.The generated RPi Kodi commits have been created by running:
As
newclock5is a "live" development branch it is important to coincide the pull from this branch with any bumping of kodi as the commits innewclock5usually correspond to specific kodi revisions - pull thenewclock5commits too late (after kodimasterhas "moved on", with formerlynewclock5commits being merged and dropping out ofnewclock5) and the pulled patch set may not apply cleanly on top of the kodi rev we are using. This is in fact the case with this PR, which now requireskodi-000-backports.patchto reintroduce a patch that is no longer in thenewclock5branch (it's already merged in kodi master, but merged in alpha3 and not the older alpha2 which is what our newclock5 patch set will be applied on top of).Anyway... fingers crossed we can pull these commits in future without too much faffing about.