Message-ID: <20040813080523.GA16123@slipstream> Date: Fri, 13 Aug 2004 10:05:23 +0200 From: Thomas Schmidt <email address hidden> To: Bdale Garbee <email address hidden> Cc: Adrian Bunk <email address hidden>, <email address hidden>, <email address hidden> Subject: Re: Bug#263136: This issue might break applications
--24zk1gE8NUlDmwG9 Content-Type: multipart/mixed; boundary="h31gzZEtNLTqOjlF" Content-Disposition: inline
--h31gzZEtNLTqOjlF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable
* Thomas Schmidt schrieb am 13.08.04, um 00:20 Uhr: > See the attached file.
Sorry, the patch was incomplete, it would match only on 2.6.x-kernels, here is the version that should work with 2.7.x and 3.x also. :)
--=20 Thomas Schmidt :wq
--h31gzZEtNLTqOjlF Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="263136.diff" Content-Transfer-Encoding: quoted-printable
diff -Nurd makedev-2.3.1/debian/init.d makedev-2.3.1.new/debian/init.d --- makedev-2.3.1/debian/init.d 2004-08-13 00:08:20.000000000 +0200 +++ makedev-2.3.1.new/debian/init.d 2004-08-13 00:10:38.000000000 +0200 @@ -8,6 +8,20 @@ case "$1" in start) test -L /dev/MAKEDEV || ln -fs /sbin/MAKEDEV /dev/MAKEDEV + + # create dvb-devices, if the dvb-directory allready exists, and=20 + # no devfs is used (this a workaround for the changed major-number + # of the dvb-devices, introduced in kernel 2.6.8, to be able to=20 + # switch between kernels <=3D 2.6.7 and >=3D 2.6.8, without manual=20 + # recreation of the devices (MAKEDEV dvb checks the kernel-version=20 + # and uses the correct major-number)) +=09 + if [ ! -e /dev/.devfsd ]; then + if [ -d /dev/dvb ]; then + cd /dev && ./MAKEDEV dvb + fi + fi +=09 ;; stop|reload|restart|force-reload) ;; diff -Nurd makedev-2.3.1/MAKEDEV makedev-2.3.1.new/MAKEDEV --- makedev-2.3.1/MAKEDEV 2004-08-13 00:08:20.000000000 +0200 +++ makedev-2.3.1.new/MAKEDEV 2004-08-13 10:01:11.000000000 +0200 @@ -1974,18 +1974,33 @@ done ;; dvb) + # check if kernel-version is >=3D 2.6.8, if yes, create dvb-devices with + # major-number 212, in the other case 250 + =09 + kern_rev1=3D`uname -r | sed -e 's@^\([^.]*\)\..*@\1@'` + kern_rev2=3D`uname -r | sed -e 's@^[^.]*\.\([^.]*\)\..*@\1@'` + kern_rev3=3D`uname -r | sed -e 's@^[^.]*\.[^.]*\.\([^.][0-9]*\).*@\1@'` + =20 + dvb_major=3D250 + + if [ $kern_rev1 -gt 2 ] || ([ $kern_rev1 -eq 2 ] && [ $kern_rev2 -gt 6 ]= ) \ + || ([ $kern_rev1 -eq 2 ] && [ $kern_rev2 -eq 6 ] && [ $kern_rev3 -ge 8 = ]) + then=20 + dvb_major=3D212=20 + fi + mkdir -p dvb for i in 0 1 2 3 do mkdir -p dvb/adapter$i - makedev dvb/adapter$i/video0 c 250 `math 64 \* $i + 0` $video - makedev dvb/adapter$i/audio0 c 250 `math 64 \* $i + 1` $video - makedev dvb/adapter$i/frontend0 c 250 `math 64 \* $i + 3` $video - makedev dvb/adapter$i/demux0 c 250 `math 64 \* $i + 4` $video - makedev dvb/adapter$i/dvr0 c 250 `math 64 \* $i + 5` $video - makedev dvb/adapter$i/ca0 c 250 `math 64 \* $i + 6` $video - makedev dvb/adapter$i/net0 c 250 `math 64 \* $i + 7` $video - makedev dvb/adapter$i/osd0 c 250 `math 64 \* $i + 8` $video + makedev dvb/adapter$i/video0 c $dvb_major `math 64 \* $i + 0` $video + makedev dvb/adapter$i/audio0 c $dvb_major `math 64 \* $i + 1` $video + makedev dvb/adapter$i/frontend0 c $dvb_major `math 64 \* $i + 3` $video + makedev dvb/adapter$i/demux0 c $dvb_major `math 64 \* $i + 4` $video + makedev dvb/adapter$i/dvr0 c $dvb_major `math 64 \* $i + 5` $video + makedev dvb/adapter$i/ca0 c $dvb_major `math 64 \* $i + 6` $video + makedev dvb/adapter$i/net0 c $dvb_major `math 64 \* $i + 7` $video + makedev dvb/adapter$i/osd0 c $dvb_major `math 64 \* $i + 8` $video done ;; usb)
--h31gzZEtNLTqOjlF--
--24zk1gE8NUlDmwG9 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (GNU/Linux) iD8DBQFBHHZDc9+NqwoydlIRAm+OAKCV0XaOdJp2bBxnJI9RWzRlIAYxHACfdwuK 1vl0bNKAfr5xX6sNlmofOOg= =jK2T -----END PGP SIGNATURE-----
--24zk1gE8NUlDmwG9--
Message-ID: <20040813080523 .GA16123@ slipstream>
Date: Fri, 13 Aug 2004 10:05:23 +0200
From: Thomas Schmidt <email address hidden>
To: Bdale Garbee <email address hidden>
Cc: Adrian Bunk <email address hidden>, <email address hidden>, <email address hidden>
Subject: Re: Bug#263136: This issue might break applications
--24zk1gE8NUlDmwG9 "h31gzZEtNLTqOj lF" Disposition: inline
Content-Type: multipart/mixed; boundary=
Content-
--h31gzZEtNLTqOjlF Disposition: inline Transfer- Encoding: quoted-printable
Content-Type: text/plain; charset=us-ascii
Content-
Content-
* Thomas Schmidt schrieb am 13.08.04, um 00:20 Uhr:
> See the attached file.
Sorry, the patch was incomplete, it would match only on 2.6.x-kernels,
here is the version that should work with 2.7.x and 3.x also. :)
--=20
Thomas Schmidt
:wq
--h31gzZEtNLTqOjlF Disposition: attachment; filename= "263136. diff" Transfer- Encoding: quoted-printable
Content-Type: text/plain; charset=us-ascii
Content-
Content-
diff -Nurd makedev- 2.3.1/debian/ init.d makedev- 2.3.1.new/ debian/ init.d 2.3.1/debian/ init.d 2004-08-13 00:08:20.000000000 +0200 2.3.1.new/ debian/ init.d 2004-08-13 00:10:38.000000000 +0200 reload| restart| force-reload) 2.3.1/MAKEDEV makedev- 2.3.1.new/ MAKEDEV 2.3.1/MAKEDEV 2004-08-13 00:08:20.000000000 +0200 2.3.1.new/ MAKEDEV 2004-08-13 10:01:11.000000000 +0200 ^.]*\)\ ..*@\1@ '` ]*\.\([ ^.]*\)\ ..*@\1@ '` ]*\.[^. ]*\.\([ ^.][0-9] *\).*@\ 1@'` i/video0 c 250 `math 64 \* $i + 0` $video i/audio0 c 250 `math 64 \* $i + 1` $video i/frontend0 c 250 `math 64 \* $i + 3` $video i/demux0 c 250 `math 64 \* $i + 4` $video i/video0 c $dvb_major `math 64 \* $i + 0` $video i/audio0 c $dvb_major `math 64 \* $i + 1` $video i/frontend0 c $dvb_major `math 64 \* $i + 3` $video i/demux0 c $dvb_major `math 64 \* $i + 4` $video
--- makedev-
+++ makedev-
@@ -8,6 +8,20 @@
case "$1" in
start)
test -L /dev/MAKEDEV || ln -fs /sbin/MAKEDEV /dev/MAKEDEV
+
+ # create dvb-devices, if the dvb-directory allready exists, and=20
+ # no devfs is used (this a workaround for the changed major-number
+ # of the dvb-devices, introduced in kernel 2.6.8, to be able to=20
+ # switch between kernels <=3D 2.6.7 and >=3D 2.6.8, without manual=20
+ # recreation of the devices (MAKEDEV dvb checks the kernel-version=20
+ # and uses the correct major-number))
+=09
+ if [ ! -e /dev/.devfsd ]; then
+ if [ -d /dev/dvb ]; then
+ cd /dev && ./MAKEDEV dvb
+ fi
+ fi
+=09
;;
stop|
;;
diff -Nurd makedev-
--- makedev-
+++ makedev-
@@ -1974,18 +1974,33 @@
done
;;
dvb)
+ # check if kernel-version is >=3D 2.6.8, if yes, create dvb-devices with
+ # major-number 212, in the other case 250
+ =09
+ kern_rev1=3D`uname -r | sed -e 's@^\([
+ kern_rev2=3D`uname -r | sed -e 's@^[^.
+ kern_rev3=3D`uname -r | sed -e 's@^[^.
+ =20
+ dvb_major=3D250
+
+ if [ $kern_rev1 -gt 2 ] || ([ $kern_rev1 -eq 2 ] && [ $kern_rev2 -gt 6 ]=
) \
+ || ([ $kern_rev1 -eq 2 ] && [ $kern_rev2 -eq 6 ] && [ $kern_rev3 -ge 8 =
])
+ then=20
+ dvb_major=3D212=20
+ fi
+
mkdir -p dvb
for i in 0 1 2 3
do
mkdir -p dvb/adapter$i
- makedev dvb/adapter$
- makedev dvb/adapter$
- makedev dvb/adapter$
- makedev dvb/adapter$
- makedev dvb/adapter$i/dvr0 c 250 `math 64 \* $i + 5` $video
- makedev dvb/adapter$i/ca0 c 250 `math 64 \* $i + 6` $video
- makedev dvb/adapter$i/net0 c 250 `math 64 \* $i + 7` $video
- makedev dvb/adapter$i/osd0 c 250 `math 64 \* $i + 8` $video
+ makedev dvb/adapter$
+ makedev dvb/adapter$
+ makedev dvb/adapter$
+ makedev dvb/adapter$
+ makedev dvb/adapter$i/dvr0 c $dvb_major `math 64 \* $i + 5` $video
+ makedev dvb/adapter$i/ca0 c $dvb_major `math 64 \* $i + 6` $video
+ makedev dvb/adapter$i/net0 c $dvb_major `math 64 \* $i + 7` $video
+ makedev dvb/adapter$i/osd0 c $dvb_major `math 64 \* $i + 8` $video
done
;;
usb)
--h31gzZEtNLTqO jlF--
--24zk1gE8NUlDmwG9 pgp-signature; name="signature .asc" Description: Digital signature Disposition: inline
Content-Type: application/
Content-
Content-
-----BEGIN PGP SIGNATURE-----
NqwoydlIRAm+ OAKCV0XaOdJp2bB xnJI9RWzRlIAYxH ACfdwuK NlmofOOg=
Version: GnuPG v1.2.5 (GNU/Linux)
iD8DBQFBHHZDc9+
1vl0bNKAfr5xX6s
=jK2T
-----END PGP SIGNATURE-----
--24zk1gE8NUlDm wG9--