Author: arekm Date: Thu May 13 07:36:29 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; include firmware-loader.sh script
---- Files affected: packages/rc-scripts: rc-scripts.spec (1.327 -> 1.328) , rc-scripts-fw.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/rc-scripts/rc-scripts.spec diff -u packages/rc-scripts/rc-scripts.spec:1.327 packages/rc-scripts/rc-scripts.spec:1.328 --- packages/rc-scripts/rc-scripts.spec:1.327 Tue May 11 19:25:55 2010 +++ packages/rc-scripts/rc-scripts.spec Thu May 13 09:36:24 2010 @@ -10,11 +10,12 @@ 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 @@ -104,6 +105,7 @@ %prep %setup -q +%patch0 -p0 %build %{__aclocal} @@ -271,6 +273,7 @@ %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/* @@ -349,6 +352,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.328 2010/05/13 07:36:24 arekm +- rel 2; include firmware-loader.sh script + Revision 1.327 2010/05/11 17:25:55 jajcus - Version: 0.4.3.2 (previous one was _very broken_) ================================================================ Index: packages/rc-scripts/rc-scripts-fw.patch diff -u /dev/null packages/rc-scripts/rc-scripts-fw.patch:1.1 --- /dev/null Thu May 13 09:36:29 2010 +++ packages/rc-scripts/rc-scripts-fw.patch Thu May 13 09:36:24 2010 @@ -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 + + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.327&r2=1.328&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
