Gentoo Archives: gentoo-releng

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-releng@l.g.o
Cc: Georgy Yakovlev <gyakovlev@g.o>
Subject: [gentoo-releng] [PATCH 1/2] remove special mouse handling and pre-gpm script
Date: Thu, 05 Nov 2020 03:15:57
Message-Id: 20201105031514.2527566-1-gyakovlev@gentoo.org
1 nowadays mice are available via /dev/input/mice, which
2 gpm defaults to open at startup.
3
4 INPUT_MOUSEDEV description:
5 Say Y here if you want your mouse to be accessible as char devices
6 13:32+ - /dev/input/mouseX and 13:63 - /dev/input/mice as an emulated
7 IntelliMouse Explorer PS/2 mouse. That way, all user space programs
8 (including SVGAlib, GPM and X) will be able to use your mouse.
9
10 The data available through /dev/psaux is exactly the same as the data
11 from /dev/input/mice.
12
13 Signed-off-by: Georgy Yakovlev <gyakovlev@g.o>
14 ---
15 init.d/autoconfig | 9 ---------
16 init.d/gpm-pre | 33 ---------------------------------
17 2 files changed, 42 deletions(-)
18 delete mode 100644 init.d/gpm-pre
19
20 diff --git a/init.d/autoconfig b/init.d/autoconfig
21 index 9bc3a38..f541a0c 100644
22 --- a/init.d/autoconfig
23 +++ b/init.d/autoconfig
24 @@ -232,7 +232,6 @@ list_services() {
25 then
26 echo hwsetup
27 fi
28 - svcs="${svcs} $(check_svc ${GPM} gpm-pre)"
29 svcs="${svcs} $(check_svc ${GPM} gpm)"
30 svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
31 svcs="${svcs} $(check_svc ${NFS} nfsclient)"
32 @@ -522,14 +521,6 @@ start() {
33 # Read in what hwsetup has found
34 [ -f /etc/sysconfig/gentoo ] && source /etc/sysconfig/gentoo
35
36 - # Mouse
37 - # FIXME: If MOUSE_DEVICE is empty, we actually do not want to do anything, not even start gpm.
38 - if [ -n "${MOUSE_DEVICE}" ]
39 - then
40 - :
41 - # Migrated to autoconfig-gpm-pre
42 - fi
43 -
44 if yesno "${DETECT}"
45 then
46 NETDEVICES="$(detect_netdevices)"
47 diff --git a/init.d/gpm-pre b/init.d/gpm-pre
48 deleted file mode 100644
49 index a03e881..0000000
50 --- a/init.d/gpm-pre
51 +++ /dev/null
52 @@ -1,33 +0,0 @@
53 -#!/sbin/openrc-run
54 -# Copyright 1999-2011 Gentoo Foundation
55 -# Distributed under the terms of the GNU General Public License v2
56 -# $Header: $
57 -
58 -depend() {
59 - before gpm
60 - need hwsetup
61 -}
62 -
63 -start() {
64 - [ -f /etc/sysconfig/gentoo ] && source /etc/sysconfig/gentoo
65 - [ -f /etc/sysconfig/mouse ] && source /etc/sysconfig/mouse
66 - if [ -z "${MOUSE_DEVICE}" ]; then
67 - ewarn "No mouse detected. GPM will not be started."
68 - return 0
69 - fi
70 - einfo "Mouse is ${HILITE}${MOUSE_FULLNAME}${NORMAL} at ${HILITE}${MOUSE_DEVICE}${NORMAL} ..."
71 -
72 - if [ $(grep "#MOUSE=${MOUSETYPE}" /etc/conf.d/gpm) ]; then
73 - sed -i "\@MOUSE=${MOUSETYPE}@s@^#@@" /etc/conf.d/gpm
74 - else
75 - echo "MOUSE=${MOUSETYPE}" >>/etc/conf.d/gpm
76 - fi
77 -
78 - if [ $(grep "#MOUSEDEV=${DEVICE}" /etc/conf.d/gpm) ]; then
79 - sed -i "\@MOUSEDEV=${DEVICE}@s@^#@@" /etc/conf.d/gpm
80 - else
81 - echo "MOUSEDEV=${DEVICE}" >>/etc/conf.d/gpm
82 - fi
83 -}
84 -
85 -# vim: ft=gentoo-init-d:
86 --
87 2.29.2

Replies