From 2768ded0094728a1568f8cb268916ed5cd8d1b4b Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Thu, 21 Dec 2017 12:22:17 +0100
Subject: [PATCH] v4l-utils: refactor multi-keymap creation

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 packages/sysutils/v4l-utils/package.mk | 28 ++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk
index a9cc79c823..7f4dbca6a9 100644
--- a/packages/sysutils/v4l-utils/package.mk
+++ b/packages/sysutils/v4l-utils/package.mk
@@ -54,8 +54,22 @@ makeinstall_target() {
   fi
 }
 
+create_multi_keymap() {
+  local f name protocols
+  name="$1"
+  protocols="$2"
+  shift 2
+  (
+    echo "# table $name, type: $protocols"
+    for f in "$@" ; do
+      echo "# $f"
+      grep -v "^#" $INSTALL/usr/lib/udev/rc_keymaps/$f
+    done
+  ) > $INSTALL/usr/lib/udev/rc_keymaps/$name
+}
+
 post_makeinstall_target() {
-  local f keymap
+  local default_multi_maps f keymap
 
   rm -rf $INSTALL/etc/rc_keymaps
     ln -sf /storage/.config/rc_keymaps $INSTALL/etc/rc_keymaps
@@ -78,13 +92,11 @@ post_makeinstall_target() {
     done
   )
 
-  (
-    echo "# table libreelec_multi, type: RC6 NEC"
-    for f in rc6_mce xbox_360 zotac_ad10 hp_mce xbox_one cubox_i ; do
-      echo "# $f"
-      grep -v "^#" $INSTALL/usr/lib/udev/rc_keymaps/$f
-    done
-  ) > $INSTALL/usr/lib/udev/rc_keymaps/libreelec_multi
+  # create multi keymap to support several remotes OOTB
+
+  default_multi_maps="rc6_mce xbox_360 zotac_ad10 hp_mce xbox_one cubox_i"
+
+  create_multi_keymap libreelec_multi "RC6 NEC" $default_multi_maps
 
   # use multi-keymap instead of default one
   sed -i '/^\*\s*rc-rc6-mce\s*rc6_mce/d' $INSTALL/etc/rc_maps.cfg