From 669460be740787cfc5bb18da2b73290adde265dd Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Mon, 8 Dec 2003 08:28:41 +0000 Subject: [PATCH] Added usb/ compatibility code to devfsd and indented the devfsd.d/compat file git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1928 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 14 ++++++ package/base/devfsd/devfsd_compat.txt | 20 ++++---- package/base/devfsd/usb-support.patch | 63 +++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 package/base/devfsd/usb-support.patch diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 40b3f994b..614f81100 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -1,4 +1,18 @@ +*) 2003-12-07 (2.0.0-rc3 - 2.0.0-rc4) + + - added usb compatibility support to devfsd + +*) 2003-12-06 (2.0.0-rc3 - 2.0.0-rc4) + + - fixed powerpc config bug + - enabled anti-aliasing in gv per default + - improved the mac-fdisk package to copy the man-pages + - improved the rocknet dns module to limit the useage of the search keyword + - updated epiphany + - fixed postfix (to install mag-pages named correctly and not to remove + sendmail's versions of the man-pages ...) + *) 2003-12-04 (2.0.0-rc3 - 2.0.0-rc4) - Juergen Sawinski: fixed recode and updated rsync diff --git a/package/base/devfsd/devfsd_compat.txt b/package/base/devfsd/devfsd_compat.txt index cbb3d500d..e105e16bd 100644 --- a/package/base/devfsd/devfsd_compat.txt +++ b/package/base/devfsd/devfsd_compat.txt @@ -1,25 +1,25 @@ # cd-rom -REGISTER scsi/.*/cd MKOLDCOMPAT -UNREGISTER scsi/.*/cd RMOLDCOMPAT +REGISTER scsi/.*/cd MKOLDCOMPAT +UNREGISTER scsi/.*/cd RMOLDCOMPAT # cd-writer and scanning REGISTER scsi/.*/generic MKOLDCOMPAT UNREGISTER scsi/.*/generic RMOLDCOMPAT # parport printers -REGISTER printers/.* MKOLDCOMPAT -UNREGISTER printers/.* RMOLDCOMPAT +REGISTER printers/.* MKOLDCOMPAT +UNREGISTER printers/.* RMOLDCOMPAT # anything usb related -REGISTER usb/.* MKOLDCOMPAT -UNREGISTER usb/.* RMOLDCOMPAT +REGISTER usb/.* MKOLDCOMPAT +UNREGISTER usb/.* RMOLDCOMPAT # most misc stuff is used by tiny non devfs aware programs -REGISTER misc/.* MKOLDCOMPAT -UNREGISTER misc/.* RMOLDCOMPAT +REGISTER misc/.* MKOLDCOMPAT +UNREGISTER misc/.* RMOLDCOMPAT # the same applies for the framebuffer devices -REGISTER fb/.* MKOLDCOMPAT -UNREGISTER fb/.* RMOLDCOMPAT +REGISTER fb/.* MKOLDCOMPAT +UNREGISTER fb/.* RMOLDCOMPAT diff --git a/package/base/devfsd/usb-support.patch b/package/base/devfsd/usb-support.patch new file mode 100644 index 000000000..28bfaa53f --- /dev/null +++ b/package/base/devfsd/usb-support.patch @@ -0,0 +1,63 @@ + + +Since DevFS does not seem to be actively maintained anymore we might +need to push it a bit in the future ... + + + - Rene Rebe + +--- devfsd/compat_name.c.orig 2002-01-25 08:06:35.000000000 +0100 ++++ devfsd/compat_name.c 2003-12-07 00:37:49.000000000 +0100 +@@ -3,6 +3,7 @@ + Compatibility name file for devfsd (build compatibility names). + + Copyright (C) 1998-2002 Richard Gooch ++ 2003 Rene Rebe + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -58,9 +59,11 @@ + new compatibility names for IDE devices. Consolidated SCSI code. Consolidated + IDE code. + +- Last updated by Richard Gooch 25-JAN-2002: Added compatibility entries ++ Updated by Richard Gooch 25-JAN-2002: Added compatibility entries + for parallel port generic ATAPI interface. + ++ Last updated by Rene Rebe 07-DEZ-2003: Added compatibility entires ++ for the usb/ directory. + + */ + #include +@@ -126,6 +129,7 @@ + {"tts/", "ttyS%s"}, /* Generic serial: must be after others */ + {"cua/", "cua%s"}, /* Generic serial: must be after others */ + {"input/js", "js%s"}, /* Joystick driver */ ++ {"usb/", "usb%s"}, /* USB devices like lp and scanner */ + {NULL, NULL} + }; + +--- devfsd/modules.devfs.orig 2002-03-25 01:00:33.000000000 +0100 ++++ devfsd/modules.devfs 2003-12-07 00:37:20.000000000 +0100 +@@ -1,5 +1,6 @@ + # /etc/modules.devfs + # Richard Gooch 24-MAR-2002 ++# Rene Rebe 07-DEZ-2003 + # + # THIS IS AN AUTOMATICALLY GENERATED FILE. DO NOT EDIT!!! + # THIS FILE WILL BE OVERWRITTEN EACH TIME YOU INSTALL DEVFSD!!! +@@ -128,6 +129,14 @@ + # Raw I/O devices + alias /dev/rawctl /dev/raw + ++# USB ++alias /dev/usb/scanner scanner ++alias /dev/usb/scanner* /dev/usb/scanner ++alias /dev/usbscanner* /dev/usb/scanner ++ ++alias /dev/usb/lp printer ++alias /dev/usb/lp* /dev/usb/lp ++alias /dev/usblp* /dev/usb/lp + + # Pull in the configuration file. Do this last because modprobe(8) processes in + # per^H^H^Hreverse order and the sysadmin may want to over-ride what is in the