- rel 2; include firmware-loader.sh script

Changed files:
    rc-scripts-fw.patch -> 1.1
    rc-scripts.spec -> 1.328

diff --git a/rc-scripts-fw.patch b/rc-scripts-fw.patch
new file mode 100644 (file)
index 0000000..7ef18cb
--- /dev/null
+++ b/rc-scripts-fw.patch
@@ -0,0 +1,57 @@
+Index: Makefile.am
+===================================================================
+--- Makefile.am        (wersja 11461)
++++ Makefile.am        (kopia robocza)
+@@ -11,6 +11,11 @@
+       crypttab \
+       sysctl.conf
+ 
++firmwaredir = /lib/firmware
++
++firmware_SCRIPTS = \
++      firmware-loader.sh
++
+ profiledir = @sysconfdir@/profile.d
+ 
+ profile_DATA = \
+@@ -26,6 +31,7 @@
+ EXTRA_DIST = \
+       $(sysconf_DATA) \
+       $(profile_DATA) \
++      $(firmware_SCRIPTS) \
+       $(sbin_SCRIPTS) \
+       $(bin_SCRIPTS)
+ 
+Index: firmware-loader.sh
+===================================================================
+--- firmware-loader.sh (wersja 0)
++++ firmware-loader.sh (wersja 10422)
+@@ -0,0 +1,26 @@
++#!/bin/sh -e
++
++FIRMWARE_DIRS="/lib/firmware/updates/$(uname -r) /lib/firmware/updates \
++               /lib/firmware/$(uname -r) /lib/firmware"
++
++err() {
++      echo "$@" >&2
++      logger -t "${0##*/}[$$]" "$@" 2>/dev/null || true
++}
++
++if [ ! -e /sys$DEVPATH/loading ]; then
++      err "firmware loader misses sysfs directory"
++      exit 1
++fi
++
++for DIR in $FIRMWARE_DIRS; do
++      [ -e "$DIR/$FIRMWARE" ] || continue
++      echo 1 > /sys$DEVPATH/loading
++      cat "$DIR/$FIRMWARE" > /sys$DEVPATH/data
++      echo 0 > /sys$DEVPATH/loading
++      exit 0
++done
++
++echo -1 > /sys$DEVPATH/loading
++err "Cannot find  firmware file '$FIRMWARE'"
++exit 1
+
+

diff --git a/rc-scripts.spec b/rc-scripts.spec
index c9de6b63951dbb295bfee85497b516c8da9b9392..42c0b5e676c74586ea291ee04840f54c7a0c67c9 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -9,11 +9,12 @@ 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.3.2
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Base
 Source0:       ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 # Source0-md5: 8449de4a472e8bc4d61c703328171098
+Patch0:                %{name}-fw.patch
 URL:           http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -103,6 +104,7 @@ programcıklar içerir.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %{__aclocal}
@@ -270,6 +272,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(755,root,root) %{_sbindir}/start-stop-daemon
 %attr(755,root,root) %{_sbindir}/tnl*
 %attr(4755,root,root) %{_sbindir}/usernetctl
+%attr(755,root,root) /lib/firmware/firmware-loader.sh
 
 %dir %{_sysconfdir}/ppp
 %attr(754,root,root) %{_sysconfdir}/ppp/*