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

v4l-utils: cleanup build and add missing keymaps #2347

Merged
merged 4 commits into from
Jan 3, 2018

Conversation

HiassofT
Copy link
Member

Using patches to add additional keymaps and change the system rc_maps.cfg wasn't such a good idea, it's hard to maintain and easily breaks on upgrades (rc_maps.cfg usually only gets additional lines added, but that's rather fragile with patch context).

Better add additional keymaps via files and use sed/cat in package.mk to change the config. When installing additional keymaps make sure we don't accidentally overwrite existing ones (eg when they were added upstream).

While we're at it also add the (non-upstreamed) odroid and wetek_hub keymaps - I've generated them with gen_keytables.pl from the v4l-utils tree, using our amlogic-3.14 tree as a source (same method as upstream changes are handled in upstream v4l-utils).

I also factored out creation of multi-keymaps into a separate function so it can be reused to create multiple (eg device specific) multi-keymaps

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

@chewitt chewitt left a comment

Choose a reason for hiding this comment

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

Thanks, looks sensible :)

@chewitt chewitt merged commit 846e91e into LibreELEC:master Jan 3, 2018
@HiassofT HiassofT deleted the le9-v4l-utils-cleanup branch May 1, 2018 09:33
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

2 participants