rpms/microcode_ctl/devel microcode_ctl.init, 1.12, 1.13 microcode_ctl.patch, 1.8, 1.9 microcode_ctl.spec, 1.40, 1.41

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/microcode_ctl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8906

Modified Files:
	microcode_ctl.init microcode_ctl.patch microcode_ctl.spec 
Log Message:
* Fri Feb 22 2008 Jarod Wilson <jwilson at redhat.com>
- Use /lib/firmware instead of /etc/firmware



Index: microcode_ctl.init
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/microcode_ctl.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- microcode_ctl.init	13 Oct 2006 03:26:56 -0000	1.12
+++ microcode_ctl.init	22 Feb 2008 20:01:12 -0000	1.13
@@ -16,7 +16,7 @@
 ARGUMENTS=-Qu
 RETVAL=0
 PROGRAM=/sbin/microcode_ctl
-DATAFILE=/etc/firmware/microcode.dat
+DATAFILE=/lib/firmware/microcode.dat
 
 . /etc/init.d/functions
 

microcode_ctl.patch:

Index: microcode_ctl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/microcode_ctl.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- microcode_ctl.patch	8 Feb 2008 02:36:06 -0000	1.8
+++ microcode_ctl.patch	22 Feb 2008 20:01:12 -0000	1.9
@@ -8,7 +8,7 @@
 -MANDIR		= $(PREFIX)/man/man8
 -MICDIR		= /etc
 +MANDIR		= $(PREFIX)/share/man/man8
-+MICDIR		= /etc/firmware
++MICDIR		= /lib/firmware
  
  RCFILE		= microcode_ctl.start
  RCFILEFINAL	= microcode_ctl
@@ -29,7 +29,7 @@
  
  #define MICROCODE_DEVICE_DEFAULT	"/dev/cpu/microcode"
 -#define MICROCODE_FILE_DEFAULT		"/etc/microcode.dat"
-+#define MICROCODE_FILE_DEFAULT		"/etc/firmware/microcode.dat"
++#define MICROCODE_FILE_DEFAULT		"/lib/firmware/microcode.dat"
  
  static void usage(void)
  {


Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/microcode_ctl.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- microcode_ctl.spec	13 Feb 2008 15:35:35 -0000	1.40
+++ microcode_ctl.spec	22 Feb 2008 20:01:12 -0000	1.41
@@ -36,10 +36,10 @@
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
-     INSDIR=/sbin MANDIR=%{_mandir}/man8 RCDIR=%{_sysconfdir} MICDIR=%{_sysconfdir}/firmware install clean
+     INSDIR=/sbin MANDIR=%{_mandir}/man8 install clean
 
 install %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/microcode_ctl
-install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/firmware/microcode.dat
+install -m 644 %{SOURCE2} %{buildroot}/lib/firmware/microcode.dat
 
 chmod -R a-s %{buildroot}
 
@@ -49,7 +49,7 @@
 %files
 %defattr(-,root,root)
 %{_sysconfdir}/init.d/microcode_ctl
-%{_sysconfdir}/firmware/*
+/lib/firmware/*
 /sbin/microcode_ctl
 %attr(0644,root,root) %{_mandir}/*/*
 
@@ -78,6 +78,9 @@
 exit 0
 
 %changelog
+* Fri Feb 22 2008 Jarod Wilson <jwilson at redhat.com>
+- Use /lib/firmware instead of /etc/firmware
+
 * Wed Feb 13 2008 Jarod Wilson <jwilson at redhat.com>
 - Fix permissions on microcode.dat