From affe7c7712ab7b0ea00c68660a19e6a7c6c0fec5 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Wed, 27 Sep 2017 14:18:27 +0300 Subject: [PATCH] Remove unused LIRC bits since it's not installed by default --- config/lirc.conf.bananapi | 64 ----------------- config/lirc.conf.cubietruck | 64 ----------------- config/lirc.conf.cubox-i | 127 ---------------------------------- config/lirc.conf.odroidc2 | 13 ---- config/sources/cubox.conf | 4 -- config/sources/meson64.conf | 5 -- config/sources/mvebu.conf | 2 +- config/sources/mvebu64.conf | 2 +- config/sources/odroidc2.conf | 6 -- config/sources/odroidxu4.conf | 1 - config/sources/sun4i.conf | 14 ---- config/sources/sun7i.conf | 16 ----- config/sources/sun8i.conf | 13 ++-- config/sources/udoo-neo.conf | 1 - config/sources/udoo.conf | 1 - 15 files changed, 6 insertions(+), 327 deletions(-) delete mode 100644 config/lirc.conf.bananapi delete mode 100644 config/lirc.conf.cubietruck delete mode 100644 config/lirc.conf.cubox-i delete mode 100644 config/lirc.conf.odroidc2 diff --git a/config/lirc.conf.bananapi b/config/lirc.conf.bananapi deleted file mode 100644 index d5fa33f8db..0000000000 --- a/config/lirc.conf.bananapi +++ /dev/null @@ -1,64 +0,0 @@ -# generated by devinput.sh -begin remote - name devinput - bits 16 - eps 30 - aeps 100 - pre_data_bits 16 - pre_data 0x0001 - post_data_bits 32 - post_data 0x00000001 - gap 132799 - toggle_bit 0 - - begin codes - POWER 87 - MUTE 92 - HELP 5 - PREFS 9 - FAVS 21 - R2C1 4 - R2C2 8 - R2C3 20 - VOLUME+ 255 - VOLUME- 93 - INFO 16 - MOUSE 17 - ZOOM+ 12 - ZOOM- 88 - R5C1 84 - R5C2 91 - R5C3 23 - MENU 22 - HOME 71 - BACK 79 - LEFT 6 - RIGHT 14 - UP 67 - DOWN 10 - OK 2 - STOP 19 - PLAY 80 - SEARCH 13 - REV 7 - FWD 3 - PREV 15 - NEXT 11 - RED 85 - GREEN 78 - YELLOW 73 - BLUE 72 - 1 26 - 2 1 - 3 69 - 4 89 - 5 77 - 6 64 - 7 82 - 8 83 - 9 65 - 0 90 - AUDIO 68 - SUBTITLE 70 - end codes -end remote diff --git a/config/lirc.conf.cubietruck b/config/lirc.conf.cubietruck deleted file mode 100644 index d5fa33f8db..0000000000 --- a/config/lirc.conf.cubietruck +++ /dev/null @@ -1,64 +0,0 @@ -# generated by devinput.sh -begin remote - name devinput - bits 16 - eps 30 - aeps 100 - pre_data_bits 16 - pre_data 0x0001 - post_data_bits 32 - post_data 0x00000001 - gap 132799 - toggle_bit 0 - - begin codes - POWER 87 - MUTE 92 - HELP 5 - PREFS 9 - FAVS 21 - R2C1 4 - R2C2 8 - R2C3 20 - VOLUME+ 255 - VOLUME- 93 - INFO 16 - MOUSE 17 - ZOOM+ 12 - ZOOM- 88 - R5C1 84 - R5C2 91 - R5C3 23 - MENU 22 - HOME 71 - BACK 79 - LEFT 6 - RIGHT 14 - UP 67 - DOWN 10 - OK 2 - STOP 19 - PLAY 80 - SEARCH 13 - REV 7 - FWD 3 - PREV 15 - NEXT 11 - RED 85 - GREEN 78 - YELLOW 73 - BLUE 72 - 1 26 - 2 1 - 3 69 - 4 89 - 5 77 - 6 64 - 7 82 - 8 83 - 9 65 - 0 90 - AUDIO 68 - SUBTITLE 70 - end codes -end remote diff --git a/config/lirc.conf.cubox-i b/config/lirc.conf.cubox-i deleted file mode 100644 index 02da5c36cc..0000000000 --- a/config/lirc.conf.cubox-i +++ /dev/null @@ -1,127 +0,0 @@ -# -# this config file was automatically generated -# using lirc-0.8.3(default) on Thu Jun 4 11:04:55 2009 -# -# contributed by Maarten Platjes -# -# brand: LG -# model no. of remote control: MKJ40653802 -# devices being controlled by this remote: -# LG 2008 LCD TVs like 19LS4D , 22LS4D , -# 19LG30 , 22LG30 , 26LG30 , 32LG30 , 37LG30 , -# 42LG30 , 32LG50 , 37LG50 , 42LG50 , 47LG50 , -# 52LG50and variants of these models (xxLGx000) -# -# Note: The MKJ40653802 in STB mode does not -# output all keys, the ones that are not -# mapped do not work in STB mode (remote simply -# doesn't output anything when pressing the keys) -# - -begin remote - - name MKJ40653802-TV - bits 16 - flags SPACE_ENC|CONST_LENGTH - eps 30 - aeps 100 - - header 9061 4473 - one 591 1660 - zero 591 521 - ptrail 590 - pre_data_bits 16 - pre_data 0x20DF - gap 108029 - toggle_bit_mask 0x0 - - begin codes - KEY_POWER 0x10EF # Was: power - input 0xD02F - tv/radio 0x0FF0 - q.menu 0xA25D - KEY_MENU 0xC23D # Was: menu - KEY_INFO 0xD52A # Was: guide - KEY_UP 0x02FD # Was: up - KEY_LEFT 0xE01F # Was: left - KEY_RIGHT 0x609F # Was: right - KEY_DOWN 0x827D # Was: down - KEY_OK 0x22DD # Was: ok - KEY_EXIT 0x14EB # Was: return/exit - KEY_INFO 0x55AA # Was: info - av_mode 0x0CF3 - KEY_VOLUMEUP 0x40BF # Was: vol_up - KEY_VOLUMEDOWN 0xC03F # Was: vol_down - mark/fav 0x7887 - KEY_MUTE 0x906F # Was: mute - KEY_PAGEUP 0x00FF # Was: page_up - KEY_PAGEDOWN 0x807F # Was: page_down - KEY_1 0x8877 # Was: 1 - KEY_2 0x48B7 # Was: 2 - KEY_3 0xC837 # Was: 3 - KEY_4 0x28D7 # Was: 4 - KEY_5 0xA857 # Was: 5 - KEY_6 0x6897 # Was: 6 - KEY_7 0xE817 # Was: 7 - KEY_8 0x18E7 # Was: 8 - KEY_9 0x9867 # Was: 9 - KEY_0 0x08F7 # Was: 0 - KEY_LIST 0xCA35 # Was: list - q.view 0x58A7 - KEY_RED 0x4EB1 # Was: red - green/stop 0x8E71 - yellow/play 0xC639 - blue/pause 0x8679 - KEY_TEXT 0x04FB # Was: text - t.opt/rev 0x847B - KEY_SUBTITLE 0x9C63 # Was: subtitle/ffw - KEY_RECORD 0xBD42 # Was: rec - simplink 0x7E81 - end codes - -end remote - -begin remote - - name MKJ40653802-STB - bits 16 - flags SPACE_ENC|CONST_LENGTH - eps 30 - aeps 100 - - header 9062 4467 - one 589 1662 - zero 589 522 - ptrail 587 - pre_data_bits 16 - pre_data 0xEF10 - gap 107967 - toggle_bit_mask 0x0 - - begin codes - input 0xD02F - KEY_POWER 0x10EF # Was: power - KEY_MENU 0xC23D # Was: menu - KEY_UP 0x02FD # Was: up - KEY_DOWN 0x827D # Was: down - KEY_RIGHT 0x609F # Was: right - KEY_LEFT 0xE01F # Was: left - KEY_OK 0x22DD # Was: ok - KEY_1 0x8877 # Was: 1 - KEY_2 0x48B7 # Was: 2 - KEY_3 0xC837 # Was: 3 - KEY_4 0x28D7 # Was: 4 - KEY_5 0xA857 # Was: 5 - KEY_6 0x6897 # Was: 6 - KEY_7 0xE817 # Was: 7 - KEY_8 0x18E7 # Was: 8 - KEY_9 0x9867 # Was: 9 - KEY_0 0x08F7 # Was: 0 - KEY_VOLUMEUP 0x40BF # Was: vol_up - KEY_VOLUMEDOWN 0xC03F # Was: vol_down - KEY_MUTE 0x906F # Was: mute - KEY_PAGEUP 0x00FF # Was: page_up - KEY_PAGEDOWN 0x807F # Was: page_down - end codes - -end remote diff --git a/config/lirc.conf.odroidc2 b/config/lirc.conf.odroidc2 deleted file mode 100644 index 62237988d5..0000000000 --- a/config/lirc.conf.odroidc2 +++ /dev/null @@ -1,13 +0,0 @@ -# -# Default remote controller for Armbian -# -# HardKenrel IR Remote -# - -begin remote - - name lircd.conf - bits 16 - flags SPACE_ENC|CONST_LENGTH - eps 30 - aeps 100 \ No newline at end of file diff --git a/config/sources/cubox.conf b/config/sources/cubox.conf index 6f37c48d65..3dbaed8122 100644 --- a/config/sources/cubox.conf +++ b/config/sources/cubox.conf @@ -60,10 +60,6 @@ fi family_tweaks() { - # default lirc configuration - sed -e 's/DEVICE=""/DEVICE="\/dev\/lirc0"/g' -i $SDCARD/etc/lirc/hardware.conf - sed -e 's/DRIVER="UNCONFIGURED"/DRIVER="default"/g' -i $SDCARD/etc/lirc/hardware.conf - cp $SRC/config/lirc.conf.cubox-i $SDCARD/etc/lirc/lircd.conf # TODO: Fix the workaround in firstrun? #chroot $SDCARD /bin/bash -c "LC_ALL=C LANG=C update-rc.d brcm4330-patch defaults > /dev/null" } diff --git a/config/sources/meson64.conf b/config/sources/meson64.conf index 9951555ab3..087ea4de61 100644 --- a/config/sources/meson64.conf +++ b/config/sources/meson64.conf @@ -47,11 +47,6 @@ write_uboot_platform() family_tweaks() { - sed -i 's/MODULES=.*/MODULES="meson-ir"/' $SDCARD/etc/lirc/hardware.conf - sed -i 's/LOAD_MODULES=.*/LOAD_MODULES="true"/' $SDCARD/etc/lirc/hardware.conf - sed -i 's/DEVICE=.*/DEVICE="\/dev\/lirc0"/' $SDCARD/etc/lirc/hardware.conf - sed -i 's/LIRCD_ARGS=.*/LIRCD_ARGS="--uinput"/' $SDCARD/etc/lirc/hardware.conf - cp $SRC/config/lirc.conf.odroidc2 $SDCARD/etc/lirc/lircd.conf echo "#Allow ttyAML0 root" >> $SDCARD/etc/securetty echo "ttyAML0" >> $SDCARD/etc/securetty diff --git a/config/sources/mvebu.conf b/config/sources/mvebu.conf index 6aded8d72a..c029cdfc8d 100644 --- a/config/sources/mvebu.conf +++ b/config/sources/mvebu.conf @@ -40,5 +40,5 @@ write_uboot_platform() family_tweaks() { - chroot $SDCARD /bin/bash -c "apt-get -y -qq remove --auto-remove lirc linux-sound-base alsa-base alsa-utils bluez>/dev/null 2>&1" + chroot $SDCARD /bin/bash -c "apt-get -y -qq remove --auto-remove linux-sound-base alsa-base alsa-utils bluez>/dev/null 2>&1" } diff --git a/config/sources/mvebu64.conf b/config/sources/mvebu64.conf index df310fb04e..42bab893a7 100644 --- a/config/sources/mvebu64.conf +++ b/config/sources/mvebu64.conf @@ -52,7 +52,7 @@ write_uboot_platform() family_tweaks() { - chroot $SDCARD /bin/bash -c "apt-get -y -qq remove --auto-remove lirc linux-sound-base alsa-base alsa-utils bluez>/dev/null 2>&1" + chroot $SDCARD /bin/bash -c "apt-get -y -qq remove --auto-remove linux-sound-base alsa-base alsa-utils bluez>/dev/null 2>&1" ln -sf interfaces.espressobin $SDCARD/etc/network/interfaces echo "#Marvell Espressobin Console" >> $SDCARD/etc/securetty echo "ttyMV0" >> $SDCARD/etc/securetty diff --git a/config/sources/odroidc2.conf b/config/sources/odroidc2.conf index f7c7848c62..e0a8741b27 100644 --- a/config/sources/odroidc2.conf +++ b/config/sources/odroidc2.conf @@ -59,12 +59,6 @@ family_tweaks() echo "#Odroid serial console allow root" >> $SDCARD/etc/securetty echo "ttyAML0" >> $SDCARD/etc/securetty - sed -i 's/MODULES=.*/MODULES="meson-ir"/' $SDCARD/etc/lirc/hardware.conf - sed -i 's/LOAD_MODULES=.*/LOAD_MODULES="true"/' $SDCARD/etc/lirc/hardware.conf - sed -i 's/DEVICE=.*/DEVICE="\/dev\/lirc0"/' $SDCARD/etc/lirc/hardware.conf - sed -i 's/LIRCD_ARGS=.*/LIRCD_ARGS="--uinput"/' $SDCARD/etc/lirc/hardware.conf - cp $SRC/config/lirc.conf.odroidc2 $SDCARD/etc/lirc/lircd.conf - # enable service installed from BSP chroot $SDCARD /bin/bash -c "systemctl --no-reload enable odroid-c2-hdmi.service >/dev/null 2>&1" } diff --git a/config/sources/odroidxu4.conf b/config/sources/odroidxu4.conf index 2eabe57388..a6cb12fd01 100644 --- a/config/sources/odroidxu4.conf +++ b/config/sources/odroidxu4.conf @@ -109,7 +109,6 @@ write_uboot_platform() family_tweaks() { echo "blacklist ina231_sensor" > $SDCARD/etc/modprobe.d/blacklist-odroid.conf - chroot $SDCARD /bin/bash -c "apt-get -y -qq remove --auto-remove lirc >/dev/null 2>&1" echo "#Serial console allow root" >> $SDCARD/etc/securetty echo "ttySAC2" >> $SDCARD/etc/securetty } diff --git a/config/sources/sun4i.conf b/config/sources/sun4i.conf index 43a7a39732..0cdd70ef23 100644 --- a/config/sources/sun4i.conf +++ b/config/sources/sun4i.conf @@ -19,17 +19,3 @@ esac CPUMIN=240000 CPUMAX=912000 - -family_tweaks() -{ - # TODO: replace with udev rule - # default lirc configuration - sed -i '1i sed -i \x27s/DEVICE="\\/dev\\/input.*/DEVICE="\\/dev\\/input\\/\x27$str\x27"/g\x27 /etc/lirc/hardware.conf' \ - $SDCARD/etc/lirc/hardware.conf - sed -i '1i str=$(cat /proc/bus/input/devices | grep "H: Handlers=sysrq rfkill kbd event" | awk \x27{print $(NF)}\x27)' \ - $SDCARD/etc/lirc/hardware.conf - sed -i '1i # Cubietruck automatic lirc device detection by Igor Pecovnik' $SDCARD/etc/lirc/hardware.conf - sed -e 's/DEVICE=""/DEVICE="\/dev\/input\/event1"/g' -i $SDCARD/etc/lirc/hardware.conf - sed -e 's/DRIVER="UNCONFIGURED"/DRIVER="devinput"/g' -i $SDCARD/etc/lirc/hardware.conf - cp $SRC/config/lirc.conf.cubietruck $SDCARD/etc/lirc/lircd.conf -} diff --git a/config/sources/sun7i.conf b/config/sources/sun7i.conf index 306adfd2cf..c13900f458 100644 --- a/config/sources/sun7i.conf +++ b/config/sources/sun7i.conf @@ -28,19 +28,3 @@ case $BRANCH in esac CPUMIN=480000 - -family_tweaks() -{ - if [[ "${RELEASE}" != "stretch" ]]; then - # TODO: replace with udev rule - # default lirc configuration - sed -i '1i sed -i \x27s/DEVICE="\\/dev\\/input.*/DEVICE="\\/dev\\/input\\/\x27$str\x27"/g\x27 /etc/lirc/hardware.conf' \ - $SDCARD/etc/lirc/hardware.conf - sed -i '1i str=$(cat /proc/bus/input/devices | grep "H: Handlers=sysrq rfkill kbd event" | awk \x27{print $(NF)}\x27)' \ - $SDCARD/etc/lirc/hardware.conf - sed -i '1i # Cubietruck automatic lirc device detection by Igor Pecovnik' $SDCARD/etc/lirc/hardware.conf - sed -e 's/DEVICE=""/DEVICE="\/dev\/input\/event1"/g' -i $SDCARD/etc/lirc/hardware.conf - sed -e 's/DRIVER="UNCONFIGURED"/DRIVER="devinput"/g' -i $SDCARD/etc/lirc/hardware.conf - cp $SRC/config/lirc.conf.cubietruck $SDCARD/etc/lirc/lircd.conf - fi -} diff --git a/config/sources/sun8i.conf b/config/sources/sun8i.conf index 504261a7b0..4c0a3b066a 100644 --- a/config/sources/sun8i.conf +++ b/config/sources/sun8i.conf @@ -30,20 +30,15 @@ esac family_tweaks() { - # this is for legacy kernel only - sed -e 's/DEVICE=""/DEVICE="\/dev\/lirc0"/g' -i $SDCARD/etc/lirc/hardware.conf - sed -e 's/MODULES=""/MODULES="sunxi_cir"/g' -i $SDCARD/etc/lirc/hardware.conf - sed -e 's/DRIVER="UNCONFIGURED"/DRIVER="default"/g' -i $SDCARD/etc/lirc/hardware.conf - cp $SRC/config/lirc.conf.cubietruck $SDCARD/etc/lirc/lircd.conf # enable serial gadget on OTG port since the board doesn't have Ethernet case ${BOARD} in orangepilite|nanopiair|orangepizero*) mkdir -p $SDCARD/etc/systemd/system/serial-getty@ttyGS0.service.d if [[ $BRANCH == default ]]; then - cat <<-EOF > $SDCARD/etc/systemd/system/serial-getty@ttyGS0.service.d/10-switch-role.conf - [Service] - ExecStartPre=-/bin/sh -c "echo 2 > /sys/bus/platform/devices/sunxi_usb_udc/otg_role" - EOF + cat <<-EOF > $SDCARD/etc/systemd/system/serial-getty@ttyGS0.service.d/10-switch-role.conf + [Service] + ExecStartPre=-/bin/sh -c "echo 2 > /sys/bus/platform/devices/sunxi_usb_udc/otg_role" + EOF fi chroot $SDCARD /bin/bash -c "systemctl --no-reload enable serial-getty@ttyGS0.service > /dev/null" echo "ttyGS0" >> $SDCARD/etc/securetty diff --git a/config/sources/udoo-neo.conf b/config/sources/udoo-neo.conf index 27cd1fce4a..7c3c5f2858 100644 --- a/config/sources/udoo-neo.conf +++ b/config/sources/udoo-neo.conf @@ -44,7 +44,6 @@ write_uboot_platform() family_tweaks() { - chroot $SDCARD /bin/bash -c "apt-get -y -qq remove --auto-remove lirc >/dev/null 2>&1" sed 's/wlan0/wlan2/' -i $SDCARD/etc/network/interfaces.default sed 's/wlan0/wlan2/' -i $SDCARD/etc/network/interfaces.bonding sed 's/wlan0/wlan2/' -i $SDCARD/etc/network/interfaces.hostapd diff --git a/config/sources/udoo.conf b/config/sources/udoo.conf index 3965f206b9..b3f6899e54 100644 --- a/config/sources/udoo.conf +++ b/config/sources/udoo.conf @@ -49,7 +49,6 @@ write_uboot_platform() family_tweaks() { - chroot $SDCARD /bin/bash -c "apt-get -y -qq remove --auto-remove lirc >/dev/null 2>&1" sed 's/wlan0/wlan2/' -i $SDCARD/etc/network/interfaces.default sed 's/wlan0/wlan2/' -i $SDCARD/etc/network/interfaces.bonding sed 's/wlan0/wlan2/' -i $SDCARD/etc/network/interfaces.hostapd