[packages/rc-scripts] - usbfs is deprecated

arekm arekm at pld-linux.org
Sun Mar 10 00:12:46 CET 2013


commit 06de41c5d5840f7109fa8c95e0f1945002fddf6e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Mar 10 00:12:42 2013 +0100

    - usbfs is deprecated

 rc-scripts-usbfs.patch | 13 +++++++++++++
 rc-scripts.spec        |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/rc-scripts.spec b/rc-scripts.spec
index 3dcba33..1f2e3ab 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8):	inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr.UTF-8):	inittab ve /etc/rc.d dosyaları
 Name:		rc-scripts
 Version:	0.4.5.4
-Release:	5
+Release:	6
 License:	GPL v2
 Group:		Base
 #Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
@@ -19,6 +19,7 @@ Source1:	rc-local.service
 Source2:	sys-chroots.service
 Source3:	%{name}.tmpfiles
 Patch0:		%{name}-dot_named_ifaces.patch
+Patch1:		%{name}-usbfs.patch
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -118,6 +119,7 @@ programcıklar içerir.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"
diff --git a/rc-scripts-usbfs.patch b/rc-scripts-usbfs.patch
new file mode 100644
index 0000000..7df40d2
--- /dev/null
+++ b/rc-scripts-usbfs.patch
@@ -0,0 +1,13 @@
+Index: rc.d/rc.sysinit
+===================================================================
+--- rc.d/rc.sysinit	(wersja 12628)
++++ rc.d/rc.sysinit	(kopia robocza)
+@@ -335,7 +335,7 @@
+ 		fi
+ 	fi
+ 
+-	if [ "$usb" = "1" ] && ! is_fsmounted usbfs /proc/bus/usb ; then
++	if [ "$usb" = "1" -a -d /proc/bus/usb ] && ! is_fsmounted usbfs /proc/bus/usb ; then
+ 		run_cmd "Mounting USB filesystem" mount -n -t usbfs -o devgid=78,devmode=664 usbfs /proc/bus/usb
+ 	fi
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rc-scripts.git/commitdiff/06de41c5d5840f7109fa8c95e0f1945002fddf6e



More information about the pld-cvs-commit mailing list