Applied Zing's patch to switch from using "bus" to "subsystem" in sysfs.device-mapper-multipath-0_4_7-15_fc9

    Changed multipath.static and kpartx.static into symlinks to the
    non-static versions Resolves: bz #446947

3 files changed, 72 insertions, 1 deletions

diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec
index 37d8d7b..df8424e 100644
--- a/device-mapper-multipath.spec
+++ b/device-mapper-multipath.spec
@@ -1,12 +1,14 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.7
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
 Source0: multipath-tools-0.4.7.head2.tgz
 Patch0: multipath-tools-0.4.7.head2-sparc64fix.patch
+Patch1: multipath-bustosubsystem.patch
+Patch2: multipath-tools-0.4.7.head2-nostatic.patch
 Requires: kpartx = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): chkconfig
@@ -34,6 +36,8 @@ kpartx manages partition creation and removal for device-mapper devices.
 %prep
 %setup -q -n multipath-tools-0.4.7.head2
 %patch0 -p1 -b .sparc64
+%patch1 -p1 -b .bustosubsystem
+%patch2 -p1 -b .nostatic
 
 %build
 make DESTDIR=$RPM_BUILD_ROOT
@@ -81,6 +85,10 @@ fi
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Wed May 21 2008 Benjamin Marzinski <bmarzins@redhat.com> -0.4.7-15
+- Switch multipath to check "subsystem" instead of "bus"
+- Make static versions of multipath and kpartx symlinks to non-static versions
+
 * Fri Feb 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.4.7-14
 - fix sparc64
 - fix license tag
diff --git a/multipath-bustosubsystem.patch b/multipath-bustosubsystem.patch
new file mode 100644
index 0000000..02e8d44
--- /dev/null
+++ b/multipath-bustosubsystem.patch
@@ -0,0 +1,20 @@
+--- multipath-tools-0.4.7.head2/libmultipath/discovery.c.orig	2007-01-15 16:52:20.000000000 -0500
++++ multipath-tools-0.4.7.head2/libmultipath/discovery.c	2008-05-18 16:34:38.000000000 -0400
+@@ -449,7 +449,7 @@
+ 	while (loop--) {
+ 		sdev = sysfs_open_device_path(attr_buff);
+ 
+-		if (strlen(sdev->bus))
++		if (strlen(sdev->subsystem))
+ 			break;
+ 
+ 		sysfs_close_device(sdev);
+@@ -459,7 +459,7 @@
+ 	sdev = sysfs_open_device_path(attr_buff);
+ #endif
+ 
+-	if (!strncmp(sdev->bus, "scsi", 4))
++	if (!strncmp(sdev->subsystem, "scsi", 4))
+ 		pp->bus = SYSFS_BUS_SCSI;
+ 	else if (!strncmp(sdev->bus, "ide", 3))
+ 		pp->bus = SYSFS_BUS_IDE;
diff --git a/multipath-tools-0.4.7.head2-nostatic.patch b/multipath-tools-0.4.7.head2-nostatic.patch
new file mode 100644
index 0000000..24fb2f9
--- /dev/null
+++ b/multipath-tools-0.4.7.head2-nostatic.patch
@@ -0,0 +1,43 @@
+Index: multipath-tools-0.4.7.head2/kpartx/Makefile
+===================================================================
+--- multipath-tools-0.4.7.head2.orig/kpartx/Makefile
++++ multipath-tools-0.4.7.head2/kpartx/Makefile
+@@ -24,7 +24,6 @@ all: $(BUILD)
+ 
+ glibc: clean $(OBJS)
+ 	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
+-	$(CC) $(OBJS) -o $(EXEC).static -static $(LDFLAGS) -lselinux -lsepol
+ 	
+ klibc: clean $(OBJS)
+ 	$(CC) -static -o $(EXEC) $(CRT0) $(OBJS) $(KLIBC) $(LIBGCC)
+@@ -36,7 +35,7 @@ $(MULTIPATHLIB)-$(BUILD).a:
+ install:
+ 	install -d $(DESTDIR)$(bindir)
+ 	install -m 755 $(EXEC) $(DESTDIR)$(bindir)
+-	install -m 755 $(EXEC).static $(DESTDIR)$(bindir)
++	ln -sf $(EXEC) $(DESTDIR)$(bindir)/$(EXEC).static
+ 	install -d $(DESTDIR)$(mandir)
+ 	install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
+ 
+Index: multipath-tools-0.4.7.head2/multipath/Makefile
+===================================================================
+--- multipath-tools-0.4.7.head2.orig/multipath/Makefile
++++ multipath-tools-0.4.7.head2/multipath/Makefile
+@@ -21,7 +21,6 @@ all: $(BUILD)
+ 
+ glibc: clean $(OBJS)
+ 	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
+-	$(CC) $(OBJS) -o $(EXEC).static -static $(LDFLAGS) -lselinux -lsepol
+ 	$(CC) mpath_faker.c -o mpath_ctl $(CFLAGS) -static
+ 
+ klibc: $(OBJS)
+@@ -36,7 +35,8 @@ $(MULTIPATHLIB)-$(BUILD).a:
+ 
+ install:
+ 	install -d $(DESTDIR)$(bindir)
+-	install -m 755 $(EXEC) $(EXEC).static mpath_ctl mpath_wait $(DESTDIR)$(bindir)/
++	install -m 755 $(EXEC) mpath_ctl mpath_wait $(DESTDIR)$(bindir)/
++	ln -sf $(EXEC) $(DESTDIR)$(bindir)/$(EXEC).static
+ 	install -d $(DESTDIR)/etc/udev/rules.d
+ 	install -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/40-multipath.rules
+ 	install -d $(DESTDIR)$(mandir)