sync

7 files changed, 140 insertions, 41 deletions

diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index 180eaca7f8a..56caf1b2d13 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.77 2021/01/23 05:08:33 thfr Exp 
-#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.78 2021/02/12 10:26:33 jsg Exp 
+#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -74,6 +74,7 @@
 #	bpf	Berkeley Packet Filter
 #	dt	Dynamic Tracer
 #	diskmap	Disk mapper
+#	dri	Direct Rendering Infrastructure
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -369,6 +370,19 @@ drm*)
 	M drmR$r c 87 $r 600
 	;;
 
+dri)
+	RMlist[${#RMlist[*]}]=";mkdir -p dri;rm -f"
+	n=0
+	while [ $n -lt 4 ]
+	do
+		M dri/card$n c 87 $n 600
+		r=$(($n+128))
+		M dri/renderD$r c 87 $r 600
+		n=$(($n+1))
+	done
+	MKlist[${#MKlist[*]}]=";chmod 555 dri"
+	;;
+
 diskmap)
 	M diskmap c 90 0 640 operator
 	;;
@@ -592,7 +606,7 @@ local)
 
 all)
 	R switch0 switch1 switch2 switch3 ipmi0 ttyVI00 ttyVI10
-	R ttyVI20 ttyVI30 ttyVI40 drm0 drm1 drm2 drm3 nvram gpio0
+	R ttyVI20 ttyVI30 ttyVI40 drm0 drm1 drm2 drm3 dri nvram gpio0
 	R gpio1 gpio2 bktr0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0
 	R tun1 tun2 tun3 bio pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G
diff --git a/etc/etc.arm64/MAKEDEV b/etc/etc.arm64/MAKEDEV
index 94186e832da..e0d6b99712d 100644
--- a/etc/etc.arm64/MAKEDEV
+++ b/etc/etc.arm64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.arm64/MAKEDEV.md,v 1.11 2021/01/23 05:08:33 thfr Exp 
-#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: etc.arm64/MAKEDEV.md,v 1.12 2021/02/12 10:26:34 jsg Exp 
+#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -68,6 +68,7 @@
 #	bpf	Berkeley Packet Filter
 #	dt	Dynamic Tracer
 #	diskmap	Disk mapper
+#	dri	Direct Rendering Infrastructure
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -329,6 +330,19 @@ drm*)
 	M drmR$r c 87 $r 600
 	;;
 
+dri)
+	RMlist[${#RMlist[*]}]=";mkdir -p dri;rm -f"
+	n=0
+	while [ $n -lt 4 ]
+	do
+		M dri/card$n c 87 $n 600
+		r=$(($n+128))
+		M dri/renderD$r c 87 $r 600
+		n=$(($n+1))
+	done
+	MKlist[${#MKlist[*]}]=";chmod 555 dri"
+	;;
+
 diskmap)
 	M diskmap c 90 0 640 operator
 	;;
@@ -501,14 +515,15 @@ local)
 
 all)
 	R switch0 switch1 switch2 switch3 ipmi0 drm0 drm1 drm2 drm3
-	R gpio0 gpio1 gpio2 bktr0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3
-	R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0
-	R tun1 tun2 tun3 bio pty0 diskmap vscsi0 ch0 audio0 audio1
-	R audio2 audio3 kstat dt bpf fuse pppac pppx hotplug ptm local
-	R wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3
-	R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0
-	R random tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08
-	R tty09 tty0a tty0b apm pf wd0 wd1 wd2 wd3 std fd
+	R dri gpio0 gpio1 gpio2 bktr0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2
+	R sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3
+	R tun0 tun1 tun2 tun3 bio pty0 diskmap vscsi0 ch0 audio0
+	R audio1 audio2 audio3 kstat dt bpf fuse pppac pppx hotplug
+	R ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1
+	R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0
+	R video0 video1 uk0 random tty00 tty01 tty02 tty03 tty04 tty05
+	R tty06 tty07 tty08 tty09 tty0a tty0b apm pf wd0 wd1 wd2 wd3
+	R std fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 71e81008dee..0bd74179e0b 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.i386/MAKEDEV.md,v 1.92 2021/01/23 05:08:33 thfr Exp 
-#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: etc.i386/MAKEDEV.md,v 1.93 2021/02/12 10:26:34 jsg Exp 
+#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -74,6 +74,7 @@
 #	bpf	Berkeley Packet Filter
 #	dt	Dynamic Tracer
 #	diskmap	Disk mapper
+#	dri	Direct Rendering Infrastructure
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -369,6 +370,19 @@ drm*)
 	M drmR$r c 88 $r 600
 	;;
 
+dri)
+	RMlist[${#RMlist[*]}]=";mkdir -p dri;rm -f"
+	n=0
+	while [ $n -lt 4 ]
+	do
+		M dri/card$n c 88 $n 600
+		r=$(($n+128))
+		M dri/renderD$r c 88 $r 600
+		n=$(($n+1))
+	done
+	MKlist[${#MKlist[*]}]=";chmod 555 dri"
+	;;
+
 diskmap)
 	M diskmap c 91 0 640 operator
 	;;
@@ -592,18 +606,18 @@ local)
 
 all)
 	R switch0 switch1 switch2 switch3 ipmi0 amdmsr drm0 drm1 drm2
-	R drm3 nvram gpio0 gpio1 gpio2 bktr0 vnd0 vnd1 vnd2 vnd3 sd0
-	R sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1
-	R tap2 tap3 tun0 tun1 tun2 tun3 bio pty0 fd1 fd1B fd1C fd1D
-	R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
-	R diskmap vscsi0 ch0 audio0 audio1 audio2 audio3 kstat dt kcov
-	R bpf pvbus0 pvbus1 fuse pppac pppx hotplug ptm local wscons
-	R pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
-	R rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker video0 video1 uk0
-	R random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01
-	R tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b
-	R ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm pf pctr
-	R wd0 wd1 wd2 wd3 std st0 st1 fd
+	R drm3 dri nvram gpio0 gpio1 gpio2 bktr0 vnd0 vnd1 vnd2 vnd3
+	R sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0
+	R tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0 fd1 fd1B fd1C
+	R fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G
+	R fd0H diskmap vscsi0 ch0 audio0 audio1 audio2 audio3 kstat dt
+	R kcov bpf pvbus0 pvbus1 fuse pppac pppx hotplug ptm local
+	R wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3
+	R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker video0
+	R video1 uk0 random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2
+	R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09
+	R tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7
+	R apm pf pctr wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.loongson/MAKEDEV b/etc/etc.loongson/MAKEDEV
index a47835f9ace..bbda1f1be76 100644
--- a/etc/etc.loongson/MAKEDEV
+++ b/etc/etc.loongson/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.loongson/MAKEDEV.md,v 1.33 2021/01/23 05:08:33 thfr Exp 
-#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: etc.loongson/MAKEDEV.md,v 1.34 2021/02/12 10:26:34 jsg Exp 
+#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -67,6 +67,7 @@
 #	bpf	Berkeley Packet Filter
 #	dt	Dynamic Tracer
 #	diskmap	Disk mapper
+#	dri	Direct Rendering Infrastructure
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -295,6 +296,19 @@ drm*)
 	M drmR$r c 87 $r 600
 	;;
 
+dri)
+	RMlist[${#RMlist[*]}]=";mkdir -p dri;rm -f"
+	n=0
+	while [ $n -lt 4 ]
+	do
+		M dri/card$n c 87 $n 600
+		r=$(($n+128))
+		M dri/renderD$r c 87 $r 600
+		n=$(($n+1))
+	done
+	MKlist[${#MKlist[*]}]=";chmod 555 dri"
+	;;
+
 diskmap)
 	M diskmap c 70 0 640 operator
 	;;
@@ -476,9 +490,9 @@ ramdisk)
 	;;
 
 all)
-	R drm0 drm1 drm2 drm3 switch0 switch1 switch2 switch3 vnd0
-	R vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0
-	R cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0
+	R drm0 drm1 drm2 drm3 dri switch0 switch1 switch2 switch3
+	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
+	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0
 	R pty1 pty2 diskmap vscsi0 audio0 audio1 audio2 audio3 kstat
 	R dt bpf fuse pppac pppx hotplug ptm local wscons pci0 pci1
 	R pci2 pci3 uall video0 video1 uk0 random tty00 tty01 tty02
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index 8c39dacd509..25b96110266 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.76 2021/01/23 05:08:33 thfr Exp 
-#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.77 2021/02/12 10:26:34 jsg Exp 
+#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -70,6 +70,7 @@
 #	bpf	Berkeley Packet Filter
 #	dt	Dynamic Tracer
 #	diskmap	Disk mapper
+#	dri	Direct Rendering Infrastructure
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -322,6 +323,19 @@ drm*)
 	M drmR$r c 87 $r 600
 	;;
 
+dri)
+	RMlist[${#RMlist[*]}]=";mkdir -p dri;rm -f"
+	n=0
+	while [ $n -lt 4 ]
+	do
+		M dri/card$n c 87 $n 600
+		r=$(($n+128))
+		M dri/renderD$r c 87 $r 600
+		n=$(($n+1))
+	done
+	MKlist[${#MKlist[*]}]=";chmod 555 dri"
+	;;
+
 diskmap)
 	M diskmap c 84 0 640 operator
 	;;
@@ -527,7 +541,7 @@ ramdisk)
 	;;
 
 all)
-	R switch0 switch1 switch2 switch3 drm0 drm1 drm2 drm3 bio
+	R switch0 switch1 switch2 switch3 drm0 drm1 drm2 drm3 dri bio
 	R gpio0 gpio1 gpio2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0
 	R tun1 tun2 tun3 pty0 diskmap vscsi0 ch0 cuaa cuab ttya ttyb
diff --git a/etc/etc.powerpc64/MAKEDEV b/etc/etc.powerpc64/MAKEDEV
index 415289ba054..a4c7382dae0 100644
--- a/etc/etc.powerpc64/MAKEDEV
+++ b/etc/etc.powerpc64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.powerpc64/MAKEDEV.md,v 1.7 2021/01/23 05:08:33 thfr Exp 
-#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: etc.powerpc64/MAKEDEV.md,v 1.8 2021/02/12 10:26:34 jsg Exp 
+#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -65,6 +65,7 @@
 #	bio	ioctl tunnel pseudo-device
 #	bpf	Berkeley Packet Filter
 #	diskmap	Disk mapper
+#	dri	Direct Rendering Infrastructure
 #	drm*	Direct Rendering Manager
 #	dt	Dynamic Tracer
 #	fd	fd/* nodes
@@ -324,6 +325,19 @@ drm*)
 	M drmR$r c 87 $r 600
 	;;
 
+dri)
+	RMlist[${#RMlist[*]}]=";mkdir -p dri;rm -f"
+	n=0
+	while [ $n -lt 4 ]
+	do
+		M dri/card$n c 87 $n 600
+		r=$(($n+128))
+		M dri/renderD$r c 87 $r 600
+		n=$(($n+1))
+	done
+	MKlist[${#MKlist[*]}]=";chmod 555 dri"
+	;;
+
 diskmap)
 	M diskmap c 10 0 640 operator
 	;;
@@ -502,7 +516,7 @@ all)
 	R vscsi0 vnd0 vnd1 vnd2 vnd3 tun0 tun1 tun2 tun3 tap0 tap1
 	R tap2 tap3 switch0 switch1 switch2 switch3 sd0 sd1 sd2 sd3
 	R sd4 sd5 sd6 sd7 sd8 sd9 rd0 pty0 ipmi0 drm0 drm1 drm2 drm3
-	R diskmap cd0 cd1 bio audio0 audio1 audio2 audio3 kstat dt
+	R dri diskmap cd0 cd1 bio audio0 audio1 audio2 audio3 kstat dt
 	R kcov bpf fuse pppac pppx hotplug ptm local wscons pci0 pci1
 	R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
 	R rmidi6 rmidi7 radio0 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index 88572ac5a30..79c2e41ab2b 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.96 2021/01/23 05:08:33 thfr Exp 
-#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.97 2021/02/12 10:26:34 jsg Exp 
+#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -79,6 +79,7 @@
 #	bio	ioctl tunnel pseudo-device
 #	bpf	Berkeley Packet Filter
 #	diskmap	Disk mapper
+#	dri	Direct Rendering Infrastructure
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
 #	dt	Dynamic Tracer
@@ -356,6 +357,19 @@ drm*)
 	M drmR$r c 87 $r 600
 	;;
 
+dri)
+	RMlist[${#RMlist[*]}]=";mkdir -p dri;rm -f"
+	n=0
+	while [ $n -lt 4 ]
+	do
+		M dri/card$n c 87 $n 600
+		r=$(($n+128))
+		M dri/renderD$r c 87 $r 600
+		n=$(($n+1))
+	done
+	MKlist[${#MKlist[*]}]=";chmod 555 dri"
+	;;
+
 diskmap)
 	M diskmap c 130 0 640 operator
 	;;
@@ -652,7 +666,7 @@ all)
 	R ldom12 ldom13 ldom14 ldom15 spds hvctl ttyV0 ttyV1 ttyV2
 	R ttyV3 ttyV4 ttyV5 ttyV6 ttyV7 ttyV8 ttyV9 ttyVa ttyVb ttyVc
 	R ttyVd ttyVe ttyVf cuaa cuab cuac cuad ttya ttyb ttyc ttyd
-	R switch0 switch1 switch2 switch3 drm0 drm1 drm2 drm3 bpp0
+	R switch0 switch1 switch2 switch3 drm0 drm1 drm2 drm3 dri bpp0
 	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
 	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0
 	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D