rpms/device-mapper-multipath/devel select_lib.patch, NONE, 1.1 device-mapper-multipath.spec, 1.60, 1.61 redhatification.patch, 1.4, 1.5 lib64_multipath.patch, 1.2, NONE

Thu Jul 30 20:39:53 UTC 2009

Author: bmarzins

Update of /cvs/pkgs/rpms/device-mapper-multipath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25673

Modified Files:
	device-mapper-multipath.spec redhatification.patch 
Added Files:
	select_lib.patch 
Removed Files:
	lib64_multipath.patch 
Log Message:
Fixed build issue on i686 machines.


select_lib.patch:
 Makefile.inc            |   14 +++++++++++---
 libmultipath/defaults.h |    2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE select_lib.patch ---
Index: multipath-tools/libmultipath/defaults.h
===================================================================
--- multipath-tools.orig/libmultipath/defaults.h
+++ multipath-tools/libmultipath/defaults.h
@@ -1,6 +1,6 @@
 #define DEFAULT_GETUID		"/lib/udev/scsi_id --whitelisted --device=/dev/%n"
 #define DEFAULT_UDEVDIR		"/dev"
-#define DEFAULT_MULTIPATHDIR	"/lib/multipath"
+#define DEFAULT_MULTIPATHDIR	"/" LIB_STRING "/multipath"
 #define DEFAULT_SELECTOR	"round-robin 0"
 #define DEFAULT_FEATURES	"0"
 #define DEFAULT_HWHANDLER	"0"
Index: multipath-tools/Makefile.inc
===================================================================
--- multipath-tools.orig/Makefile.inc
+++ multipath-tools/Makefile.inc
@@ -13,6 +13,14 @@ ifeq ($(TOPDIR),)
 	TOPDIR	= ..
 endif
 
+ifndef LIB
+	ifeq ($(shell test -d /lib64 && echo 1),1)
+		LIB=lib64
+	else
+		LIB=lib
+	endif
+endif
+
 prefix      = 
 exec_prefix = $(prefix)
 bindir      = $(exec_prefix)/sbin
@@ -21,14 +29,14 @@ multipathdir = $(TOPDIR)/libmultipath
 mandir      = $(prefix)/usr/share/man/man8
 man5dir     = $(prefix)/usr/share/man/man5
 rcdir	    = $(prefix)/etc/init.d
-syslibdir   = $(prefix)/lib
-libdir	    = $(prefix)/lib/multipath
+syslibdir   = $(prefix)/$(LIB)
+libdir	    = $(prefix)/$(LIB)/multipath
 
 GZIP        = /bin/gzip -9 -c
 INSTALL_PROGRAM = install
 
 OPTFLAGS     = -pipe -g -Wall -Wunused -Wstrict-prototypes
-CFLAGS	     = $(OPTFLAGS) -fPIC
+CFLAGS	     = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
 SHARED_FLAGS = -shared
 
 %.o:	%.c


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- device-mapper-multipath.spec	30 Jul 2009 01:34:50 -0000	1.60
+++ device-mapper-multipath.spec	30 Jul 2009 20:39:53 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -13,7 +13,7 @@ Patch2: queue_without_daemon.patch
 Patch3: path_checker.patch
 Patch4: root_init_script.patch
 Patch5: uninstall.patch
-Patch6: lib64_multipath.patch
+Patch6: select_lib.patch
 Patch7: directio_message_cleanup.patch
 Patch8: fix_kpartx.patch
 Patch9: redhatification.patch
@@ -67,9 +67,7 @@ kpartx manages partition creation and re
 %patch3 -p1 -b .path_checker
 %patch4 -p1 -b .root_init_script
 %patch5 -p1 -b .uninstall.patch
-%if %{_lib} == "lib64"
-%patch6 -p1 -b .lib64_multipath
-%endif
+%patch6 -p1 -b .select_lib
 %patch7 -p1 -b .directio_message_cleanup
 %patch8 -p1 -b .fix_kpartx
 %patch9 -p1 -b .redhatification
@@ -83,7 +81,7 @@ kpartx manages partition creation and re
 %define _sbindir /sbin
 %define _libdir /%{_lib}
 %define _libmpathdir %{_libdir}/multipath
-make %{?_smp_mflags}
+make %{?_smp_mflags} LIB=%{_lib}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -144,6 +142,9 @@ fi
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Thu Jul 30 2009 Benjamin Marzinski <bmarzins at redhat.com> - 0.4.9-4
+- Fixed build issue on i686 machines.
+
 * Wed Jul 29 2009 Benjamin Marzinski <bmarzins at redhat.com> - 0.4.9-3
 - Updated to latest upstream 0.4.9 code : multipath-tools-090729.tgz
   (git commit id: d678c139719d5631194b50e49f16ca97162ecd0f)

redhatification.patch:
 Makefile.inc                    |    2 
 kpartx/Makefile                 |    8 +--
 libmultipath/hwtable.c          |    2 
 multipath/Makefile              |    3 +
 multipath/multipath.conf.redhat |   97 ++++++++++++++++++++++++++++++++++++++++
 multipathd/Makefile             |    1 
 6 files changed, 107 insertions(+), 6 deletions(-)

Index: redhatification.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/redhatification.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- redhatification.patch	29 Jul 2009 22:54:06 -0000	1.4
+++ redhatification.patch	30 Jul 2009 20:39:53 -0000	1.5
@@ -1,7 +1,7 @@
-Index: multipath-tools-090724/libmultipath/hwtable.c
+Index: multipath-tools/libmultipath/hwtable.c
 ===================================================================
---- multipath-tools-090724.orig/libmultipath/hwtable.c
-+++ multipath-tools-090724/libmultipath/hwtable.c
+--- multipath-tools.orig/libmultipath/hwtable.c
++++ multipath-tools/libmultipath/hwtable.c
 @@ -589,7 +589,7 @@ static struct hwentry default_hw[] = {
  		.vendor        = "IBM",
  		.product       = "S/390 DASD ECKD",
@@ -11,11 +11,11 @@ Index: multipath-tools-090724/libmultipa
  		.features      = "1 queue_if_no_path",
  		.hwhandler     = DEFAULT_HWHANDLER,
  		.selector      = DEFAULT_SELECTOR,
-Index: multipath-tools-090724/Makefile.inc
+Index: multipath-tools/Makefile.inc
 ===================================================================
---- multipath-tools-090724.orig/Makefile.inc
-+++ multipath-tools-090724/Makefile.inc
-@@ -26,7 +26,7 @@ libudevdir  = ${prefix}/lib/udev
+--- multipath-tools.orig/Makefile.inc
++++ multipath-tools/Makefile.inc
+@@ -28,7 +28,7 @@ libudevdir  = ${prefix}/lib/udev
  multipathdir = $(TOPDIR)/libmultipath
  mandir      = $(prefix)/usr/share/man/man8
  man5dir     = $(prefix)/usr/share/man/man5
@@ -24,10 +24,10 @@ Index: multipath-tools-090724/Makefile.i
  syslibdir   = $(prefix)/$(LIB)
  libdir	    = $(prefix)/$(LIB)/multipath
  
-Index: multipath-tools-090724/multipathd/Makefile
+Index: multipath-tools/multipathd/Makefile
 ===================================================================
---- multipath-tools-090724.orig/multipathd/Makefile
-+++ multipath-tools-090724/multipathd/Makefile
+--- multipath-tools.orig/multipathd/Makefile
++++ multipath-tools/multipathd/Makefile
 @@ -35,6 +35,7 @@ install:
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
  	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
@@ -36,10 +36,10 @@ Index: multipath-tools-090724/multipathd
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
  	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
  
-Index: multipath-tools-090724/multipath/Makefile
+Index: multipath-tools/multipath/Makefile
 ===================================================================
---- multipath-tools-090724.orig/multipath/Makefile
-+++ multipath-tools-090724/multipath/Makefile
+--- multipath-tools.orig/multipath/Makefile
++++ multipath-tools/multipath/Makefile
 @@ -27,6 +27,9 @@ install:
  	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
@@ -50,10 +50,10 @@ Index: multipath-tools-090724/multipath/
  
  uninstall:
  	rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
-Index: multipath-tools-090724/multipath/multipath.conf.redhat
+Index: multipath-tools/multipath/multipath.conf.redhat
 ===================================================================
 --- /dev/null
-+++ multipath-tools-090724/multipath/multipath.conf.redhat
++++ multipath-tools/multipath/multipath.conf.redhat
 @@ -0,0 +1,97 @@
 +# This is a basic configuration file with some examples, for device mapper
 +# multipath.
@@ -152,10 +152,10 @@ Index: multipath-tools-090724/multipath/
 +#		path_grouping_policy	multibus
 +#	}
 +#}
-Index: multipath-tools-090724/kpartx/Makefile
+Index: multipath-tools/kpartx/Makefile
 ===================================================================
---- multipath-tools-090724.orig/kpartx/Makefile
-+++ multipath-tools-090724/kpartx/Makefile
+--- multipath-tools.orig/kpartx/Makefile
++++ multipath-tools/kpartx/Makefile
 @@ -20,10 +20,10 @@ $(EXEC): $(OBJS)
  install: $(EXEC) $(EXEC).8
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)


--- lib64_multipath.patch DELETED ---


