Bug 668437 - Remove obsolete patches
Summary: Remove obsolete patches
Keywords:
Status: CLOSED ERRATA
Alias: None
Product: Fedora
Classification: Fedora
Component: pciutils
Version: rawhide
Hardware: Unspecified
OS: Unspecified
low
medium
Target Milestone: ---
Assignee: Michal Hlavinka
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2011-01-10 14:24 UTC by Honza Horak
Modified: 2011-01-24 20:58 UTC (History)
2 users (show)

Fixed In Version: pciutils-3.1.7-3.fc14
Clone Of:
Environment:
Last Closed: 2011-01-10 15:15:07 UTC
Type: ---
Embargoed:


Attachments (Terms of Use)

Description Honza Horak 2011-01-10 14:24:15 UTC
Description of problem:
pciutils-3.0.2-multilib.patch and other platform patches are no longer needed

Version-Release number of selected component (if applicable):
pciutils-3.1.7-1.fc15.x86_64

Comment 1 Fedora Update System 2011-01-10 15:08:04 UTC
pciutils-3.1.7-2.fc14 has been submitted as an update for Fedora 14.
https://admin.fedoraproject.org/updates/pciutils-3.1.7-2.fc14

Comment 2 John Thacker 2011-01-11 13:49:23 UTC
Hmm.  Without the multilib patch, I get a conflict between pciutils-devel.i686 and pciutils-devel.x86_64 with file /usr/include/pci/config.h

The pciutils-devel-3.1.7-1 packages of both architectures coexist happily on my system.

Comment 3 Michal Hlavinka 2011-01-11 13:58:12 UTC
(In reply to comment #2)
> Hmm.  Without the multilib patch, I get a conflict between pciutils-devel.i686
> and pciutils-devel.x86_64 with file /usr/include/pci/config.h
> 
> The pciutils-devel-3.1.7-1 packages of both architectures coexist happily on my
> system.

did you try to update all packages or just one of them? I've tested to use all pciutils-libs and pciutils-devel(-static) on my computer before update and it was working fine. What is your output of: rpm -qa | grep pciutils

Comment 4 John Thacker 2011-01-11 22:44:40 UTC
I am trying to update all the packages.

I currently have installed:
pciutils-3.1.7-1.x86_64
pciutils-libs-3.1.7-1.x86_64
pciutils-libs-3.1.7-1.i686
pciutils-devel-3.1.7-1.x86_64
pciutils-devel-3.1.7-1.i686

I issue a yum update, it attempts to upgrade all five packages simultaneously to 3.1.7-2, and reports a conflict thusly:

Transaction Check Error:
  file /usr/include/pci/config.h conflicts between attempted installs of pciutils-devel-3.1.7-2.fc14.i686 and pciutils-devel-3.1.7-2.fc14.x86_64

Comment 5 John Thacker 2011-01-13 14:14:58 UTC
# yum update
Loaded plugins: fastestmirror, presto, refresh-packagekit
Loading mirror speeds from cached hostfile
updates/metalink                                         |  16 kB     00:00     
updates-testing/metalink                                 |  15 kB     00:00     
 * fedora: fedora.mirrors.pair.com
 * fedora-debuginfo: fedora.mirrors.pair.com
 * rpmfusion-free: mirror.liberty.edu
 * rpmfusion-free-updates: mirror.liberty.edu
 * rpmfusion-free-updates-testing: mirror.liberty.edu
 * rpmfusion-nonfree: mirror.liberty.edu
 * rpmfusion-nonfree-updates: mirror.liberty.edu
 * rpmfusion-nonfree-updates-testing: mirror.liberty.edu
 * updates: fedora.mirrors.pair.com
 * updates-testing: fedora.mirrors.pair.com
Setting up Update Process
Resolving Dependencies
--> Running transaction check
---> Package pciutils.x86_64 0:3.1.7-2.fc14 set to be updated
---> Package pciutils-devel.i686 0:3.1.7-2.fc14 set to be updated
---> Package pciutils-devel.x86_64 0:3.1.7-2.fc14 set to be updated
---> Package pciutils-libs.i686 0:3.1.7-2.fc14 set to be updated
---> Package pciutils-libs.x86_64 0:3.1.7-2.fc14 set to be updated
--> Finished Dependency Resolution

Dependencies Resolved

================================================================================
 Package             Arch        Version             Repository            Size
================================================================================
Updating:
 pciutils            x86_64      3.1.7-2.fc14        updates-testing       84 k
 pciutils-devel      i686        3.1.7-2.fc14        updates-testing       31 k
 pciutils-devel      x86_64      3.1.7-2.fc14        updates-testing       31 k
 pciutils-libs       i686        3.1.7-2.fc14        updates-testing       41 k
 pciutils-libs       x86_64      3.1.7-2.fc14        updates-testing       41 k

Transaction Summary
================================================================================
Upgrade       5 Package(s)

Total size: 228 k
Is this ok [y/N]: y
Downloading Packages:
Running rpm_check_debug
Running Transaction Test


Transaction Check Error:
  file /usr/include/pci/config.h conflicts between attempted installs of pciutils-devel-3.1.7-2.fc14.i686 and pciutils-devel-3.1.7-2.fc14.x86_64

Error Summary
-------------

Comment 6 Michal Hlavinka 2011-01-13 14:29:05 UTC
thanks, I see it too now. (I wonder why it worked last time.) I'm discussing this with upstream right now, how to fix it properly, because upstream does not like the patches that we removed, so we'll prepare different kind of fix.

Comment 7 John Thacker 2011-01-13 17:10:46 UTC
Incidentally, here's a diff of the two conflicting files:

# diff -ur usr usr.i686
diff -ur usr/include/pci/config.h usr.i686/include/pci/config.h
--- usr/include/pci/config.h	2011-01-10 10:00:52.000000000 -0500
+++ usr.i686/include/pci/config.h	2011-01-10 10:00:57.000000000 -0500
@@ -1,5 +1,5 @@
 #define PCI_CONFIG_H
-#define PCI_ARCH_X86_64
+#define PCI_ARCH_I386
 #define PCI_OS_LINUX
 #define PCI_HAVE_PM_LINUX_SYSFS
 #define PCI_HAVE_PM_LINUX_PROC

For me, a short term fix is presumably to remove pciutils-devel.i686

I don't know that I need the i686 devel package right now, but presumably it is included in the x86_64 repository for a reason?

Comment 8 Michal Hlavinka 2011-01-14 07:27:14 UTC
you need pciutils-devel.i686 on x86_64 machine only if you want to compile some package that BuildRequires pciutils-devel and you want to build it as 32bit not 64bit. AFAIK when you do yum install <package>-devel yum installs both versions (if they are present in the repository) unless you have specified multilib_policy=best in your /etc/yum.conf

Comment 9 Michal Hlavinka 2011-01-18 14:20:27 UTC
I've used different approach to fix multilib conflict. New update will be pciutils-3.1.7-3

Comment 10 Fedora Update System 2011-01-18 14:38:20 UTC
pciutils-3.1.7-3.fc14 has been submitted as an update for Fedora 14.
https://admin.fedoraproject.org/updates/pciutils-3.1.7-3.fc14

Comment 11 Fedora Update System 2011-01-24 20:58:40 UTC
pciutils-3.1.7-3.fc14 has been pushed to the Fedora 14 stable repository.  If problems still persist, please make note of it in this bug report.


Note You need to log in before you can comment on or make changes to this bug.