d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgbase: Create a FreeBSD-console-tools package

Browse Source 
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
This commit is contained in:
Emmanuel Vadot 2023-02-01 10:35:56 +01:00
parent 2878e21ff1
commit cab549c76c
10 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libexec/rc/rc.d/Makefile
View File

@ -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"

2
release/packages/Makefile.package
View File

@ -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

5
sbin/devd/Makefile
View File

@ -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}

46
sbin/devd/devd.conf
View File

@ -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

35
sbin/devd/moused.conf Normal file
View File

@ -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";
};

9
sbin/devd/syscons.conf Normal file
View File

@ -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";
};

1
usr.sbin/kbdcontrol/Makefile
View File

@ -1,5 +1,6 @@
# $FreeBSD$
PACKAGE= console-tools
PROG= kbdcontrol
MAN= kbdcontrol.1 kbdmap.5
MLINKS= kbdmap.5 keymap.5

1
usr.sbin/kbdmap/Makefile
View File

@ -1,5 +1,6 @@
# $FreeBSD$
PACKAGE= console-tools
PROG= kbdmap
CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib
LIBADD= bsddialog

1
usr.sbin/moused/Makefile
View File

@ -1,5 +1,6 @@
# $FreeBSD$
PACKAGE= console-tools
PROG= moused
MAN= moused.8

1
usr.sbin/vidcontrol/Makefile
View File

@ -1,5 +1,6 @@
# $FreeBSD$
PACKAGE= console-tools
PROG= vidcontrol
SRCS= vidcontrol.c decode.c