[gentoo-releng] [PATCH 1/2] remove special mouse handling and pre-gpm script

[gentoo-releng] [PATCH 1/2] remove special mouse handling and pre-gpm script

[Georgy Yakovlev]

nowadays mice are available via /dev/input/mice, which
gpm defaults to open at startup.

 INPUT_MOUSEDEV description:
   Say Y here if you want your mouse to be accessible as char devices
   13:32+ - /dev/input/mouseX and 13:63 - /dev/input/mice as an emulated
   IntelliMouse Explorer PS/2 mouse. That way, all user space programs
   (including SVGAlib, GPM and X) will be able to use your mouse.

The data available through /dev/psaux is exactly the same as the data
from /dev/input/mice.

Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---
 init.d/autoconfig |  9 ---------
 init.d/gpm-pre    | 33 ---------------------------------
 2 files changed, 42 deletions(-)
 delete mode 100644 init.d/gpm-pre

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 9bc3a38..f541a0c 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -232,7 +232,6 @@ list_services() {
 	then
 		echo hwsetup
 	fi
-	svcs="${svcs} $(check_svc ${GPM} gpm-pre)"
 	svcs="${svcs} $(check_svc ${GPM} gpm)"
 	svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
 	svcs="${svcs} $(check_svc ${NFS} nfsclient)"
@@ -522,14 +521,6 @@ start() {
 	# Read in what hwsetup has found
 	[ -f /etc/sysconfig/gentoo ] && source /etc/sysconfig/gentoo
 
-	# Mouse
-	# FIXME: If MOUSE_DEVICE is empty, we actually do not want to do anything, not even start gpm.
-	if [ -n "${MOUSE_DEVICE}" ]
-	then
-		:
-		# Migrated to autoconfig-gpm-pre
-	fi
-
 	if yesno "${DETECT}"
 	then
 		NETDEVICES="$(detect_netdevices)"
diff --git a/init.d/gpm-pre b/init.d/gpm-pre
deleted file mode 100644
index a03e881..0000000
--- a/init.d/gpm-pre
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-depend() {
-	before gpm
-	need hwsetup
-}
-
-start() {
-	[ -f /etc/sysconfig/gentoo ] && source /etc/sysconfig/gentoo
-	[ -f /etc/sysconfig/mouse ] && source /etc/sysconfig/mouse
-	if [ -z "${MOUSE_DEVICE}" ]; then
-		ewarn "No mouse detected. GPM will not be started."
-		return 0
-	fi
-	einfo "Mouse is ${HILITE}${MOUSE_FULLNAME}${NORMAL} at ${HILITE}${MOUSE_DEVICE}${NORMAL} ..."
-
-	if [ $(grep "#MOUSE=${MOUSETYPE}" /etc/conf.d/gpm) ]; then
-		sed -i "\@MOUSE=${MOUSETYPE}@s@^#@@" /etc/conf.d/gpm
-	else
-		echo "MOUSE=${MOUSETYPE}" >>/etc/conf.d/gpm
-	fi
-
-	if [ $(grep "#MOUSEDEV=${DEVICE}" /etc/conf.d/gpm) ]; then
-		sed -i "\@MOUSEDEV=${DEVICE}@s@^#@@" /etc/conf.d/gpm
-	else
-		echo "MOUSEDEV=${DEVICE}" >>/etc/conf.d/gpm
-	fi
-}
-
-# vim: ft=gentoo-init-d:
-- 
2.29.2

[gentoo-releng] [PATCH 2/2] remove hwsetup usage

[Georgy Yakovlev]

it requires beyound ancient libkudzu and mostly obsoleted by udev.
also libkudzu no longer builds on stable glibc-2.32

https://bugs.gentoo.org/713946
Bug: https://bugs.gentoo.org/408535
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---
 init.d/autoconfig | 24 ++----------------------
 init.d/hwsetup    | 11 -----------
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 init.d/hwsetup

diff --git a/init.d/autoconfig b/init.d/autoconfig
index f541a0c..1dbfc5a 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -228,10 +228,6 @@ list_services() {
 	svcs="${svcs} $(check_svc ${APM} apmd)"
 	svcs="${svcs} $(check_svc ${BRLTTY} brltty)"
 	svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)"
-	if yesno "$COLDPLUG" && ! rc-service -e coldplug && ! rc-service -e hotplug
-	then
-		echo hwsetup
-	fi
 	svcs="${svcs} $(check_svc ${GPM} gpm)"
 	svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
 	svcs="${svcs} $(check_svc ${NFS} nfsclient)"
@@ -518,9 +514,6 @@ start() {
 		ewarn "Skipping DHCP broadcast ..."
 	fi
 
-	# Read in what hwsetup has found
-	[ -f /etc/sysconfig/gentoo ] && source /etc/sysconfig/gentoo
-
 	if yesno "${DETECT}"
 	then
 		NETDEVICES="$(detect_netdevices)"
@@ -559,24 +552,11 @@ start() {
 		ewarn "No Network device auto detected ..."
 	fi
 
-	if yesno "${ALSA}"
+	if ! yesno "${ALSA}"
 	then
-		if [ -n "${SOUND_FULLNAME}" -o -n "${SOUND_DRIVER}" ]
-		then
-			einfo "Soundcard:  "
-
-			[ -n "${SOUND_FULLNAME}" ] \
-				&& einfo "              ${WARN}${SOUND_FULLNAME}  "
-			[ -n "${SOUND_DRIVER}" ] \
-				&& einfo "              driver = ${SOUND_DRIVER}"
-		fi
-	else
-		ewarn "Skipping ALSA detection as requested on command line ..."
+		ewarn "Skipping ALSA services as requested on command line ..."
 	fi
 
-	[ -n "${XDESC}" ] && einfo "VideoCard:   ${HILITE}${XDESC}${NORMAL}"
-
-	killall hwsetup 2>/dev/null
 	echo "6" > /proc/sys/kernel/printk
 
 	if ! yesno "${X11}"
diff --git a/init.d/hwsetup b/init.d/hwsetup
deleted file mode 100644
index 16ee967..0000000
--- a/init.d/hwsetup
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-start() {
-	ebegin "Starting hwsetup"
-	[ -e /etc/sysconfig ] || mkdir -p /etc/sysconfig
-	[ -x /usr/sbin/hwsetup ] && hwsetup
-	eend $?
-}
-- 
2.29.2

[gentoo-releng] [PATCH] autoconfig: don't autostart gpm if /dev/input/mice is not present

[Georgy Yakovlev]

Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---
 init.d/autoconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 1dbfc5a..15900c2 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -228,7 +228,10 @@ list_services() {
 	svcs="${svcs} $(check_svc ${APM} apmd)"
 	svcs="${svcs} $(check_svc ${BRLTTY} brltty)"
 	svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)"
-	svcs="${svcs} $(check_svc ${GPM} gpm)"
+	if [ -c /dev/input/mice ]
+	then
+		svcs="${svcs} $(check_svc ${GPM} gpm)"
+	fi
 	svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
 	svcs="${svcs} $(check_svc ${NFS} nfsclient)"
 	svcs="${svcs} $(check_svc ${PASSWD} pwgen)"
-- 
2.29.2