Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kodi: Update RBP commits #506

Merged
merged 2 commits into from Jul 5, 2016

Conversation

@MilhouseVH
Copy link
Contributor

commented Jul 1, 2016

This updates the gen-rpi-kodi-patch.sh script so that it acts a little more like the gen-rpi-linux-patch.sh script, 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.sh script will retrieve all commits up to the commit with the description UNSTABLE: 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:

gen-rpi-kodi-patch.sh newclock5 master

As newclock5 is a "live" development branch it is important to coincide the pull from this branch with any bumping of kodi as the commits in newclock5 usually correspond to specific kodi revisions - pull the newclock5 commits too late (after kodi master has "moved on", with formerly newclock5 commits being merged and dropping out of newclock5) 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 requires kodi-000-backports.patch to reintroduce a patch that is no longer in the newclock5 branch (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.

@lrusak

This comment has been minimized.

Copy link
Member

commented Jul 5, 2016

is this good to go?

@MilhouseVH

This comment has been minimized.

Copy link
Contributor Author

commented Jul 5, 2016

Yes

@lrusak lrusak merged commit 17b17dd into LibreELEC:master Jul 5, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.