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

binary/retroplayer update scripts: update to latest tag instead of HEAD #3347

Merged
merged 19 commits into from Mar 10, 2019

Conversation

HiassofT
Copy link
Member

This avoids picking up unreleased development commits

Also add environment variables to keep cloned git dirs and to bump PKG_REV when PKG_VERSION is bumped. The latter is needed to make sure the currently too new addons will be updated to the correct version.

use eg like this:

KEEP_GIT_DIRS=yes BUMP_PKG_REV=yes ./update_binary-addons master

Signed-off-by: Matthias Reichl <hias@horus.com>
Signed-off-by: Matthias Reichl <hias@horus.com>
Copy link
Contributor

@MilhouseVH MilhouseVH left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks.

tools/mkpkg/update_binary-addons Outdated Show resolved Hide resolved
tools/mkpkg/update_binary-addons Outdated Show resolved Hide resolved
tools/mkpkg/update_binary-addons Outdated Show resolved Hide resolved
also change missing tag ERROR to WARNING

Signed-off-by: Matthias Reichl <hias@horus.com>
Signed-off-by: Matthias Reichl <hias@horus.com>
@HiassofT
Copy link
Member Author

I've pushed my update script refactoring (moving common stuff into update_common_functions)
and also added an experimental commit to switch update_retroplayer-addons to using tags.

Better don't use the latter in production ATM as tags in the kodi-game repos are somewhat out of date

tools/mkpkg/update_binary-addons Outdated Show resolved Hide resolved
tools/mkpkg/update_retroplayer-addons Outdated Show resolved Hide resolved
@HiassofT
Copy link
Member Author

HiassofT commented Mar 1, 2019

thanks for the review, I fixed the path quoting, the update scripts now run fine in a directory with spaces.

tested with

hias@lenny:~/private/libreelec/test dir$ KEEP_GIT_DIRS=yes BUMP_PKG_REV=yes ../libreelec-git/tools/mkpkg/update_retroplayer-addons

having the LE tree in a directory with spaces won't work though, sourcing config/options doesn't succeed in that case.

@HiassofT
Copy link
Member Author

HiassofT commented Mar 1, 2019

I've added options to allow excluding packages from updates so we can drop vfs.sacd and game.netplay without being constantly nagged that they are present in upstream binary repo but missing in LE.

I also added commits to remove vfs.sacd, which is currently unreleased upstream, and game.netplay.

I've kept peripheral.steamcontroller for now, it's not tagged upstream and most certainly not needed on newer kernels which support the steam controller, but OTOH it's still receiving updates upstream and may be useful on RK and AML which run older kernels.

@HiassofT
Copy link
Member Author

HiassofT commented Mar 1, 2019

addon updates now look fine, here's a tree with bumps to latest tags: https://github.com/HiassofT/LibreELEC.tv/commits/le92-binary-addon-bump

Kodi game addons seem to be OK, too, game.libretro tag is correct (sorry, looked at master instead of retroplayer branch yesterday...) and the game.libretro.xxx commits after the tags seem to be buildsystem changes not needed in LE.

Signed-off-by: Matthias Reichl <hias@horus.com>
Signed-off-by: Matthias Reichl <hias@horus.com>
As we are using tags, and the addon version should match the tag
version bumping PKG_REV on kodi game addon updates isn't needed.

As with update_binary-addons bumping PKG_REV may be wanted as
we are switching from HEAD to tags and can be enabled by setting
the PKG_BUMP_REV environment variable.

PKG_REV will also be bumped the script is run with "-f" as before.

Signed-off-by: Matthias Reichl <hias@horus.com>
Signed-off-by: Matthias Reichl <hias@horus.com>
Signed-off-by: Matthias Reichl <hias@horus.com>
game.netplay is non-working and not maintained

Signed-off-by: Matthias Reichl <hias@horus.com>
Signed-off-by: Matthias Reichl <hias@horus.com>
vfs.sacd is currently unreleased at upstream and not tagged properly

Signed-off-by: Matthias Reichl <hias@horus.com>
Signed-off-by: Matthias Reichl <hias@horus.com>
Signed-off-by: Matthias Reichl <hias@horus.com>
LibreELEC uses a locally managed, newer version of p8-platform

Signed-off-by: Matthias Reichl <hias@horus.com>
Signed-off-by: Matthias Reichl <hias@horus.com>
vfs.nfs isn't released yet

Signed-off-by: Matthias Reichl <hias@horus.com>
imagedecoder.mpo is available as a binary addon from the Kodi
repo but was missing in LibreELEC

Signed-off-by: Matthias Reichl <hias@horus.com>
@HiassofT HiassofT marked this pull request as ready for review March 2, 2019 12:40
@HiassofT
Copy link
Member Author

HiassofT commented Mar 2, 2019

I've squashed the minor fixes and added the missing imagedecoder.mpo addon (whatever that is), which build-tested fine for RPi2.

I also updated the tree with binary/game addon updates: https://github.com/HiassofT/LibreELEC.tv/commits/le92-binary-addon-bump, build test with create_addon all is currently running

@HiassofT HiassofT changed the title update_binary-addons: update kodi addons to latest tag instead of HEAD binary/retroplayer update scripts: update to latest tag instead of HEAD Mar 2, 2019
@HiassofT
Copy link
Member Author

HiassofT commented Mar 2, 2019

RPi2 image build and scripts/create_addon all of addon update tree was fine
ALL ADDONS BUILT SUCCESSFULLY

Signed-off-by: Matthias Reichl <hias@horus.com>
@CvH CvH merged commit 4442906 into LibreELEC:master Mar 10, 2019
@HiassofT HiassofT deleted the le92-binary-addons branch April 3, 2019 10:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants