rpms/microcode_ctl/devel microcode_ctl.rules, NONE, 1.1 microcode_ctl.spec, 1.58, 1.59 microcode_ctl.init, 1.17, NONE

[Anton Arapov]

Author: aarapov

Update of /cvs/pkgs/rpms/microcode_ctl/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27286

Modified Files:
	microcode_ctl.spec 
Added Files:
	microcode_ctl.rules 
Removed Files:
	microcode_ctl.init 
Log Message:
* Mon Mar 22 2010 Anton Arapov <anton at redhat.com> 1.17-2
- Make microcode_ctl event driven (Bill Nottingham ) Resolves rhbz#479898



--- NEW FILE microcode_ctl.rules ---
KERNEL=="cpu[0-9]*", RUN+="/sbin/modprobe microcode"
KERNEL=="microcode", RUN+="/sbin/microcode_ctl -Qu"



Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/microcode_ctl.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- microcode_ctl.spec	12 Feb 2010 04:55:28 -0000	1.58
+++ microcode_ctl.spec	23 Mar 2010 09:26:52 -0000	1.59
@@ -1,22 +1,22 @@
 Summary:        Tool to update x86/x86-64 CPU microcode.
 Name:           microcode_ctl
 Version:        1.17
-Release:        %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://www.urbanmyth.org/microcode/
 Source0:        http://www.urbanmyth.org/microcode/microcode_ctl-%{version}.tar.gz
-Source1:        microcode_ctl.init
+Source1:        microcode_ctl.rules
 # Microcode now distributed directly by Intel, at
 # http://downloadcenter.intel.com (just search for microcode)
 Source2:        microcode-20100209.dat
 # http://www.amd64.org/support/microcode.html
-Source3:	amd-ucode-2009-10-09.tar
+Source3:        amd-ucode-2009-10-09.tar
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
+Requires:       udev
 Requires(pre):  /sbin/chkconfig /sbin/service
 Requires(pre):  grep gawk coreutils
-Obsoletes:      kernel-utils
 ExclusiveArch:  %{ix86} x86_64
 
 Patch1: microcode_ctl.patch
@@ -42,7 +42,10 @@ mkdir -p %{buildroot}/lib/firmware/amd-u
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
      INSDIR=/sbin MANDIR=%{_mandir}/man8 RCDIR=%{_sysconfdir} install clean
 
-install %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/microcode_ctl
+rm -rf %{buildroot}/etc/*
+
+mkdir -p %{buildroot}/lib/udev/rules.d
+install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d/89-microcode.rules
 install -m 644 %{SOURCE2} %{buildroot}/lib/firmware/microcode.dat
 
 install -m 644 amd-ucode-2009-10-09/microcode_amd.bin %{buildroot}/lib/firmware/amd-ucode/microcode_amd.bin
@@ -57,51 +60,22 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%{_sysconfdir}/init.d/microcode_ctl
 /lib/firmware/*
+/lib/udev/rules.d/*
 /sbin/microcode_ctl
 %doc LICENSE.microcode_amd README.microcode_amd INSTALL.microcode_amd
 %attr(0644,root,root) %{_mandir}/*/*
 
-
-
-%preun
-if [ "$1" = "0" ] ; then
-    /sbin/chkconfig --del microcode_ctl
-fi
-
-%post
-# Only enable on Intel 686's and above or AMD family 0x10 and above
-vendor=`cat /proc/cpuinfo | grep "^vendor_id" | sort -u | awk -F ": " '{ print $2 }'`
-family=`cat /proc/cpuinfo | grep "^cpu family" | sort -u | awk -F ": " '{ print $2 }'`
-if [ "$vendor" = "GenuineIntel" ]; then
- [ $family -lt 6 ] && exit 0
-elif [ "$vendor" = "AuthenticAMD" ]; then
- [ $family -lt 16 ] && exit 0
-else
- exit 0
-fi
-
-/sbin/chkconfig --add microcode_ctl
+%triggerun -- microcode_ctl < 1:1.17-2
+/sbin/chkconfig --del microcode_ctl
 exit 0
 
-%triggerpostun -- kernel-utils
-# Only enable on Intel 686's and above or AMD family 0x10 and above
-vendor=`cat /proc/cpuinfo | grep "^vendor_id" | sort -u | awk -F ": " '{ print $2 }'`
-family=`cat /proc/cpuinfo | grep "^cpu family" | sort -u | awk -F ": " '{ print $2 }'`
-if [ "$vendor" = "GenuineIntel" ]; then
- [ $family -lt 6 ] && exit 0
-elif [ "$vendor" = "AuthenticAMD" ]; then
- [ $family -lt 16 ] && exit 0
-else
- exit 0
-fi
-
-/sbin/chkconfig --add microcode_ctl
-exit 0
 
 %changelog
-* Thu Feb 11 2010 Dave Jones <davej at redhat.com>
+* Mon Mar 22 2010 Anton Arapov <anton at redhat.com> 1.17-2
+- Make microcode_ctl event driven (Bill Nottingham ) Resolves rhbz#479898
+
+* Thu Feb 11 2010 Dave Jones <davej at redhat.com> 1.17-1.58
 - Update to microcode-20100209.dat
 
 * Fri Dec 04 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.57


--- microcode_ctl.init DELETED ---