X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdev.git;a=blobdiff_plain;f=dev.spec;h=4f2f466fd57cd3489dc7948a536255546dbbd0b9;hp=bfdffdb730fee946c29f56a52e5f3f712a9e72e1;hb=53f2a34c9cd360a6fc87786b2ea1d37759934c74;hpb=af62a42bc98b766373561b647d5bec92a15c0fc7

diff --git a/dev.spec b/dev.spec
index bfdffdb..4f2f466 100644
--- a/dev.spec
+++ b/dev.spec
@@ -1,22 +1,18 @@
 Summary:	/dev entries
-Summary(fr):	Entrées de /dev
 Summary(de):	/dev-Einträge
+Summary(fr):	Entrées de /dev
 Summary(pl):	Pliki specjalne /dev/*
 Summary(tr):	/dev dizini
 Name:		dev
-Version:	2.8.0
-Release:	1
-Source0:	%{name}-%{version}.tar.gz
-License:	public domain
+Version:	2.9.0
+Release:	8
+License:	Public Domain
 Group:		Base
-Group(pl):	Podstawowe
-BuildPrereq:	setup
-BuildPrereq:	shadow
-Prereq:		setup
+Source0:	dev-list
+PreReq:		setup >= 2.4.1-2
+Provides:	devfs
+AutoReqProv:	no
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Autoreqprov:	no
-
-%define		perm_cdrom	660,root,disk
 
 %description
 Unix and unix like systems (including Linux) use file system entries
@@ -25,12 +21,12 @@ in the /dev tree (though they don't have to be), and this package
 contains the most commonly used /dev entries. These files are
 essential for a system to function properly.
 
-%description -l pl
-Wszystkie systemy unixowe, w tym Linux, u¿ywaj± plików do
-przedstawiania urz±dzeñ pod³±czonych do komputera. Wszystkie te pliki
-znajduj± siê zwykle w katalogu /dev. Pakiet ten zawiera wiêkszo¶æ
-popularnych plików specjalnych, s± one jedn± z wa¿niejszych czê¶ci
-prawid³owo dzia³aj±cego systemu operacyjnego.
+%description -l de
+Unix und Unix-ähnliche Systeme (inkl. Linux) verwenden Dateisystem-
+Einträge zum Darstellen angeschlossener Geräte. Diese Einträge
+befinden sich (nicht notwendigerweise) im Verzeichnis /dev. Dieses
+Paket enthält die üblichsten /dev-Einträge. Diese Dateien sind für das
+Funktionieren eines Systems unbedingt erforderlich.
 
 %description -l fr
 Unix et les systèmes apparentés (dont Linux) utilise des fichiers pour
@@ -39,6 +35,13 @@ sont dans l'arborescence /dev (ce n'est pas obligatoire). Ce paquetage
 contient les entrées /dev les plus courantes. Elles sont essentielles
 pour qu'un système fonctionne correctement.
 
+%description -l pl
+Wszystkie systemy klasy unices, w tym Linux, u¿ywaj± plików do
+przedstawiania urz±dzeñ pod³±czonych do komputera. Wszystkie te pliki
+znajduj± siê zwykle w katalogu /dev. Pakiet ten zawiera wiêkszo¶æ
+popularnych plików specjalnych, s± one jedn± z wa¿niejszych czê¶ci
+prawid³owo dzia³aj±cego systemu operacyjnego.
+
 %description -l tr
 Unix ve Unix benzeri sistemler (Linux da dahil olmak üzere), makinaya
 baðlý aygýtlarý göstermek için özel dosyalar kullanýrlar. Bu özel
@@ -46,501 +49,198 @@ dosyalar
 kullanýlan /dev dosyalarýný içerir. Bu dosyalar, bir sistemin düzgün
 olarak iþleyebilmesi için temel gereksinimlerdendir.
 
-%description -l de
-Unix und Unix-ähnliche Systeme (inkl. Linux) verwenden Dateisystem-
-Einträge zum Darstellen angeschlossener Geräte. Diese Einträge
-befinden sich (nicht notwendigerweise) im Verzeichnis /dev. Dieses
-Paket enthält die üblichsten /dev-Einträge. Diese Dateien sind für das
-Funktionieren eines Systems unbedingt erforderlich.
-
 %prep
 %setup -q -c -T
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-
-mknode() {
-# [ -e $1 ] || mknod $1 $2 $3 $4
-	%{__rm} -f $1
-	mknod $1 $2 $3 $4
-}
-
-%{__install} -d $RPM_BUILD_ROOT
-
-# add group for floppy and console
-# if setup contains this group then remove next 4 lines
-#grep '^floppy:' /etc/group >/dev/null \
-#	|| groupadd -g 19 -r -f floppy >/dev/null
-#grep '^console:' /etc/group >/dev/null \
-#	|| groupadd -g 20 -f -r console >/dev/null
-
-# do some cleanup in build root
-cd $RPM_BUILD_ROOT
-%{__tar} xpSzf $RPM_SOURCE_DIR/%{name}-%{version}.tar.gz
-
-cd dev
-
-# tar doesn't save some permissions unless the p option is used
-# this code protects against dev package updaters forgetting to
-# use the p option when unpacking the souce tarball.
-for dev in zero null tty ttyp0; do
-  if [ ! $(ls -l $dev | awk '{print $1}') = crw-rw-rw- ]; then
-    echo bad permissions on device $dev 1>&2
-    exit 1
-  fi
-done
-
-%ifarch sparc
-# SPARC specific devices
-%{__ln_s} -f sunmouse mouse
-mknode openprom c 10 139
-%endif
-
-%ifarch m68k
-# m68k specific devices
-mknode amigamouse c 10 4
-mknode atarimouse c 10 5
-mknode apollomouse c 10 7
-%{__ln_s} -f amigamouse mouse
-mknode fdhd0 b 2 4
-mknode fdhd1 b 2 5
-%endif
-
-%ifarch sparc m68k
-# common sparc & m68k specific devices
-mknode kbd c 11 0
-%{__chmod} 666 fb*
-# remove devices that will *never* exist on a SPARC or m68k
-%{__rm} -f aztcd mcd sbpcd* cm206cd cdu31a cdu535 sonycd sjcd gscd
-%{__rm} -f hd* atibm inportbm logibm psaux
-%endif
-
-# Coda support
-mknode cfs0 c 67 0
-
-# PPP support
-mknode ppp c 108 0
-
-for i in 0 1 2 3 4 5 6 7; do
-	%{__ln_s} -f fb$i fb${i}current
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/dev/{ataraid,cciss,cdroms,cpu/{0,1,2,3,4,5,6,7}} \
+	$RPM_BUILD_ROOT/dev/{discs,i2o,ida,input,net,pts,raw,rd,usb,shm,snd} \
+	$RPM_BUILD_ROOT/dev/mapper
+
+install %{SOURCE0} .
+
+cd $RPM_BUILD_ROOT/dev
+ln -sf adsp0 adsp
+ln -sf amidi0 amidi
+ln -sf audio0 audio
+ln -sf dsp0 dsp
+ln -sf fb0 fb
+ln -sf rft0 ftape
+ln -sf isdnctrl0 isdnctrl
+ln -sf midi00 midi
+ln -sf mixer0 mixer
+ln -sf nrft0 nftape
+ln -sf ram0 ramdisk
+
+ln -sf em8300-0    em8300
+ln -sf em8300_ma-0 em8300_ma
+ln -sf em8300_mv-0 em8300_mv
+ln -sf em8300_sp-0 em8300_sp
+for i in `seq 0 31`; do
+	ln -sf fb$i fb${i}current
 done
-
-# watchdog support
-mknode watchdog c 10 130
-
-# route
-mknode route c 36 0
-
-# ALSA support
-%{__rm} -f mixer*
-mknode mixer0 c 14 0
-mknode mixer1 c 14 16
-mknode mixer2 c 14 32
-mknode mixer3 c 14 48
-%{__ln_s} -f mixer0 mixer
-
-%{__ln_s} -f midi00 midi
-
-%{__rm} -f dsp*
-mknode dsp0 c 14 3
-mknode dsp1 c 14 19
-mknode dsp2 c 14 35
-mknode dsp3 c 14 51
-%{__ln_s} -f dsp0 dsp
-
-%{__rm} -f audio*
-mknode audio0 c 14 4
-mknode audio1 c 14 20
-mknode audio2 c 14 36
-mknode audio3 c 14 52
-%{__ln_s} -f audio0 audio
-
-mknode adsp0 c 14 12
-mknode adsp1 c 14 28
-mknode adsp2 c 14 44
-mknode adsp3 c 14 60
-%{__ln_s} -f adsp0 adsp
-
-mknode dmfm0 c 14 10
-mknode dmfm1 c 14 26
-mknode dmfm2 c 14 42
-mknode dmfm3 c 14 58
-
-mknode dmmidi0 c 14 9
-mknode dmmidi1 c 14 25
-mknode dmmidi2 c 14 41
-mknode dmmidi3 c 14 57
-
-mknode music c 14 8
-
-mknode admmidi0 c 14 14
-mknode admmidi1 c 14 30
-mknode admmidi2 c 14 46
-mknode admmidi3 c 14 62
-
-mknode amidi0 c 14 13
-mknode amidi1 c 14 29
-mknode amidi2 c 14 45
-mknode amidi3 c 14 61
-%{__ln_s} -f amidi0 amidi
-
-%{__ln_s} -f music sequencer2
-
-mknode aloadC0 c 116 0
-mknode aloadC1 c 116 32
-mknode aloadC2 c 116 64
-mknode aloadC3 c 116 96
-mknode aloadSEQ c 116 1
-
-mknode amixer0 c 14 11
-mknode amixer1 c 14 27
-mknode amixer2 c 14 43
-mknode amixer3 c 14 59
-
-# video4linux support
-mknode video0 c 81 0
-mknode radio0 c 81 64
-mknode vtx0 c 81 192
-mknode vbi0 c 81 224
-%{__ln_s} -f video0 video
-%{__ln_s} -f radio0 radio
-%{__ln_s} -f vtx0 vtx
-%{__ln_s} -f vbi0 vbi
-
-# raid
-for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
-	mknode md$i b 9 $i
+ln -sf /proc/self/fd fd
+ln -sf fd/0 stdin
+ln -sf fd/1 stdout
+ln -sf fd/2 stderr
+i=0;
+for l in a b c d e f g h; do
+	ln -sf sg$l sg$i
+	i=$((i+1))
 done
-
-# netfilter
-mknode ipstate c 95 2
-
-# temporary
-%{__install} -d $RPM_BUILD_ROOT/proc/asound
-touch $RPM_BUILD_ROOT/proc/asound/dev
-
-%{__ln_s} -f ../proc/asound/dev snd
+ln -sf radio0 radio
+ln -sf music sequencer2
+ln -sf vbi0 vbi
+ln -sf video0 video
+ln -sf vtx0 vtx
 
 # prepared for SysVinit
-mknode initctl p
-
-# prepared for Log Daemon
-mkfifo --mode=666 syslog
+mkfifo initctl
 
-# libsvga char dev helpers
-mknod svga c 209 0
-mknod svga1 c 209 1
-mknod svga2 c 209 2
-mknod svga3 c 209 3
-mknod svga4 c 209 4
+mkfifo lircm
+mkfifo printer
 
-# ipsec character device
-mknod ipsec c 36 10
+# prepared for Log Daemon
+mkfifo syslog
 
-# raw io devices
-mknode rawctl c 162 0
-%{__mkdir} $RPM_BUILD_ROOT/dev/raw
-minor=1
-while [ "$minor" -ne 256 ]; do
-	mknode "raw/raw$minor" c 162 $minor
-	minor=$(($minor +1))
-done
+%ifarch m68k
+ln -sf amigamouse mouse
+%endif
 
-# ltmodem
-mknod ttyLT0 c 62 64
+%ifarch ppc
+ln -sf adbmouse mouse
+%endif
 
-# XFree86-nvidia-kernel
-for i in 0 1 2 3; do
-	mknod nvidia$i c 195 $i
-done
-mknod nvidiactl c 195 255
+%ifarch sparc
+ln -sf sunmouse mouse
+%endif
 
-# kernel 2.4 requires /dev/js* with major 13
-for f in 0 1 2 3; do
-	%{__mv} -f js$f oldjs$f
-	mknod js$f c 13 $f
-done
+# PLD-forklor:
+ln -sf null drzewo
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f dev-list
 %defattr(644,root,root,755)
-
-#a#
-%attr(660,root,audio) /dev/admmidi*
-
+%dir /dev/cpu
+%dir /dev/cpu/0
+%dir /dev/cpu/1
+%dir /dev/cpu/2
+%dir /dev/cpu/3
+%dir /dev/cpu/4
+%dir /dev/cpu/5
+%dir /dev/cpu/6
+%dir /dev/cpu/7
+%dir /dev/ataraid
+%dir /dev/cciss
+%attr(660,root,disk) %dir /dev/cdroms
+%attr(660,root,disk) %dir /dev/discs
+%dir /dev/i2o
+%dir /dev/ida
+%dir /dev/input
+%dir /dev/net
+%dir /dev/pts
+%dir /dev/raw
+%dir /dev/rd
+%dir /dev/usb
+%dir /dev/mapper
 %config(noreplace) %verify(not link) %attr(660,root,audio) /dev/adsp
-%attr(660,root,audio) /dev/adsp?*
-
 %config(noreplace) %verify(not link) %attr(660,root,audio) /dev/amidi
-%attr(660,root,audio) /dev/amidi?*
-
 %config(noreplace) %verify(not link) %attr(660,root,audio) /dev/audio
-%attr(660,root,audio) /dev/audio?*
-
-#b#
-%attr(%{perm_cdrom}) /dev/bpcd
-
-#c#
-%attr(600,root,root) /dev/capi*
-%attr(600,root,root) /dev/cfs0
-%attr(660,root,console) /dev/console
-%attr(664,root,root) /dev/cui*
-%attr(600,root,root) /dev/cum*
-
-#d#
-%attr(600,root,root) /dev/dcbri*
-%attr(660,root,sys) /dev/dcxx*
-%attr(660,root,audio) /dev/dmfm*
-%attr(660,root,audio) /dev/dmmidi*
 %config(noreplace) %verify(not link) %attr(660,root,audio) /dev/dsp
-%attr(660,root,audio) /dev/dsp?*
-
-#e#
-%attr(600,root,root) /dev/enskip
-
-#f#
-%config(noreplace) %verify(not link) %attr(644,root,root) /dev/fb
-%attr(644,root,root) /dev/fb?*
-%attr(660,root,floppy) /dev/fd*
-%config(noreplace) %verify(not link) %attr(666,root,root) /dev/ftape
-%attr(644,root,root) /dev/full
-
-#g#
-
-#h#
-%attr(660,root,disk) /dev/ht0
-
-#i#
-%attr(600,root,root) /dev/i2c*
-%dir /dev/ida
-%attr(660,root,disk) /dev/ida/*
-%attr(600,root,root) /dev/initctl
-%attr(600,root,root) /dev/ipauth
-%attr(600,root,root) /dev/ipl
-%attr(600,root,root) /dev/ipnat
-%attr(600,root,root) /dev/ipstate
-%attr(600,root,root) /dev/ippp*
-%attr(660,root,sys) /dev/iscc*
-%attr(600,root,root) /dev/isctl
-%attr(600,root,root) /dev/isdn?
-%attr(600,root,root) /dev/isdn??
+%config(noreplace) %verify(not link) %attr(660,root,video) /dev/fb
+%config(noreplace) %verify(not link) %attr(660,root,disk) /dev/ftape
 %config(noreplace) %verify(not link) %attr(600,root,root) /dev/isdnctrl
-%attr(600,root,root) /dev/isdnctrl?*
-%attr(444,root,root) /dev/isdninfo
-
-#j#
-%attr(660,root,sys) /dev/js*
-
-#k#
-%attr(640,root,kmem) /dev/kmem
-
-#l#
-%attr(660,root,disk) /dev/loop*
-%attr(660,root,lp) /dev/lp*
-
-#m#
-%attr(640,root,kmem) /dev/mem
 %config(noreplace) %verify(not link) %attr(660,root,audio) /dev/midi
-%attr(660,root,audio) /dev/midi?*
 %config(noreplace) %verify(not link) %attr(660,root,audio) /dev/mixer
-%attr(660,root,audio) /dev/mixer?*
-%attr(660,root,sys) /dev/mmetfgrab
-%attr(600,root,root) /dev/mpu401*
-%attr(660,root,audio) /dev/music
-%attr(660,root,disk) /dev/md*
-
-#n#
-%attr(660,root,disk) /dev/nb*
-%config(noreplace) %verify(not link) %attr(666,root,root) /dev/nftape
-%attr(660,root,disk) /dev/nht*
-%attr(660,root,disk) /dev/nqft*
-%attr(660,root,disk) /dev/nrawqft*
-%attr(660,root,disk) /dev/nrft*
-%attr(660,root,disk) /dev/nst*
-%attr(660,root,disk) /dev/ntpqic*
-%attr(666,root,root) /dev/null
-%attr(666,root,root) /dev/nvidia*
-%attr(660,root,disk) /dev/nzqft*
-
-#o#
-%attr(%{perm_cdrom}) /dev/optcd
-%attr(660,root,sys) /dev/oldjs*
-
-#p#
-%attr(660,root,lp) /dev/par?
-%attr(660,root,lp) /dev/parport*
-
-%attr(%{perm_cdrom}) /dev/pcd*
-%attr(660,root,disk) /dev/pd*
-%attr(660,root,disk) /dev/pf*
-%attr(600,root,root) /dev/pg*
-
-%attr(640,root,kmem) /dev/port
-%attr(644,root,root) /dev/ppp
-%attr(600,root,root) /dev/printer
-
-%attr(660,root,disk) /dev/pt0
-%attr(660,root,disk) /dev/pt1
-%attr(660,root,disk) /dev/pt2
-%attr(660,root,disk) /dev/pt3
-
-%attr(666,root,tty) /dev/ptmx
-%attr(666,root,tty) /dev/pty*
-%dir /dev/pts
-
-#r#
-%attr(640,root,disk) /dev/ram
-%attr(660,root,disk) /dev/ram0
-%attr(660,root,disk) /dev/ram1*
-%attr(660,root,disk) /dev/ram2
-%attr(660,root,disk) /dev/ram3
-%attr(660,root,disk) /dev/ram4
-%attr(660,root,disk) /dev/ram5
-%attr(660,root,disk) /dev/ram6
-%attr(660,root,disk) /dev/ram7
-%attr(660,root,disk) /dev/ram8
-%attr(660,root,disk) /dev/ram9
-
+%config(noreplace) %verify(not link) %attr(660,root,disk) /dev/nftape
 %config(noreplace) %verify(not link) %attr(660,root,disk) /dev/ramdisk
-
-%attr(644,root,root) /dev/random
-%attr(660,root,disk) /dev/rawqft*
-%attr(660,root,disk) /dev/rft*
-%attr(660,root,audio) /dev/rmidi*
-%attr(660,root,disk) /dev/rmt*
-%attr(644,root,root) /dev/route
-%attr(664,root,root) /dev/rtc
-%dir /dev/rd
-%attr(660,root,disk) /dev/rd/*
-%attr(600,root,root) /dev/rawctl
-%dir /dev/raw
-%attr(660,root,disk) /dev/raw/*
-
-#s#
-%attr(%{perm_cdrom}) /dev/scd*
-%attr(660,root,disk) /dev/sd*
-
-%attr(660,root,audio) /dev/sequencer
+%attr(660,root,video) /dev/em8300*
+%attr(660,root,video) /dev/fb[0-9]*current
+/dev/fd
+/dev/stdin
+/dev/stdout
+/dev/stderr
+%attr(660,root,video) /dev/radio
 %attr(660,root,audio) /dev/sequencer2
-
-%attr(600,root,root) /dev/sg*
-%attr(600,root,root) /dev/smtpe*
-
-%attr(444,root,root) /dev/snd
-%attr(666,root,root) /dev/sndstat
-
-%attr(600,root,root) /dev/srnd*
-
-%attr(660,root,disk) /dev/st?
-%attr(600,root,root) /dev/staliomem*
-%attr(666,root,root) /dev/std*
-
-%attr(664,root,root) /dev/svga*
+%attr(600,root,root) /dev/sg[0-7]
+%dir /dev/shm
+%dir /dev/snd
+%attr(660,root,video) /dev/vbi
+%attr(660,root,video) /dev/video
+%attr(660,root,video) /dev/vtx
+%attr(600,root,root) /dev/initctl
+%attr(660,root,root) /dev/lircm
+%attr(600,root,root) /dev/printer
 %attr(666,root,root) /dev/syslog
-%attr(600,root,root) /dev/systty
-
-#t#
-%attr(660,root,disk) /dev/tape*
-%attr(600,root,root) /dev/tlk*
-%attr(660,root,disk) /dev/tpqic*
-
-%attr(666,root,root) /dev/tty
-
-%attr(600,root,root) /dev/tty0
-%attr(600,root,root) /dev/tty1*
-%attr(600,root,root) /dev/tty2
-%attr(600,root,root) /dev/tty3
-%attr(600,root,root) /dev/tty4
-%attr(600,root,root) /dev/tty5
-%attr(600,root,root) /dev/tty6
-%attr(600,root,root) /dev/tty7
-%attr(600,root,root) /dev/tty8
-%attr(600,root,root) /dev/tty9
-
-%attr(600,root,root) /dev/ttyC*
-%attr(600,root,root) /dev/ttyD*
-%attr(600,root,root) /dev/ttyE*
-%attr(600,root,root) /dev/ttyI*
-%attr(600,root,root) /dev/ttyM*
-%attr(600,root,root) /dev/ttyP*
-%attr(600,root,root) /dev/ttyR*
-
-%attr(664,root,ttyS) /dev/ttyS*
-%attr(664,root,ttyS) /dev/ttyLT*
-
-%attr(666,root,tty) /dev/ttya*
-%attr(666,root,tty) /dev/ttyb*
-%attr(666,root,tty) /dev/ttyc*
-%attr(666,root,tty) /dev/ttyd*
-%attr(666,root,tty) /dev/ttye*
-%attr(666,root,tty) /dev/ttyp*
-%attr(666,root,tty) /dev/ttyq*
-%attr(666,root,tty) /dev/ttyr*
-%attr(666,root,tty) /dev/ttys*
-%attr(666,root,tty) /dev/ttyt*
-%attr(666,root,tty) /dev/ttyu*
-%attr(666,root,tty) /dev/ttyv*
-%attr(666,root,tty) /dev/ttyw*
-%attr(666,root,tty) /dev/ttyx*
-%attr(666,root,tty) /dev/ttyy*
-%attr(666,root,tty) /dev/ttyz*
-
-#u#
-%attr(644,root,root) /dev/urandom
-
-#v#
-%attr(620,root,tty) /dev/vcs*
-
-#w#
-%attr(600,root,root) /dev/watchdog
-%attr(660,root,sys) /dev/wvisfgrab
-
-#x#
-%attr(660,root,disk) /dev/xd*
-
-#y#
-
-#z#
-%attr(666,root,root) /dev/zero
-%attr(660,root,disk) /dev/zqft*
-
-# only on sparc or m68k
-%ifarch sparc m68k
-# XXX: which permissions???
-%attr(600,root,root) /dev/kbd
+%attr(666,root,root) /dev/drzewo
+
+%dev(c,10,165) %attr(640,root,root) /dev/vmmon
+%dev(c,119,10) %attr(640,root,root) /dev/vmnet0
+%dev(c,119,10) %attr(640,root,root) /dev/vmnet1
+%dev(c,119,10) %attr(640,root,root) /dev/vmnet2
+%dev(c,119,10) %attr(640,root,root) /dev/vmnet3
+%dev(c,119,10) %attr(640,root,root) /dev/vmnet4
+%dev(c,119,10) %attr(640,root,root) /dev/vmnet5
+%dev(c,119,10) %attr(640,root,root) /dev/vmnet6
+%dev(c,119,10) %attr(640,root,root) /dev/vmnet7
+%dev(c,119,10) %attr(640,root,root) /dev/vmnet8
+
+%dev(c,10,63) %attr(660,root,disk) /dev/mapper/control
+
+%ifarch %{ix86}
+%dev(c,10,184) %attr(666,root,root) /dev/cpu/microcode
+%dev(c,10,181) %attr(666,root,root) /dev/toshiba
 %endif
 
-# only on m68k
 %ifarch m68k
+%dev(b,2,4) %attr(660,root,floppy) /dev/fdhd0
+%dev(b,2,5) %attr(660,root,floppy) /dev/fdhd1 
 # XXX: which permissions???
-%attr(664,root,root) /dev/amigamouse
-%attr(664,root,root) /dev/atarimouse
-%attr(664,root,root) /dev/apollomouse
+%dev(c,10,4) %attr(664,root,root) /dev/amigamouse
+%attr(664,root,root) /dev/mouse
+%dev(c,10,5) %attr(664,root,root) /dev/atarimouse
+%dev(c,10,7) %attr(664,root,root) /dev/apollomouse
+%endif
+
+%ifarch ppc
+%dev(c,56,0) %attr(644,root,root) /dev/adb
+%dev(c,10,10) %attr(644,root,root) /dev/adbmouse
+%attr(644,root,root) /dev/mouse
+%dev(c,10,154) %attr(644,root,root) /dev/pmu
+%dev(c,10,198) %attr(644,root,root) /dev/sheep_net
 %endif
 
-# only on sparc
 %ifarch sparc
 # XXX: which permissions ???
-%attr(600,root,root) /dev/openprom
-%attr(664,root,root) /dev/sunmouse
+%dev(c,10,139) %attr(600,root,root) /dev/openprom
+%dev(c,10,6) %attr(664,root,root) /dev/sunmouse
+%attr(664,root,root) /dev/mouse
+%endif
+
+%ifarch m68k sparc
+# XXX: which permissions???
+%dev(c,11,00) %attr(600,root,root) /dev/kbd
 %endif
 
-# not on sparc or m68k
-%ifnarch sparc m68k
-%attr(664,root,root) /dev/atibm
-%attr(%{perm_cdrom}) /dev/aztcd
-%attr(%{perm_cdrom}) /dev/cdu31a
-%attr(%{perm_cdrom}) /dev/cdu535
-%attr(%{perm_cdrom}) /dev/cm206cd
-%attr(%{perm_cdrom}) /dev/gscd
-%attr(660,root,disk) /dev/hd*
-%attr(664,root,root) /dev/inportbm
-%attr(664,root,root) /dev/logibm
-%attr(%{perm_cdrom}) /dev/mcd
-%attr(664,root,root) /dev/psaux
-%attr(%{perm_cdrom}) /dev/sbpcd*
-%attr(%{perm_cdrom}) /dev/sjcd
-%attr(%{perm_cdrom}) /dev/sonycd
+%ifnarch m68k sparc
+%dev(c,10,3) %attr(664,root,root) /dev/atibm
+%dev(b,29,0) %attr(660,root,disk) /dev/aztcd
+%dev(b,15,0) %attr(660,root,disk) /dev/cdu31a
+%dev(b,24,0) %attr(660,root,disk) /dev/cdu535
+%dev(b,32,0) %attr(660,root,disk) /dev/cm206cd
+%dev(b,16,0) %attr(660,root,disk) /dev/gscd
+%dev(c,10,2) %attr(664,root,root) /dev/inportbm
+%dev(c,10,0) %attr(664,root,root) /dev/logibm
+%dev(b,23,0) %attr(660,root,disk) /dev/mcd
+%dev(c,10,1) %attr(664,root,root) /dev/psaux
+%dev(b,25,0) %attr(660,root,disk) /dev/sbpcd
+%dev(b,25,0) %attr(660,root,disk) /dev/sbpcd0
+%dev(b,25,1) %attr(660,root,disk) /dev/sbpcd1
+%dev(b,25,2) %attr(660,root,disk) /dev/sbpcd2
+%dev(b,25,3) %attr(660,root,disk) /dev/sbpcd3
+%dev(b,18,0) %attr(660,root,disk) /dev/sjcd
+%dev(b,15,0) %attr(660,root,disk) /dev/sonycd
 %endif