rpms/device-mapper-multipath/F-9 device-mapper-multipath.spec, 1.44, 1.45 multipath-tools-0.4.7.head2-nostatic.patch, 1.1, 1.2
Benjamin Marzinski (bmarzins)
fedora-extras-commits at redhat.com
Mon Jun 23 21:37:45 UTC 2008
Author: bmarzins
Update of /cvs/pkgs/rpms/device-mapper-multipath/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24141
Modified Files:
device-mapper-multipath.spec
multipath-tools-0.4.7.head2-nostatic.patch
Log Message:
Fix for bz #451415
/sbin/multipath.static in no longer a symlink to the non-static version.
However, it still dynamically loads all libraries except libsysfs. libsysfs
is now statically linked.
Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/F-9/device-mapper-multipath.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- device-mapper-multipath.spec 21 May 2008 17:01:19 -0000 1.44
+++ device-mapper-multipath.spec 23 Jun 2008 21:36:57 -0000 1.45
@@ -1,7 +1,7 @@
Summary: Tools to manage multipath devices using device-mapper
Name: device-mapper-multipath
Version: 0.4.7
-Release: 15%{?dist}
+Release: 16%{?dist}
License: GPL+
Group: System Environment/Base
URL: http://christophe.varoqui.free.fr/
@@ -85,6 +85,12 @@
%{_mandir}/man8/kpartx.8.gz
%changelog
+* Mon Jun 23 2008 Benjamin Marzinski <bmarzins at redhat.com> -0.4.7-16
+- Fix for bz #451415
+- /sbin/multipath.static in no longer a symlink to the non-static version.
+ However, it still dynamically loads all libraries except libsysfs.
+ libsysfs is now statically linked.
+
* Wed May 21 2008 Benjamin Marzinski <bmarzins at 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
multipath-tools-0.4.7.head2-nostatic.patch:
Index: multipath-tools-0.4.7.head2-nostatic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/F-9/multipath-tools-0.4.7.head2-nostatic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multipath-tools-0.4.7.head2-nostatic.patch 21 May 2008 17:01:19 -0000 1.1
+++ multipath-tools-0.4.7.head2-nostatic.patch 23 Jun 2008 21:36:57 -0000 1.2
@@ -1,7 +1,6 @@
-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
+diff -urpN multipath-tools-0.4.7.head2/kpartx/Makefile multipath-tools-0.4.7.head2-patched/kpartx/Makefile
+--- multipath-tools-0.4.7.head2/kpartx/Makefile 2008-06-23 15:24:53.000000000 -0500
++++ multipath-tools-0.4.7.head2-patched/kpartx/Makefile 2008-06-23 15:18:35.000000000 -0500
@@ -24,7 +24,6 @@ all: $(BUILD)
glibc: clean $(OBJS)
@@ -19,25 +18,26 @@
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)
+diff -urpN multipath-tools-0.4.7.head2/multipath/Makefile multipath-tools-0.4.7.head2-patched/multipath/Makefile
+--- multipath-tools-0.4.7.head2/multipath/Makefile 2008-06-23 15:24:53.000000000 -0500
++++ multipath-tools-0.4.7.head2-patched/multipath/Makefile 2008-06-23 15:25:24.000000000 -0500
+@@ -12,7 +12,7 @@ CFLAGS += -I$(multipathdir) -I$(checkers
+ ifeq ($(strip $(BUILD)),klibc)
+ OBJS += $(libdm) $(libsysfs)
+ else
+- LDFLAGS += -ldevmapper -lsysfs
++ LDFLAGS += -ldevmapper
+ endif
+
+ EXEC = multipath
+@@ -20,8 +20,8 @@ EXEC = multipath
+ all: $(BUILD)
glibc: clean $(OBJS)
- $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
+- $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
- $(CC) $(OBJS) -o $(EXEC).static -static $(LDFLAGS) -lselinux -lsepol
++ $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) -lsysfs
++ $(CC) $(OBJS) -o $(EXEC).static -Wl,-Bstatic,-lsysfs,-Bdynamic $(LDFLAGS)
$(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)
More information about the fedora-extras-commits
mailing list