From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Sat, 3 Dec 2011 00:03:06 +0000 (-0800)
Subject: put firmware to kernel version specific location
X-Git-Tag: v2.6.39-400.9.0~839
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c74e28f580e44084bea4ea92b37c56d7d1181afb;p=users%2Fjedix%2Flinux-maple.git

put firmware to kernel version specific location

Orabug: 13254457
By default firmware loaded with priorities from this folders:
/lib/udev/firmware.sh:
FIRMWARE_DIRS="/lib/firmware/updates/$(uname -r) /lib/firmware/updates \
                /lib/firmware/$(uname -r) /lib/firmware"

Place firmware to /lib/firmware/$(uname -r) instead of /lib/firmware
to avoid collisions between different firmware versions.

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
---

diff --git a/uek-rpm/ol5/kernel-uek.spec b/uek-rpm/ol5/kernel-uek.spec
index 16af2d357f28..e3da0041cc62 100644
--- a/uek-rpm/ol5/kernel-uek.spec
+++ b/uek-rpm/ol5/kernel-uek.spec
@@ -1401,9 +1401,9 @@ rm -rf $RPM_BUILD_ROOT/usr/include/drm
 %endif
 
 %if %{with_firmware}
-mkdir -p $RPM_BUILD_ROOT/lib/firmware
+mkdir -p $RPM_BUILD_ROOT/lib/firmware/%{rpmversion}-%{pkg_release}
 Arch=`head -n 3 .config |grep -e "Linux.*Kernel" |cut -d '/' -f 2 | cut -d ' ' -f 1`
-make ARCH=$Arch INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
+make ARCH=$Arch INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware/%{rpmversion}-%{pkg_release} firmware_install
 %endif
 
 %if %{with_bootwrapper}
diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index c9382c5795c6..d52a2e28c81a 100644
--- a/uek-rpm/ol6/kernel-uek.spec
+++ b/uek-rpm/ol6/kernel-uek.spec
@@ -1413,9 +1413,9 @@ rm -rf $RPM_BUILD_ROOT/usr/include/drm
 %endif
 
 %if %{with_firmware}
-mkdir -p $RPM_BUILD_ROOT/lib/firmware
+mkdir -p $RPM_BUILD_ROOT/lib/firmware/%{rpmversion}-%{pkg_release}
 Arch=`head -n 3 .config |grep -e "Linux.*Kernel" |cut -d '/' -f 2 | cut -d ' ' -f 1`
-make ARCH=$Arch INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
+make ARCH=$Arch INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware/%{rpmversion}-%{pkg_release} firmware_install
 %endif
 
 %if %{with_bootwrapper}