[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (538d57dd566299889c39ab17fdca21102c5e5867)

Ladislav Hagara scm at mail.sourcemage.org
Sun Sep 10 18:34:12 EDT 2006


GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara at unob.cz>:

 utils/pciutils/BUILD                     |    1 
 utils/pciutils/DETAILS                   |    4 -
 utils/pciutils/FINAL                     |    3 -
 utils/pciutils/HISTORY                   |    5 ++
 utils/pciutils/pciutils-devicetype.patch |   75 -------------------------------
 5 files changed, 9 insertions(+), 79 deletions(-)

New commits:
commit 538d57dd566299889c39ab17fdca21102c5e5867
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    pciutils 2.2.4

diff --git a/utils/pciutils/BUILD b/utils/pciutils/BUILD
index 588a99a..b96b8c4 100755
--- a/utils/pciutils/BUILD
+++ b/utils/pciutils/BUILD
@@ -1,6 +1,5 @@
 sedit  "s:/local::" Makefile                                  &&
 sedit  "s:PREFIX=/usr:PREFIX=${INSTALL_ROOT}/usr:"  Makefile  &&
-patch -p1 < $SCRIPT_DIRECTORY/pciutils-devicetype.patch &&
 
 cd  lib                              &&
 ./configure $INSTALL_ROOT/usr/share  &&
diff --git a/utils/pciutils/DETAILS b/utils/pciutils/DETAILS
index 171a1e3..a5ffeea 100755
--- a/utils/pciutils/DETAILS
+++ b/utils/pciutils/DETAILS
@@ -1,6 +1,6 @@
            SPELL=pciutils
-         VERSION=2.2.3
-     SOURCE_HASH=sha512:b5cdc50280e8c8f78a7b52a9a658a8bb8f1beef598fac174d78e1a416a459be9fab13fb0031c8f516523512168b82405f29612bbf766dbd7d34a9a8ba68c7d74
+         VERSION=2.2.4
+     SOURCE_HASH=sha512:709f1f15a8867bba745896f42dc57a71d39f17c2267db9f8c30b7fb21251657c0514d60bcb9b74c0f900d6794ea7ac4b9b1f824a8bc4af076c2f155f33fed924
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/$SOURCE
diff --git a/utils/pciutils/FINAL b/utils/pciutils/FINAL
index cbc7867..e3c6f24 100755
--- a/utils/pciutils/FINAL
+++ b/utils/pciutils/FINAL
@@ -1,3 +1,4 @@
-if  [  PCIUTILS_UPDATE  ==  "y"  ];  then
+if  [  $PCIUTILS_UPDATE  ==  "y"  ];  then
+  message "${MESSAGE_COLOR}Downloading the current snapshot of pci.ids...${DEFAULT_COLOR}"  &&
   /usr/sbin/update-pciids
 fi
diff --git a/utils/pciutils/HISTORY b/utils/pciutils/HISTORY
index 884835a..9ab2140 100644
--- a/utils/pciutils/HISTORY
+++ b/utils/pciutils/HISTORY
@@ -1,3 +1,8 @@
+2006-09-10 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.2.4
+	* BUILD, pciutils-devicetype.patch: removed patch
+	* FINAL: fixed, added missing $, added message about downloading
+
 2006-06-28 Eric Sandall <eric at sandall.us>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/utils/pciutils/pciutils-devicetype.patch b/utils/pciutils/pciutils-devicetype.patch
deleted file mode 100644
index 4af5ad3..0000000
--- a/utils/pciutils/pciutils-devicetype.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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
-@@ -46,7 +46,8 @@
- 	  d->func = t->func;
- 	  d->vendor_id = vd & 0xffff;
- 	  d->device_id = vd >> 16U;
--	  d->known_fields = PCI_FILL_IDENT;
-+	  d->device_class = pci_read_byte(t,PCI_CLASS_DEVICE+1) << 8 | pci_read_byte(t, PCI_CLASS_DEVICE);
-+	  d->known_fields = PCI_FILL_IDENT | PCI_FILL_CLASS;
- 	  d->hdrtype = ht;
- 	  pci_link_dev(a, d);
- 	  switch (ht)
-@@ -86,6 +87,8 @@
-       d->vendor_id = pci_read_word(d, PCI_VENDOR_ID);
-       d->device_id = pci_read_word(d, PCI_DEVICE_ID);
-     }
-+  if (flags & PCI_FILL_CLASS)
-+      d->device_class = pci_read_byte(d, PCI_CLASS_DEVICE+1) << 8 | pci_read_byte(d, PCI_CLASS_DEVICE);
-   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);
-     }



More information about the SM-Commit mailing list