rpms/mkinitrd/F-9 mkinitrd-lib-firmware.patch, NONE, 1.1 mkinitrd.spec, 1.272, 1.273

[Dennis Gilmore]

Author: ausil

Update of /cvs/pkgs/rpms/mkinitrd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13497

Modified Files:
	mkinitrd.spec 
Added Files:
	mkinitrd-lib-firmware.patch 
Log Message:
 backport patch to put firmware in /lib/firmware  not /firmware in the initrd


mkinitrd-lib-firmware.patch:

--- NEW FILE mkinitrd-lib-firmware.patch ---
--- mkinitrd-6.0.52/mkinitrd.BAD	2008-12-12 17:37:51.000000000 -0600
+++ mkinitrd-6.0.52/mkinitrd	2008-12-12 17:38:31.000000000 -0600
@@ -1410,7 +1410,7 @@
 fi
 
 mkdir -p $MNTIMAGE
-mkdir -p $MNTIMAGE/firmware
+mkdir -p $MNTIMAGE/lib/firmware
 mkdir -p $MNTIMAGE/lib/modules/$kernel
 mkdir -p $MNTIMAGE/bin
 mkdir -p $MNTIMAGE/etc
@@ -1446,7 +1446,7 @@
     fi
     for fw in $(/sbin/modinfo -F firmware $MODULE 2>/dev/null); do
         if [ -f /lib/firmware/$fw ]; then
-            inst "/lib/firmware/$fw" "$MNTIMAGE" "/firmware/$fw"
+            inst "/lib/firmware/$fw" "$MNTIMAGE" "/lib/firmware/$fw"
         fi
     done
 }


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/F-9/mkinitrd.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- mkinitrd.spec	6 May 2008 14:09:31 -0000	1.272
+++ mkinitrd.spec	12 Dec 2008 23:48:46 -0000	1.273
@@ -3,10 +3,11 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.52
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
+Patch0:  mkinitrd-lib-firmware.patch
 ExclusiveOs: Linux
 Prereq: dev
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
@@ -67,6 +68,7 @@
 
 %prep
 %setup -q -n mkinitrd-%{version}
+%patch0 -p1 
 find . -name "Makefile*" -exec sed -i 's|-Werror||g' {} \;
 
 %build
@@ -120,6 +122,10 @@
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Fri Dec 12 2008 Dennis Gilmore <dennis at ausil.us> - 6.0.52-3
+- pull a modified version of the patch from git to put the 
+- firmware in /lib/firmware not /firmware.
+
 * Tue May  6 2008 Jeremy Katz <katzj at redhat.com> - 6.0.52-2
 - Require isomd5sum so that live images can be verified (#445284)