- update to latest upstream for radeon ni/cayman, drop nouveau fw we don't use it anymore

This commit is contained in:
Dave Airlie 2011-03-10 10:38:37 +10:00
parent 34e8bd97f3
commit 346692284d
3 changed files with 8 additions and 17 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ radeon-rlc-firmware-1.tar.bz2
radeon-firmware-1.tar.bz2
radeon-firmware-2.tar.bz2
linux-firmware-20100806.tar.bz2
/linux-firmware-20110304.tar.bz2

View File

@ -1,16 +1,13 @@
%define nvfw nouveau-firmware-1
Name: linux-firmware
Version: 20110125
Release: 2%{?dist}
Version: 20110304
Release: 1%{?dist}
Summary: Firmware files used by the Linux kernel
Group: System Environment/Kernel
License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
URL: http://www.kernel.org/
Source0: ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/%{name}-%{version}.tar.bz2
Source1: %{nvfw}.tar.bz2
Source2: radeon-ni-fw.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0
@ -23,10 +20,7 @@ Kernel-firmware includes firmware files required for some devices to
operate.
%prep
%setup -q -n linux-firmware-%{version} -b1
tar -jxvf %{SOURCE2}
cd -
%setup -q -n linux-firmware-%{version}
%build
# Remove firmware shipped in separate packages already
@ -48,11 +42,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/firmware
cp -r * $RPM_BUILD_ROOT/lib/firmware
rm $RPM_BUILD_ROOT/lib/firmware/{WHENCE,LICENCE.*}
pushd ../%{nvfw}
mkdir -p $RPM_BUILD_ROOT/lib/firmware/nouveau
cp -a * $RPM_BUILD_ROOT/lib/firmware/nouveau
popd
%clean
rm -rf $RPM_BUILD_ROOT
@ -63,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
/lib/firmware/*
%changelog
* Thu Mar 10 2011 Dave Airlie <airlied@redhat.com> 20110304-1
- update to latest upstream for radeon ni/cayman, drop nouveau fw we don't use it anymore
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20110125-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

View File

@ -1,3 +1 @@
24e725e72a3a7708daf1dab1a6d102b8 linux-firmware-20110125.tar.bz2
554e432993f138bd5c6704dbca109d71 nouveau-firmware-1.tar.bz2
268e466b70f48ddf01297b18c99beb30 radeon-ni-fw.tar.bz2
2dc4f037f86ab49f55723e28eea64625 linux-firmware-20110304.tar.bz2