From nobody Wed Feb 8 07:54:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PBXMQ6HcLz3ks2p; Wed, 8 Feb 2023 07:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PBXMQ4jCgz3jfy; Wed, 8 Feb 2023 07:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675842866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MBK0N3SKT5JiLmr4d+yMDIxNDca90I4C6Iy+YiA5Xtc=; b=b8kA8ZmwJeGHeuiOcXMvVpcCapfVtjsgi2+KumHvCgiHIRfHbQj8Z5PkQla5WCTsV4tVTu jXXqPyNGgwAq8eb+A2keyitIyc1V6ElYxkL4JtzcWNPY7xYeDBy2s2fSBI1SfpmrdQXzqQ KvdhEJCDjqxJVo28OrP6WuCqty0ktcl/+sJ+IcYKt9JEjLGP6/pQJPdqFJsekSWmFmrPh3 TTNhsT3mTzLIQDwjCMMdgClbB+gPr7M9RvKG4//yGbaEo+qcgY+TPhlBwRq5lMads06/Cx 0eS4Y1/BBVphvu6Fkdckxmwmscn77QMoVQ+VDXl58YvdkBPEE4AqYgGhzt+eEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675842866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MBK0N3SKT5JiLmr4d+yMDIxNDca90I4C6Iy+YiA5Xtc=; b=C10Exz7NGENP5MR05DAE08OzbbG+ZveuA4rDgQAGKQbX88AC6Qej7gZJ+/CV/a4sJalIgC mlhQqf2U9cPd2UgXzTwY5rNQCfmZeOB295MfMqCo1XSgOfT0kmQYeQTXSNJvaO/tNO2XXt FZdijaETxoQ6ckkAuk/gbMv4zag//FiT2gXDTNWKrjFR/z4SJZ6y0IV3a874YQRkSUkC3E ECvdtzxv6Jwy6yeOAgzOaEID3FmVxLkj+Ddt5c6O0jI3xWZZS2rbF1KE9uGhbqels2ItI2 1MY3g2/+9I9Qiq6iyaaYW/pN/NjEHCBpjnOlYNx1UlWTR5lv9u8CmCkD7CD/zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675842866; a=rsa-sha256; cv=none; b=gAMjEvlJQPYpKF6KvO5j4lWojxs/otjwczmaudmZab6VXOl/Eowlqf3KzEaxw8EXtZFa66 7PxcYHUwlaJxLVhJKPSOqaV/yWbSqPCiCwja7RPyXtb/v3UvjYXTK8btIqmv0haJEXnI6o Z1tKB1c/WyVZPPvKOLXG9OaE6v3aUuCL1bpajFFQArrVR9HpvOga18YDGOrn17ryFdhzBo KsTYMK5ybeClduGPcTVgUcbcmFYTHTJFcewUd+97u74uv99gpYKtBbvCqG3uvaoeT1t2c0 c8CJaZewwmFkPyaSZixITJMBkosymhilRgzCrK6tZ7yOdkX6yMxdEZsRzoJXrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PBXMQ3SmYzpqY; Wed, 8 Feb 2023 07:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3187sQoC038295; Wed, 8 Feb 2023 07:54:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3187sQgj038294; Wed, 8 Feb 2023 07:54:26 GMT (envelope-from git) Date: Wed, 8 Feb 2023 07:54:26 GMT Message-Id: <202302080754.3187sQgj038294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: cab549c76c88 - main - pkgbase: Create a FreeBSD-console-tools package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cab549c76c8822be2850f048a2f80d5a174f5910 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=cab549c76c8822be2850f048a2f80d5a174f5910 commit cab549c76c8822be2850f048a2f80d5a174f5910 Author: Emmanuel Vadot AuthorDate: 2023-02-01 09:35:56 +0000 Commit: Emmanuel Vadot CommitDate: 2023-02-08 07:52:40 +0000 pkgbase: Create a FreeBSD-console-tools package And put in it: - kbdcontrol - vidcontrol - moused - kbdmap Those aren't useful in a jail or for a modern desktop. While here, split the devd.conf part into some new files. Reviewed by: bapt Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38321 --- libexec/rc/rc.d/Makefile | 6 +++-- release/packages/Makefile.package | 2 ++ sbin/devd/Makefile | 5 +++++ sbin/devd/devd.conf | 46 --------------------------------------- sbin/devd/moused.conf | 35 +++++++++++++++++++++++++++++ sbin/devd/syscons.conf | 9 ++++++++ usr.sbin/kbdcontrol/Makefile | 1 + usr.sbin/kbdmap/Makefile | 1 + usr.sbin/moused/Makefile | 1 + usr.sbin/vidcontrol/Makefile | 1 + 10 files changed, 59 insertions(+), 48 deletions(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 56ee41a8316d..e2019c60f196 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -252,8 +252,10 @@ JAILPACKAGE= jail .endif .if ${MK_LEGACY_CONSOLE} != "no" -CONFS+= moused -CONFS+= syscons +CONFGROUPS+= CONSOLE +CONSOLE+= moused +CONSOLE+= syscons +CONSOLEPACKAGE= console-tools .endif .if ${MK_LPR} != "no" diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index 26e1f7e2a14d..47e0ee1c224b 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -30,6 +30,8 @@ clang_COMMENT= Clang Utilities clang_DESC= Clang Utilities clibs_COMMENT= Core C Libraries clibs_DESC= Core C Libraries +console-tools_COMMENT= Console Utilities +console-tools_DESC= Console Utilities csh_COMMENT= C Shell csh_DESC= C Shell ctf-tools_COMMENT= CTF Utilities diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile index 72c65caa3317..d3b910b2e9ec 100644 --- a/sbin/devd/Makefile +++ b/sbin/devd/Makefile @@ -22,6 +22,11 @@ POWERPROFILEDIR= ${DEVDDIR} POWERPROFILE+= power_profile.conf POWERPROFILEPACKAGE= acpi +CONFGROUPS+= CONSOLE +CONSOLEDIR= ${DEVDDIR} +CONSOLE+= moused.conf syscons.conf +CONSOLEPACKAGE= console-tools + .if ${MK_BLUETOOTH} != "no" CONFGROUPS+= BLUETOOTH BLUETOOTHDIR= ${DEVDDIR} diff --git a/sbin/devd/devd.conf b/sbin/devd/devd.conf index d30f97c7abb0..9604fe8efc05 100644 --- a/sbin/devd/devd.conf +++ b/sbin/devd/devd.conf @@ -76,52 +76,6 @@ detach 100 { # action "sleep 2 && /usr/sbin/ath3kfw -d $device-name -f /usr/local/etc/ath3k-1.fw"; #}; -# When a USB keyboard arrives, attach it as the console keyboard. -attach 100 { - device-name "ukbd0"; - action "service syscons setkeyboard /dev/ukbd0"; -}; -detach 100 { - device-name "ukbd0"; - action "service syscons setkeyboard /dev/kbd0"; -}; - -notify 100 { - match "system" "DEVFS"; - match "subsystem" "CDEV"; - match "type" "CREATE"; - match "cdev" "atp[0-9]+"; - - action "service moused quietstart $cdev"; -}; - -notify 100 { - match "system" "DEVFS"; - match "subsystem" "CDEV"; - match "type" "CREATE"; - match "cdev" "ums[0-9]+"; - - action "service moused quietstart $cdev"; -}; - -notify 100 { - match "system" "DEVFS"; - match "subsystem" "CDEV"; - match "type" "CREATE"; - match "cdev" "wsp[0-9]+"; - - action "service moused quietstart $cdev"; -}; - -notify 100 { - match "system" "DEVFS"; - match "subsystem" "CDEV"; - match "type" "DESTROY"; - match "cdev" "ums[0-9]+"; - - action "service moused stop $cdev"; -}; - # Don't even try to second guess what to do about drivers that don't # match here. Instead, pass it off to syslog. Commented out for the # moment, as the pnpinfo variable isn't set in devd yet. Individual diff --git a/sbin/devd/moused.conf b/sbin/devd/moused.conf new file mode 100644 index 000000000000..002edad9a8a9 --- /dev/null +++ b/sbin/devd/moused.conf @@ -0,0 +1,35 @@ +notify 100 { + match "system" "DEVFS"; + match "subsystem" "CDEV"; + match "type" "CREATE"; + match "cdev" "atp[0-9]+"; + + action "service moused quietstart $cdev"; +}; + +notify 100 { + match "system" "DEVFS"; + match "subsystem" "CDEV"; + match "type" "CREATE"; + match "cdev" "ums[0-9]+"; + + action "service moused quietstart $cdev"; +}; + +notify 100 { + match "system" "DEVFS"; + match "subsystem" "CDEV"; + match "type" "CREATE"; + match "cdev" "wsp[0-9]+"; + + action "service moused quietstart $cdev"; +}; + +notify 100 { + match "system" "DEVFS"; + match "subsystem" "CDEV"; + match "type" "DESTROY"; + match "cdev" "ums[0-9]+"; + + action "service moused stop $cdev"; +}; diff --git a/sbin/devd/syscons.conf b/sbin/devd/syscons.conf new file mode 100644 index 000000000000..cd0c744955b9 --- /dev/null +++ b/sbin/devd/syscons.conf @@ -0,0 +1,9 @@ +# When a USB keyboard arrives, attach it as the console keyboard. +attach 100 { + device-name "ukbd0"; + action "service syscons setkeyboard /dev/ukbd0"; +}; +detach 100 { + device-name "ukbd0"; + action "service syscons setkeyboard /dev/kbd0"; +}; diff --git a/usr.sbin/kbdcontrol/Makefile b/usr.sbin/kbdcontrol/Makefile index 5a15ef3c9da6..960671a40fe7 100644 --- a/usr.sbin/kbdcontrol/Makefile +++ b/usr.sbin/kbdcontrol/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE= console-tools PROG= kbdcontrol MAN= kbdcontrol.1 kbdmap.5 MLINKS= kbdmap.5 keymap.5 diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile index 22747e70720c..a4f3158aa167 100644 --- a/usr.sbin/kbdmap/Makefile +++ b/usr.sbin/kbdmap/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE= console-tools PROG= kbdmap CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib LIBADD= bsddialog diff --git a/usr.sbin/moused/Makefile b/usr.sbin/moused/Makefile index 0f9eac5b2417..e5d59e24be11 100644 --- a/usr.sbin/moused/Makefile +++ b/usr.sbin/moused/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE= console-tools PROG= moused MAN= moused.8 diff --git a/usr.sbin/vidcontrol/Makefile b/usr.sbin/vidcontrol/Makefile index 8c8f6bb804b2..a09b0733ba94 100644 --- a/usr.sbin/vidcontrol/Makefile +++ b/usr.sbin/vidcontrol/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE= console-tools PROG= vidcontrol SRCS= vidcontrol.c decode.c