From fb38eee88d9cf4abd3dcb14edabb87dc8d6b09f4 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Mon, 9 Feb 1998 12:32:50 +0000 Subject: [PATCH] - Include pci.h in full distribution and use it instead of when available. This should work-around all problems with Linus not synchronized with our PCI development. - Fixed few cosmetic bugs (version in man pages etc.) - Released as version 1.01. --- ChangeLog | 10 ++++++++++ Makefile | 12 ++++++++---- README | 2 +- lspci.8 | 2 +- lspci.c | 3 +-- pciutils.h | 8 +++++++- pciutils.lsm | 8 ++++---- 7 files changed, 32 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index e18cf27..7206ced 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon Feb 9 13:17:43 1998 Martin Mares + + * Makefile, pciutils.h: Include local pci.h instead of + if available. This should avoid all problems with official kernel + not synchronized to newer PCI code in CVS -- standard distribution + of pciutils now contains pci.h from current CVS kernel, pciutils + in CVS contain no pci.h and use the correct kernel include. + + * Makefile: Fixed installation path for man pages. + Sat Feb 7 15:15:46 1998 Martin Mares * README: Updated. diff --git a/Makefile b/Makefile index 323e700..7dbdb1e 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,14 @@ -# $Id: Makefile,v 1.5 1998/02/08 10:58:52 mj Exp $ +# $Id: Makefile,v 1.6 1998/02/09 12:32:52 mj Exp $ # Makefile for Linux PCI Utilities # (c) 1998 Martin Mares ARCH=$(shell uname -m | sed -e 's/i.86/i386/' -e 's/sun4u/sparc64/' | tr 'a-z' 'A-Z') +KERN_H=$(shell if [ ! -f pci.h ] ; then echo '-DKERNEL_PCI_H' ; fi) OPT=-O2 -fomit-frame-pointer -CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wno-unused -Werror -DARCH_$(ARCH) +CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wno-unused -Werror -DARCH_$(ARCH) $(KERN_H) PREFIX=/ +MANPREFIX=/usr all: lspci @@ -17,12 +19,14 @@ names.o: names.c pciutils.h clean: rm -f `find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core` - rm -f lspci + rm -f lspci pci.h install: all install -o root -g root -m 755 -s lspci $(PREFIX)/sbin install -o root -g root -m 644 pci.ids $(PREFIX)/etc - install -o root -g root -m 644 lspci.8 $(PREFIX)/man/man8 + install -o root -g root -m 644 lspci.8 $(MANPREFIX)/man/man8 dist: clean + cp /usr/src/linux/include/linux/pci.h . sh -c 'X=`pwd` ; X=`basename $$X` ; cd .. ; tar czvvf /tmp/$$X.tar.gz $$X --exclude CVS --exclude tmp' + rm -f pci.h diff --git a/README b/README index 5c47c72..0c50684 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -This package contains the Linux PCI Utilities, version 1.0. +This package contains the Linux PCI Utilities, version 1.01. Copyright (c) 1998 Martin Mares diff --git a/lspci.8 b/lspci.8 index 91a483e..954f7e8 100644 --- a/lspci.8 +++ b/lspci.8 @@ -1,4 +1,4 @@ -.TH lspci 8 "7 February 98" "pciutils-0.92" "Linux PCI Utilities" +.TH lspci 8 "9 February 98" "pciutils-1.01" "Linux PCI Utilities" .IX lspci .SH NAME lspci \- list all PCI devices diff --git a/lspci.c b/lspci.c index 2dc6ae4..fc2db61 100644 --- a/lspci.c +++ b/lspci.c @@ -1,5 +1,5 @@ /* - * $Id: lspci.c,v 1.6 1998/02/08 10:58:54 mj Exp $ + * $Id: lspci.c,v 1.7 1998/02/09 12:32:54 mj Exp $ * * Linux PCI Utilities -- List All PCI Devices * @@ -13,7 +13,6 @@ #include #include #include -#include #include "pciutils.h" diff --git a/pciutils.h b/pciutils.h index 2bfc63b..ddbf67b 100644 --- a/pciutils.h +++ b/pciutils.h @@ -1,5 +1,5 @@ /* - * $Id: pciutils.h,v 1.2 1998/01/27 11:50:13 mj Exp $ + * $Id: pciutils.h,v 1.3 1998/02/09 12:32:56 mj Exp $ * * Linux PCI Utilities -- Declarations * @@ -10,6 +10,12 @@ #include +#ifdef KERNEL_PCI_H +#include +#else +#include "pci.h" +#endif + #define PROC_BUS_PCI "/proc/bus/pci" #define ETC_PCI_IDS "/etc/pci.ids" diff --git a/pciutils.lsm b/pciutils.lsm index 7178cdd..7cada1b 100644 --- a/pciutils.lsm +++ b/pciutils.lsm @@ -1,7 +1,7 @@ Begin3 Title: Linux PCI Utilities -Version: 1.0 -Entered-date: 980207 +Version: 1.01 +Entered-date: 980209 Description: This package contains various utilities for inspecting and setting of devices connected to the PCI bus. Requires kernel version 2.1.82 or newer (supporting the /proc/bus/pci @@ -9,7 +9,7 @@ Description: This package contains various utilities for inspecting and Keywords: kernel, pci, proc, lspci Author: mj@atrey.karlin.mff.cuni.cz (Martin Mares) Maintained-by: mj@atrey.karlin.mff.cuni.cz (Martin Mares) -Primary-site: atrey.karlin.mff.cuni.cz pub/local/mj/linux/pciutils-1.0.tar.gz -Alternate-site: sunsite.unc.edu pub/Linux/system/hardware +Primary-site: atrey.karlin.mff.cuni.cz pub/local/mj/linux/pciutils-1.01.tar.gz +Alternate-site: sunsite.unc.edu pub/Linux/system/hardware/pciutils-1.01.tar.gz Copying-policy: GPL End -- 2.39.2