rpms/pciutils/devel .cvsignore, 1.8, 1.9 pciutils-devicetype.patch, 1.1, 1.2 pciutils-strip.patch, 1.6, 1.7 pciutils.spec, 1.32, 1.33 sources, 1.8, 1.9 pciutils-domain.patch, 1.1, NONE pciutils-pciids.patch, 1.4, NONE pciutils-typo.patch, 1.1, NONE pciutils-x86_64.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Dec 13 22:27:27 UTC 2005 

Author: notting

Update of /cvs/dist/rpms/pciutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25427

Modified Files:
	.cvsignore pciutils-devicetype.patch pciutils-strip.patch 
	pciutils.spec sources 
Removed Files:
	pciutils-domain.patch pciutils-pciids.patch 
	pciutils-typo.patch pciutils-x86_64.patch 
Log Message:
update to 2.2.1, adjust patches



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Sep 2004 10:04:02 -0000	1.8
+++ .cvsignore	13 Dec 2005 22:27:24 -0000	1.9
@@ -1 +1 @@
-pciutils-2.1.99-test8.tar.gz
+pciutils-2.2.1.tar.gz

pciutils-devicetype.patch:
 lib/example.c |    2 +-
 lib/generic.c |    5 ++++-
 lib/pci.h     |    2 ++
 lib/sysfs.c   |    5 ++---
 lspci.c       |   14 +++++++-------
 5 files changed, 16 insertions(+), 12 deletions(-)

Index: pciutils-devicetype.patch
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/pciutils-devicetype.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pciutils-devicetype.patch	9 Sep 2004 10:04:15 -0000	1.1
+++ pciutils-devicetype.patch	13 Dec 2005 22:27:24 -0000	1.2
@@ -1,18 +1,44 @@
-diff -ru pciutils-2.1.99-test8/lib/example.c pciutils/lib/example.c
---- pciutils-2.1.99-test8/lib/example.c	2000-03-09 03:38:33.000000000 -0500
-+++ pciutils/lib/example.c	2004-09-02 18:06:58.000000000 -0400
-@@ -21,7 +21,7 @@
-   pci_scan_bus(pacc);		/* We want to get the list of devices */
-   for(dev=pacc->devices; dev; dev=dev->next)	/* Iterate over all devices */
-     {
--      pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_BASES);	/* Fill in header info we need */
-+      pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_BASES | PCI_FILL_CLASS);	/* Fill in header info we need */
-       c = pci_read_word(dev, PCI_CLASS_DEVICE);	/* Read config register directly */
-       printf("%02x:%02x.%d vendor=%04x device=%04x class=%04x irq=%d base0=%lx\n",
- 	     dev->bus, dev->dev, dev->func, dev->vendor_id, dev->device_id,
-diff -ru pciutils-2.1.99-test8/lib/generic.c pciutils/lib/generic.c
---- pciutils-2.1.99-test8/lib/generic.c	2004-08-13 16:15:23.000000000 -0400
-+++ pciutils/lib/generic.c	2004-09-02 18:06:41.000000000 -0400
+--- pciutils-2.2.1/lib/sysfs.c.devicetype	2005-09-21 07:51:00.000000000 -0400
++++ pciutils-2.2.1/lib/sysfs.c	2005-12-13 17:02:12.000000000 -0500
+@@ -164,7 +164,6 @@
+ 	  sysfs_get_resources(d);
+ 	  d->irq = sysfs_get_value(d, "irq");
+ 	  d->known_fields = PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE | PCI_FILL_SIZES;
+-#if 0
+ 	  /*
+ 	   *  We prefer reading these from the config registers, it's faster.
+ 	   *  However, it would be possible and maybe even useful to hack the kernel
+@@ -173,8 +172,8 @@
+ 	   */
+ 	  d->vendor_id = sysfs_get_value(d, "vendor");
+ 	  d->device_id = sysfs_get_value(d, "device");
+-	  d->known_fields |= PCI_FILL_IDENT;
+-#endif
++	  d->device_class = sysfs_get_value(d, "class") >> 8;
++	  d->known_fields |= PCI_FILL_IDENT | PCI_FILL_CLASS;
+ 	}
+       pci_link_dev(a, d);
+     }
+--- pciutils-2.2.1/lib/pci.h.devicetype	2005-09-10 08:10:54.000000000 -0400
++++ pciutils-2.2.1/lib/pci.h	2005-12-13 17:02:12.000000000 -0500
+@@ -84,6 +84,7 @@
+   /* These fields are set by pci_fill_info() */
+   int known_fields;			/* Set of info fields already known */
+   u16 vendor_id, device_id;		/* Identity of the device */
++  u16 device_class;			/* PCI device class */
+   int irq;				/* IRQ number */
+   pciaddr_t base_addr[6];		/* Base addresses */
+   pciaddr_t size[6];			/* Region sizes */
+@@ -118,6 +119,7 @@
+ #define PCI_FILL_BASES		4
+ #define PCI_FILL_ROM_BASE	8
+ #define PCI_FILL_SIZES		16
++#define PCI_FILL_CLASS		32
+ #define PCI_FILL_RESCAN		0x10000
+ 
+ void pci_setup_cache(struct pci_dev *, u8 *cache, int len);
+--- pciutils-2.2.1/lib/generic.c.devicetype	2004-08-13 16:15:23.000000000 -0400
++++ pciutils-2.2.1/lib/generic.c	2005-12-13 17:02:12.000000000 -0500
 @@ -46,7 +46,8 @@
  	  d->func = t->func;
  	  d->vendor_id = vd & 0xffff;
@@ -32,78 +58,47 @@
    if (flags & PCI_FILL_IRQ)
      d->irq = pci_read_byte(d, PCI_INTERRUPT_LINE);
    if (flags & PCI_FILL_BASES)
-diff -ru pciutils-2.1.99-test8/lib/pci.h pciutils/lib/pci.h
---- pciutils-2.1.99-test8/lib/pci.h	2004-08-13 16:56:24.000000000 -0400
-+++ pciutils/lib/pci.h	2004-09-02 18:06:26.000000000 -0400
-@@ -83,6 +83,7 @@
-   /* These fields are set by pci_fill_info() */
-   int known_fields;			/* Set of info fields already known */
-   u16 vendor_id, device_id;		/* Identity of the device */
-+  u16 device_class;			/* PCI device class */
-   int irq;				/* IRQ number */
-   pciaddr_t base_addr[6];		/* Base addresses */
-   pciaddr_t size[6];			/* Region sizes */
-@@ -117,6 +118,7 @@
- #define PCI_FILL_BASES		4
- #define PCI_FILL_ROM_BASE	8
- #define PCI_FILL_SIZES		16
-+#define PCI_FILL_CLASS		32
- #define PCI_FILL_RESCAN		0x10000
- 
- void pci_setup_cache(struct pci_dev *, u8 *cache, int len);
-diff -ru pciutils-2.1.99-test8/lib/sysfs.c pciutils/lib/sysfs.c
---- pciutils-2.1.99-test8/lib/sysfs.c	2004-08-13 16:14:24.000000000 -0400
-+++ pciutils/lib/sysfs.c	2004-09-02 18:07:48.000000000 -0400
-@@ -170,7 +170,6 @@
- 	  sysfs_get_resources(d);
- 	  d->irq = sysfs_get_value(d, "irq");
- 	  d->known_fields = PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE | PCI_FILL_SIZES;
--#if 0
- 	  /*
- 	   *  We prefer reading these from the config registers, it's faster.
- 	   *  However, it would be possible and maybe even useful to hack the kernel
-@@ -179,8 +178,8 @@
- 	   */
- 	  d->vendor_id = sysfs_get_value(d, "vendor");
- 	  d->device_id = sysfs_get_value(d, "device");
--	  d->known_fields |= PCI_FILL_IDENT;
--#endif
-+	  d->device_class = sysfs_get_value(d, "class") >> 8;
-+	  d->known_fields |= PCI_FILL_IDENT | PCI_FILL_CLASS;
- 	}
-       pci_link_dev(a, d);
-     }
-diff -ru pciutils-2.1.99-test8/lspci.c pciutils/lspci.c
---- pciutils-2.1.99-test8/lspci.c	2004-08-13 15:49:02.000000000 -0400
-+++ pciutils/lspci.c	2004-09-02 18:08:13.000000000 -0400
-@@ -110,7 +110,7 @@
- 	die("Unable to read cardbus bridge extension data.");
+--- pciutils-2.2.1/lib/example.c.devicetype	2000-03-09 03:38:33.000000000 -0500
++++ pciutils-2.2.1/lib/example.c	2005-12-13 17:02:12.000000000 -0500
+@@ -21,7 +21,7 @@
+   pci_scan_bus(pacc);		/* We want to get the list of devices */
+   for(dev=pacc->devices; dev; dev=dev->next)	/* Iterate over all devices */
+     {
+-      pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_BASES);	/* Fill in header info we need */
++      pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_BASES | PCI_FILL_CLASS);	/* Fill in header info we need */
+       c = pci_read_word(dev, PCI_CLASS_DEVICE);	/* Read config register directly */
+       printf("%02x:%02x.%d vendor=%04x device=%04x class=%04x irq=%d base0=%lx\n",
+ 	     dev->bus, dev->dev, dev->func, dev->vendor_id, dev->device_id,
+--- pciutils-2.2.1/lspci.c.devicetype	2005-11-26 06:48:29.000000000 -0500
++++ pciutils-2.2.1/lspci.c	2005-12-13 17:04:39.000000000 -0500
+@@ -123,7 +123,7 @@
+ 	d->config_cached += 64;
      }
-   pci_setup_cache(p, d->config, d->config_cnt);
+   pci_setup_cache(p, d->config, d->config_cached);
 -  pci_fill_info(p, PCI_FILL_IDENT | PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE | PCI_FILL_SIZES);
 +  pci_fill_info(p, PCI_FILL_IDENT | PCI_FILL_CLASS | PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE | PCI_FILL_SIZES);
    return d;
  }
  
-@@ -229,7 +229,7 @@
+@@ -255,7 +255,7 @@
    printf(" %s: %s",
  	 pci_lookup_name(pacc, classbuf, sizeof(classbuf),
  			 PCI_LOOKUP_CLASS,
--			 get_conf_word(d, PCI_CLASS_DEVICE), 0, 0, 0),
-+			 p->device_class, 0, 0, 0),
+-			 get_conf_word(d, PCI_CLASS_DEVICE)),
++			 p->device_class),
  	 pci_lookup_name(pacc, devbuf, sizeof(devbuf),
  			 PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
- 			 p->vendor_id, p->device_id, 0, 0));
-@@ -241,7 +241,7 @@
+ 			 p->vendor_id, p->device_id));
+@@ -267,7 +267,7 @@
        c = get_conf_byte(d, PCI_CLASS_PROG);
        x = pci_lookup_name(pacc, devbuf, sizeof(devbuf),
- 			  PCI_LOOKUP_PROGIF,
--			  get_conf_word(d, PCI_CLASS_DEVICE), c, 0, 0);
-+			  p->device_class, c, 0, 0);
+ 			  PCI_LOOKUP_PROGIF | PCI_LOOKUP_NO_NUMBERS,
+-			  get_conf_word(d, PCI_CLASS_DEVICE), c);
++			  p->device_class, c);
        if (c || x)
  	{
  	  printf(" (prog-if %02x", c);
-@@ -1542,7 +1542,7 @@
+@@ -1585,7 +1585,7 @@
    struct pci_dev *p = d->dev;
    word status = get_conf_word(d, PCI_STATUS);
    word cmd = get_conf_word(d, PCI_COMMAND);
@@ -112,25 +107,25 @@
    byte bist = get_conf_byte(d, PCI_BIST);
    byte htype = get_conf_byte(d, PCI_HEADER_TYPE) & 0x7f;
    byte latency = get_conf_byte(d, PCI_LATENCY_TIMER);
-@@ -1735,7 +1735,7 @@
+@@ -1783,7 +1783,7 @@
        show_slot_name(d);
        putchar('\n');
        printf("Class:\t%s\n",
--	     pci_lookup_name(pacc, classbuf, sizeof(classbuf), PCI_LOOKUP_CLASS, get_conf_word(d, PCI_CLASS_DEVICE), 0, 0, 0));
-+	     pci_lookup_name(pacc, classbuf, sizeof(classbuf), PCI_LOOKUP_CLASS, p->device_class, 0, 0, 0));
+-	     pci_lookup_name(pacc, classbuf, sizeof(classbuf), PCI_LOOKUP_CLASS, get_conf_word(d, PCI_CLASS_DEVICE)));
++	     pci_lookup_name(pacc, classbuf, sizeof(classbuf), PCI_LOOKUP_CLASS, p->device_class));
        printf("Vendor:\t%s\n",
- 	     pci_lookup_name(pacc, vendbuf, sizeof(vendbuf), PCI_LOOKUP_VENDOR, p->vendor_id, p->device_id, 0, 0));
+ 	     pci_lookup_name(pacc, vendbuf, sizeof(vendbuf), PCI_LOOKUP_VENDOR, p->vendor_id, p->device_id));
        printf("Device:\t%s\n",
-@@ -1757,7 +1757,7 @@
+@@ -1805,7 +1805,7 @@
        show_slot_name(d);
        printf(" \"%s\" \"%s\" \"%s\"",
  	     pci_lookup_name(pacc, classbuf, sizeof(classbuf), PCI_LOOKUP_CLASS,
--			     get_conf_word(d, PCI_CLASS_DEVICE), 0, 0, 0),
-+			     p->device_class, 0, 0, 0),
+-			     get_conf_word(d, PCI_CLASS_DEVICE)),
++			     p->device_class),
  	     pci_lookup_name(pacc, vendbuf, sizeof(vendbuf), PCI_LOOKUP_VENDOR,
- 			     p->vendor_id, p->device_id, 0, 0),
+ 			     p->vendor_id, p->device_id),
  	     pci_lookup_name(pacc, devbuf, sizeof(devbuf), PCI_LOOKUP_DEVICE,
-@@ -1883,7 +1883,7 @@
+@@ -1929,7 +1929,7 @@
    last_br = &host_bridge.chain;
    for(d=first_dev; d; d=d->next)
      {

pciutils-strip.patch:
 pciutils-2.1.99-test3/Makefile |    2 +-
 pciutils-2.1.99-test8/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: pciutils-strip.patch
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/pciutils-strip.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pciutils-strip.patch	10 May 2005 19:27:00 -0000	1.6
+++ pciutils-strip.patch	13 Dec 2005 22:27:24 -0000	1.7
@@ -1,14 +1,5 @@
 --- pciutils-2.1.99-test3/Makefile.strip	2004-02-25 01:46:14.315787866 -0500
 +++ pciutils-2.1.99-test3/Makefile	2004-02-25 01:47:45.478046260 -0500
-@@ -1,7 +1,7 @@
- # Makefile for The PCI Utilities
- # (c) 1998--2003 Martin Mares <mj at ucw.cz>
- 
--OPT=-O2 -fomit-frame-pointer
-+OPT=-O2
- CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline
- 
- VERSION=2.1.99-test3
 @@ -32,7 +32,7 @@
  all: $(PCILIB) lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 pci.ids
  
@@ -23,9 +14,9 @@
 @@ -65,7 +65,7 @@
  install: all
  # -c is ignored on Linux, but required on FreeBSD
- 	$(DIRINSTALL) -m 755 $(SBINDIR) $(SHAREDIR) $(MANDIR)/man8
+ 	$(DIRINSTALL) -m 755 $(SBINDIR) $(IDSDIR) $(MANDIR)/man8
 -	$(INSTALL) -c -m 755 -s lspci setpci $(SBINDIR)
 +	$(INSTALL) -c -m 755 lspci setpci $(SBINDIR)
  	$(INSTALL) -c -m 755 update-pciids $(SBINDIR)
- 	$(INSTALL) -c -m 644 pci.ids $(SHAREDIR)
+ 	$(INSTALL) -c -m 644 pci.ids $(IDSDIR)
  	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(MANDIR)/man8


Index: pciutils.spec
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- pciutils.spec	9 Dec 2005 22:42:40 -0000	1.32
+++ pciutils.spec	13 Dec 2005 22:27:24 -0000	1.33
@@ -1,18 +1,12 @@
-%define testversion test8
-
 Name:		pciutils
-Version:	2.1.99.%{testversion}
-Release: 10.1
-Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/alpha/%{name}-2.1.99-%{testversion}.tar.gz
+Version:	2.2.1
+Release: 	1
+Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch0:		pciutils-strip.patch
-Patch1:		pciutils-pciids.patch
 Patch2:		pciutils-2.1.10-scan.patch
 Patch3: 	pciutils-havepread.patch
-Patch4:		pciutils-typo.patch
 Patch5:		pciutils-devicetype.patch
-Patch6:		pciutils-domain.patch
 Patch7:		pciutils-2.1.99-gcc4.patch
-Patch8:		pciutils-x86_64.patch
 License:	GPL
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 Buildroot: 	%{_tmppath}/%{name}-%{version}-root
@@ -36,19 +30,16 @@
 devices connected to the PCI bus.
 
 %prep
-%setup -q -n pciutils-2.1.99-%{testversion}
+%setup -q -n pciutils-%{version}
 %patch0 -p1 -b .strip
-%patch1 -p1 -b .pciids
 %patch2 -p1 -b .scan
 %patch3 -p1 -b .pread
-%patch4 -p1 -b .typo
 %patch5 -p1 -b .devicetype
-%patch6 -p1 -b .domain
 %patch7 -p1 -b .glibcmacros
-%patch8 -p1 -b .x86_64
 
 %build
-make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr"
+make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" IDSDIR="/usr/share/hwdata"
+
 
 %install
 rm -rf $RPM_BUILD_ROOT


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Sep 2004 10:04:02 -0000	1.8
+++ sources	13 Dec 2005 22:27:24 -0000	1.9
@@ -1 +1 @@
-d7ee9453cb67c32bf99f74bcbdd5d132  pciutils-2.1.99-test8.tar.gz
+c18e2a5f04e9abae5a42439de294f086  pciutils-2.2.1.tar.gz


--- pciutils-domain.patch DELETED ---


--- pciutils-pciids.patch DELETED ---


--- pciutils-typo.patch DELETED ---


--- pciutils-x86_64.patch DELETED ---

More information about the fedora-cvs-commits mailing list