From 3bcd13b1f018d813042d01b8b9d3267ef8fb7291 Mon Sep 17 00:00:00 2001 From: Matt Domsch Date: Dec 13 2010 19:23:29 +0000 Subject: finish merge --- diff --git a/.gitignore b/.gitignore index 2643ff4..913f4cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -biosdevname-0.2.4.tar.gz +biosdevname-0.3.3.tar.gz diff --git a/biosdevname-0.2.4-policy.patch b/biosdevname-0.2.4-policy.patch deleted file mode 100644 index c421b87..0000000 --- a/biosdevname-0.2.4-policy.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- biosdevname-0.2.4/biosdevname.rules.in.orig 2008-05-06 15:15:45.000000000 -0500 -+++ biosdevname-0.2.4/biosdevname.rules.in 2008-05-06 15:16:02.000000000 -0500 -@@ -2,6 +2,6 @@ - ACTION!="add", GOTO="biosdevname_end" - NAME=="?*", GOTO="biosdevname_end" - --PROGRAM="/sbin/biosdevname --policy=all_ethN -i %k", ENV{INTERFACE_NAME}="%c" -+PROGRAM="/sbin/biosdevname --policy=all_names -i %k", ENV{INTERFACE_NAME}="%c" - - LABEL="biosdevname_end" diff --git a/biosdevname.spec b/biosdevname.spec index 6a18ad2..053125c 100644 --- a/biosdevname.spec +++ b/biosdevname.spec @@ -1,15 +1,14 @@ Name: biosdevname -Version: 0.2.4 -Release: 7%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Summary: Udev helper for naming devices per BIOS names Group: System Environment/Base License: GPLv2 URL: http://linux.dell.com/files/%{name} -# SMBIOS and PCI IRQ Routing Tables only exist on these arches. It's -# also likely that other arches don't expect the PCI bus to be sorted -# breadth-first, or of so, there haven't been any comments about that -# on LKML. +# SMBIOS only exists on these arches. It's also likely that other +# arches don't expect the PCI bus to be sorted breadth-first, or of +# so, there haven't been any comments about that on LKML. ExclusiveArch: %{ix86} x86_64 ia64 Source0: http://linux.dell.com/files/%{name}/permalink/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -17,10 +16,7 @@ BuildRequires: pciutils-devel, zlib-devel # to figure out how to name the rules file BuildRequires: udev # for ownership of /etc/udev/rules.d -# releases after 115-3.20070920.git have the proper write_net_rules and 75-persistent-net-names.rules files -Requires: udev > 115-3.20070920git - -Patch0: biosdevname-0.2.4-policy.patch +Requires: udev %description biosdevname in its simplest form takes a kernel device name as an @@ -31,7 +27,6 @@ name (e.g. eth0). %prep %setup -q -%patch0 -p1 %build # this is a udev rule, so it needs to live in / rather than /usr @@ -41,7 +36,7 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +make install install-data DESTDIR=%{buildroot} rm %{buildroot}/sbin/%{name}S || : %clean @@ -51,11 +46,30 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc COPYING README /sbin/%{name} -%config(noreplace) %{_sysconfdir}/udev/rules.d/*%{name}.rules +%config(noreplace) %{_sysconfdir}/udev/rules.d/*.rules %{_mandir}/man1/%{name}.1* %changelog +* Thu Dec 9 2010 Matt Domsch - 0.3.3-1 +- add back in use of PCI IRQ Routing Table, if info is not provided by + sysfs or SMBIOS + +* Thu Dec 2 2010 Matt Domsch - 0.3.2-1 +- fix for multi-port cards with bridges +- removal of code for seriously obsolete systems + +* Mon Nov 28 2010 Matt Domsch 0.3.1-1 +- remove all policies except 'physical' and 'all_ethN' +- handle SR-IOV devices properly + +* Wed Nov 10 2010 Matt Domsch 0.3.0-1 +- add --policy=loms, make it default +- read index and labels from sysfs if available + +* Mon Jul 27 2009 Jordan Hargrave 0.2.5-1 +- fix mmap error checking + * Fri Jul 24 2009 Fedora Release Engineering - 0.2.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild @@ -70,7 +84,7 @@ rm -rf %{buildroot} * Fri Sep 21 2007 Matt Domsch 0.2.4-3 - fix manpage entry in files - + * Fri Sep 21 2007 Matt Domsch 0.2.4-2 - rebuild with Requires: udev > 115-3.20070920git diff --git a/sources b/sources index 17c9798..855ca8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4368a5bc158ea3de8d8947ab9ae2285 biosdevname-0.2.4.tar.gz +529fc1dd953d132a38b3f92861c6390c biosdevname-0.3.3.tar.gz