- update to latest upstream for radeon ni/cayman, drop nouveau fw we don't use it anymore
This commit is contained in:
parent
34e8bd97f3
commit
346692284d
1
.gitignore
vendored
1
.gitignore
vendored
@ -5,3 +5,4 @@ radeon-rlc-firmware-1.tar.bz2
|
|||||||
radeon-firmware-1.tar.bz2
|
radeon-firmware-1.tar.bz2
|
||||||
radeon-firmware-2.tar.bz2
|
radeon-firmware-2.tar.bz2
|
||||||
linux-firmware-20100806.tar.bz2
|
linux-firmware-20100806.tar.bz2
|
||||||
|
/linux-firmware-20110304.tar.bz2
|
||||||
|
@ -1,16 +1,13 @@
|
|||||||
%define nvfw nouveau-firmware-1
|
|
||||||
|
|
||||||
Name: linux-firmware
|
Name: linux-firmware
|
||||||
Version: 20110125
|
Version: 20110304
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Firmware files used by the Linux kernel
|
Summary: Firmware files used by the Linux kernel
|
||||||
|
|
||||||
Group: System Environment/Kernel
|
Group: System Environment/Kernel
|
||||||
License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
|
License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
|
||||||
URL: http://www.kernel.org/
|
URL: http://www.kernel.org/
|
||||||
Source0: ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/%{name}-%{version}.tar.bz2
|
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)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0
|
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.
|
operate.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n linux-firmware-%{version} -b1
|
%setup -q -n linux-firmware-%{version}
|
||||||
|
|
||||||
tar -jxvf %{SOURCE2}
|
|
||||||
cd -
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Remove firmware shipped in separate packages already
|
# 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
|
cp -r * $RPM_BUILD_ROOT/lib/firmware
|
||||||
rm $RPM_BUILD_ROOT/lib/firmware/{WHENCE,LICENCE.*}
|
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
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
@ -63,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
/lib/firmware/*
|
/lib/firmware/*
|
||||||
|
|
||||||
%changelog
|
%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
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20110125-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user