From c74e28f580e44084bea4ea92b37c56d7d1181afb Mon Sep 17 00:00:00 2001 From: Maxim Uvarov Date: Fri, 2 Dec 2011 16:03:06 -0800 Subject: [PATCH] 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 --- uek-rpm/ol5/kernel-uek.spec | 4 ++-- uek-rpm/ol6/kernel-uek.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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} -- 2.50.1