From fd88e0dd3bec8dd971ac2d1afa0be1fe9112042d Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Fri, 22 Feb 2008 20:01:12 +0000
Subject: [PATCH] - Use /lib/firmware instead of /etc/firmware

---
 microcode_ctl.init  | 2 +-
 microcode_ctl.patch | 4 ++--
 microcode_ctl.spec  | 9 ++++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/microcode_ctl.init b/microcode_ctl.init
index 2944057..1acdebb 100755
--- a/microcode_ctl.init
+++ b/microcode_ctl.init
@@ -16,7 +16,7 @@ DEVICE=/dev/cpu/microcode
 ARGUMENTS=-Qu
 RETVAL=0
 PROGRAM=/sbin/microcode_ctl
-DATAFILE=/etc/firmware/microcode.dat
+DATAFILE=/lib/firmware/microcode.dat
 
 . /etc/init.d/functions
 
diff --git a/microcode_ctl.patch b/microcode_ctl.patch
index e6f7849..48a809c 100644
--- a/microcode_ctl.patch
+++ b/microcode_ctl.patch
@@ -8,7 +8,7 @@ diff -Naurp microcode_ctl-1.17.orig/Makefile microcode_ctl-1.17/Makefile
 -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 @@ diff -Naurp microcode_ctl-1.17.orig/microcode_ctl.c microcode_ctl-1.17/microcode
  
  #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)
  {
diff --git a/microcode_ctl.spec b/microcode_ctl.spec
index ddfa930..1cb5492 100644
--- a/microcode_ctl.spec
+++ b/microcode_ctl.spec
@@ -36,10 +36,10 @@ mkdir -p %{buildroot}/usr/share/man/man{1,8}
 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 @@ chmod -R a-s %{buildroot}
 %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 @@ family=`cat /proc/cpuinfo | grep "^cpu family" | sort -u | awk -F ": " '{ print
 exit 0
 
 %changelog
+* Fri Feb 22 2008 Jarod Wilson <jwilson@redhat.com>
+- Use /lib/firmware instead of /etc/firmware
+
 * Wed Feb 13 2008 Jarod Wilson <jwilson@redhat.com>
 - Fix permissions on microcode.dat