diff options
| author | cvs2git | 2003-07-12 22:54:25 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | dbdf2671523e92a16645ea5a75da64e24b8931cf (patch) | |
| tree | b5bc11be2e70dfa05acac5219e9408ded10b4803 | |
| parent | 7efa3d05d204e8343cea778fa3711bcbfdb9b2f1 (diff) | |
| download | pciutils-RA-branch.zip pciutils-RA-branch.tar.gz | |
This commit was manufactured by cvs2git to create branch 'RA-branch'.RA-branch
Sprout from master 2003-07-12 22:54:25 UTC grzegol <grzegol@pld-linux.org> '- adds pcimodules utility, which loads all kernel modules for PCI device'
Cherrypick from master 2001-11-04 18:43:50 UTC areq <areq@pld-linux.org> '- 2.1.9':
pciutils-FHS.patch -> 1.6
Cherrypick from master 2002-12-18 23:12:04 UTC ankry <ankry@pld-linux.org> '9d3f7e0b1b8165aa8a33bcf93efd2f2b pciutils-pci.ids_in_etc.patch':
pciutils-pci.ids_in_etc.patch -> 1.1
| -rw-r--r-- | pciutils-FHS.patch | 12 | ||||
| -rw-r--r-- | pciutils-pci.ids_in_etc.patch | 31 |
2 files changed, 43 insertions, 0 deletions
diff --git a/pciutils-FHS.patch b/pciutils-FHS.patch new file mode 100644 index 0000000..f159f52 --- /dev/null +++ b/pciutils-FHS.patch @@ -0,0 +1,12 @@ +diff -Nru pciutils-2.1.8/lib/configure pciutils-2.1.8.new/lib/configure +--- pciutils-2.1.8/lib/configure Fri Apr 21 13:32:26 2000 ++++ pciutils-2.1.8.new/lib/configure Sun May 21 00:11:53 2000 +@@ -80,7 +80,7 @@ + if [ -z "$ok" ] ; then + echo "WARNING: No real configuration access method is available." + fi +-echo >>$c "#define PATH_PCI_IDS \"$prefix/share/pci.ids\"" ++echo >>$c "#define PATH_PCI_IDS \"$prefix/share/misc/pci.ids\"" + if [ -f header.h ] ; then + echo >>$c '#define HAVE_OWN_HEADER_H' + fi diff --git a/pciutils-pci.ids_in_etc.patch b/pciutils-pci.ids_in_etc.patch new file mode 100644 index 0000000..5c0c8b8 --- /dev/null +++ b/pciutils-pci.ids_in_etc.patch @@ -0,0 +1,31 @@ +--- pciutils-2.1.10/Makefile~ Wed Dec 18 23:41:44 2002 ++++ pciutils-2.1.10/Makefile Wed Dec 18 23:41:44 2002 +@@ -63,14 +63,15 @@ + # -c is ignored on Linux, but required on FreeBSD + $(DIRINSTALL) -m 755 $(ROOT)/sbin $(PREFIX)/share $(MANDIR)/man8 + $(INSTALL) -c -m 755 -s lspci setpci $(ROOT)/sbin +- if [ ! -f $(PREFIX)/share/pci.ids -o pci.ids -nt $(PREFIX)/share/pci.ids ] ; then \ ++ if [ ! -f $(ROOT)/etc/pci.ids -o pci.ids -nt $(ROOT)/etc/pci.ids ] ; then \ + $(INSTALL) -c -m 644 pci.ids $(PREFIX)/share ; \ +- elif [ -f $(PREFIX)/share/pci.ids ] ; then \ +- echo "$(PREFIX)/share/pci.ids is same or newer than the version to be installed, skipping." ; \ ++ elif [ -f $(ROOT)/etc/pci.ids ] ; then \ ++ echo "$(ROOT)/etc/pci.ids is same or newer than the version to be installed, skipping." ; \ + fi + $(INSTALL) -c -m 644 lspci.8 setpci.8 $(MANDIR)/man8 + # Remove relics from old versions +- rm -f $(ROOT)/etc/pci.ids ++ rm -f $(PREFIX)/share/pci.ids ++ rm -f $(PREFIX)/share/misc/pci.ids + + install-devel: all + install -d -m 755 $(DESTDIR)$(includedir)/pci $(DESTDIR)$(libdir) +@@ -79,7 +80,7 @@ + + uninstall: all + rm -f $(ROOT)/sbin/lspci $(ROOT)/sbin/setpci +- rm -f $(PREFIX)/share/pci.ids ++ rm -f (ROOT)/etc/pci.ids + rm -f $(PREFIX)/man/man8/lspci.8 $(PREFIX)/man/man8/setpci.8 + + update-ids: |