update to 3.0.3

This commit is contained in:
Michal Hlavinka 2008-12-09 18:12:14 +00:00
parent 65d735a6ec
commit 4df46e9832
5 changed files with 9 additions and 106 deletions

View File

@ -1 +1 @@
pciutils-3.0.2.tar.gz pciutils-3.0.3.tar.gz

View File

@ -1,100 +0,0 @@
diff -up pciutils-3.0.0/lib/configure.multilib pciutils-3.0.0/lib/configure
--- pciutils-3.0.0/lib/configure.multilib 2008-04-10 21:15:47.000000000 +0200
+++ pciutils-3.0.0/lib/configure 2008-09-01 15:17:03.000000000 +0200
@@ -41,28 +41,61 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^
echo " $host $rel"
c=config.h
+cm=config.h.mk
m=config.mk
-echo >$c "#define PCI_ARCH_`echo $cpu | tr '[a-z]' '[A-Z]'`"
-echo >>$c "#define PCI_OS_`echo $sys | tr '[a-z]' '[A-Z]'`"
echo >$m 'WITH_LIBS='
+cat >$c <<EOF
+#if defined(__x86_64__)
+#define PCI_ARCH_X86_64
+#elif defined(__ia64__)
+#define PCI_ARCH_IA64
+#elif defined(__i386__)
+#define PCI_ARCH_I386
+#define PCI_HAVE_PM_INTEL_CONF
+#elif defined(__ppc64__) || defined(__powerpc64__)
+#define PCI_ARCH_PPC64
+#elif defined(__ppc__) || defined(__powerpc__)
+#define PCI_ARCH_PPC
+#elif defined(__s390x__)
+define PCI_ARCH_S390X
+#elif defined(__s390__)
+#define PCI_ARCH_S390
+#elif defined(__alpha__)
+#define PCI_ARCH_ALPHA
+#else
+#error Unknown Arch
+#endif
+#define PCI_OS_LINUX
+#define PCI_HAVE_PM_LINUX_SYSFS
+#define PCI_HAVE_PM_LINUX_PROC
+#define PCI_HAVE_LINUX_BYTEORDER_H
+#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"
+#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"
+#define PCI_HAVE_64BIT_ADDRESS
+EOF
+
+rm -f $cm
+echo >$cm "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`"
+echo >>$cm "#define PCI_OS_`echo $sys | tr 'a-z' 'A-Z'`"
echo_n "Looking for access methods..."
+echo_n " sysfs proc"
case $sys in
linux*)
echo_n " sysfs proc"
- echo >>$c '#define PCI_HAVE_PM_LINUX_SYSFS'
- echo >>$c '#define PCI_HAVE_PM_LINUX_PROC'
- echo >>$c '#define PCI_HAVE_LINUX_BYTEORDER_H'
- echo >>$c '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"'
- echo >>$c '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"'
+ echo >>$cm '#define PCI_HAVE_PM_LINUX_SYSFS'
+ echo >>$cm '#define PCI_HAVE_PM_LINUX_PROC'
+ echo >>$cm '#define PCI_HAVE_LINUX_BYTEORDER_H'
+ echo >>$cm '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"'
+ echo >>$cm '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"'
case $cpu in
i386|x86_64) echo_n " i386-ports"
- echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
+ echo >>$cm '#define PCI_HAVE_PM_INTEL_CONF'
;;
esac
- echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
- echo >>$c '#define PCI_USE_DNS'
+ echo >>$cm '#define PCI_HAVE_64BIT_ADDRESS'
+ echo >>$cm '#define PCI_USE_DNS'
;;
sunos)
case $cpu in
@@ -110,7 +143,7 @@ case $sys in
;;
esac
-echo >>$c '#define PCI_HAVE_PM_DUMP'
+echo >>$cm '#define PCI_HAVE_PM_DUMP'
echo " dump"
echo_n "Checking for zlib support... "
@@ -133,6 +166,7 @@ else
echo >>$c '#define PCI_IDS "pci.ids"'
fi
echo >>$c "#define PCI_PATH_IDS_DIR \"$IDSDIR\""
+echo >>$cm "#define PCI_PATH_IDS_DIR \"$IDSDIR\""
echo_n "Checking for DNS support... "
if [ "$DNS" = yes -o "$DNS" = no ] ; then
@@ -168,4 +202,5 @@ fi
echo >>$m 'PCILIBPC=$(LIBNAME).pc'
echo >>$c "#define PCILIB_VERSION \"$VERSION\""
-sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >>$m
+echo >>$cm "#define PCILIB_VERSION \"$VERSION\""
+sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$cm >>$m
\ No newline at end of file

View File

@ -2,7 +2,7 @@ diff -up pciutils-3.0.2/lib/configure.multilib pciutils-3.0.2/lib/configure
--- pciutils-3.0.2/lib/configure.multilib 2008-09-19 20:04:37.000000000 +0200 --- pciutils-3.0.2/lib/configure.multilib 2008-09-19 20:04:37.000000000 +0200
+++ pciutils-3.0.2/lib/configure 2008-09-22 10:35:58.964527560 +0200 +++ pciutils-3.0.2/lib/configure 2008-09-22 10:35:58.964527560 +0200
@@ -45,29 +45,62 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^ @@ -45,29 +45,62 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^
echo " $host $rel" echo " $host $rel $cpu $sys"
c=config.h c=config.h
+cm=config.h.mk +cm=config.h.mk
@ -64,7 +64,7 @@ diff -up pciutils-3.0.2/lib/configure.multilib pciutils-3.0.2/lib/configure
+ echo >>$cm '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"' + echo >>$cm '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"'
+ echo >>$cm '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"' + echo >>$cm '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"'
case $cpu in case $cpu in
i386|x86_64) echo_n " i386-ports" i?86|x86_64) echo_n " i386-ports"
- echo >>$c '#define PCI_HAVE_PM_INTEL_CONF' - echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
+ echo >>$cm '#define PCI_HAVE_PM_INTEL_CONF' + echo >>$cm '#define PCI_HAVE_PM_INTEL_CONF'
;; ;;

View File

@ -1,5 +1,5 @@
Name: pciutils Name: pciutils
Version: 3.0.2 Version: 3.0.3
Release: 1%{?dist} Release: 1%{?dist}
Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
Patch1: pciutils-2.2.4-buf.patch Patch1: pciutils-2.2.4-buf.patch
@ -114,7 +114,10 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Sep 22 2008 Michal Hlavinka <mhlavink@redhat.com> 3.0.1-1 * Tue Dec 09 2008 Michal Hlavinka <mhlavink@redhat.com> 3.0.3-1
- version 3.0.3
* Mon Sep 22 2008 Michal Hlavinka <mhlavink@redhat.com> 3.0.2-1
- version 3.0.2 - version 3.0.2
* Fri Sep 19 2008 Michal Hlavinka <mhlavink@redhat.com> 3.0.1-1 * Fri Sep 19 2008 Michal Hlavinka <mhlavink@redhat.com> 3.0.1-1

View File

@ -1 +1 @@
11ccb3cfd12d0ac7bc2e3839b0c3f807 pciutils-3.0.2.tar.gz d07da501bb11e6af40acd036536c2e9a pciutils-3.0.3.tar.gz