rpms/linux-firmware/devel .cvsignore, 1.2, 1.3 linux-firmware.spec, 1.1, 1.2 sources, 1.2, 1.3
Dave Airlie
airlied at fedoraproject.org
Tue Feb 9 01:54:49 UTC 2010
Author: airlied
Update of /cvs/pkgs/rpms/linux-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27794
Modified Files:
.cvsignore linux-firmware.spec sources
Log Message:
* Tue Feb 09 2010 Ben Skeggs <bskeggs at redhat.com> 20090106-2
- Add firmware needed for nouveau to operate correctly (this is Fedora
only - do not upstream yet - we just moved it here from Fedora kernel)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/linux-firmware/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 7 Jan 2010 02:00:34 -0000 1.2
+++ .cvsignore 9 Feb 2010 01:54:49 -0000 1.3
@@ -1 +1,2 @@
linux-firmware-20100106.tar.bz2
+nouveau-firmware-1.tar.bz2
Index: linux-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linux-firmware/devel/linux-firmware.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-firmware.spec 7 Jan 2010 02:00:34 -0000 1.1
+++ linux-firmware.spec 9 Feb 2010 01:54:49 -0000 1.2
@@ -1,12 +1,15 @@
+%define nvfw nouveau-firmware-1
+
Name: linux-firmware
Version: 20100106
-Release: 1%{?dist}
+Release: 2%{?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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Provides: kernel-firmware = %{version}
@@ -18,7 +21,7 @@ Kernel-firmware includes firmware files
operate.
%prep
-%setup -q -n linux-firmware-%{version}
+%setup -q -n linux-firmware-%{version} -b1
%build
@@ -41,6 +44,11 @@ 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
@@ -51,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
/lib/firmware/*
%changelog
+* Tue Feb 09 2010 Ben Skeggs <bskeggs at redhat.com> 20090106-2
+- Add firmware needed for nouveau to operate correctly (this is Fedora
+ only - do not upstream yet - we just moved it here from Fedora kernel)
+
* Wed Jan 06 2010 David Woodhouse <David.Woodhouse at intel.com> 20090106-1
- Update
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linux-firmware/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 7 Jan 2010 02:00:34 -0000 1.2
+++ sources 9 Feb 2010 01:54:49 -0000 1.3
@@ -1 +1,2 @@
9c34690e02b5a284a546c0aae7ef0599 linux-firmware-20100106.tar.bz2
+554e432993f138bd5c6704dbca109d71 nouveau-firmware-1.tar.bz2
More information about the scm-commits
mailing list