r397 - in multipath-tools/trunk: . debian debian/patches kpartx
libmultipath multipath path_priority/pp_alua path_priority/pp_random
Guido Guenther
agx at alioth.debian.org
Wed Dec 20 11:47:22 CET 2006
Author: agx
Date: Wed Dec 20 11:47:20 2006
New Revision: 397
Added:
multipath-tools/trunk/debian/patches/Makefile-cleanups.diff
multipath-tools/trunk/debian/patches/remove-arch-ifdefs.diff
multipath-tools/trunk/debian/patches/scsi_id.diff
multipath-tools/trunk/debian/patches/udev.diff
Removed:
multipath-tools/trunk/multipath/multipath.sh
Modified:
multipath-tools/trunk/debian/changelog
multipath-tools/trunk/debian/patches/exclude-quilt
multipath-tools/trunk/debian/patches/git-40b575955cc189aa993e6a030b66b5fef6bcf288.patch
multipath-tools/trunk/debian/patches/series
multipath-tools/trunk/kpartx/lopart.c
multipath-tools/trunk/libmultipath/defaults.h
multipath-tools/trunk/libmultipath/hwtable.c
multipath-tools/trunk/multipath.conf.annotated
multipath-tools/trunk/multipath.conf.synthetic
multipath-tools/trunk/multipath/Makefile
multipath-tools/trunk/multipath/multipath.rules
multipath-tools/trunk/path_priority/pp_alua/Makefile
multipath-tools/trunk/path_priority/pp_random/Makefile
Log:
scsi_id.diff, Makefile-cleanups.diff, remove-arch-ifdefs.diff, udev.diff:
split out Debian's modifications into separate patches
Modified: multipath-tools/trunk/debian/changelog
==============================================================================
--- multipath-tools/trunk/debian/changelog (original)
+++ multipath-tools/trunk/debian/changelog Wed Dec 20 11:47:20 2006
@@ -8,8 +8,10 @@
* use quilt for the git patch
* remove Bastian and Andres from Uploaders on their request
* cleanup pp_hds_modular so the package is rebuildable several times
+ * scsi_id.diff, Makefile-cleanups.diff, remove-arch-ifdefs.diff, udev.diff:
+ split out Debian's modifications into separate patches
- -- Guido Guenther <agx at sigxcpu.org> Mon, 18 Dec 2006 16:08:47 +0100
+ -- Guido Guenther <agx at sigxcpu.org> Wed, 20 Dec 2006 11:14:01 +0100
multipath-tools (0.4.7-1.1) unstable; urgency=medium
Added: multipath-tools/trunk/debian/patches/Makefile-cleanups.diff
==============================================================================
--- (empty file)
+++ multipath-tools/trunk/debian/patches/Makefile-cleanups.diff Wed Dec 20 11:47:20 2006
@@ -0,0 +1,41 @@
+* create non existing dirs
+* dont't strip binaries
+
+--- multipath-tools-0.4.7.orig/path_priority/pp_random/Makefile
++++ multipath-tools-0.4.7/path_priority/pp_random/Makefile
+@@ -14,7 +14,8 @@
+ $(CC) -static -o $(EXEC) $(OBJS)
+
+ install: $(EXEC)
+- install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
++ install -d $(DESTDIR)$(bindir)
++ install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+
+ uninstall:
+ rm $(DESTDIR)$(bindir)/$(EXEC)
+--- multipath-tools-0.4.7.orig/path_priority/pp_alua/Makefile
++++ multipath-tools-0.4.7/path_priority/pp_alua/Makefile
+@@ -36,7 +36,7 @@
+ $(CC) -static -o $(EXEC) $(OBJS)
+
+ install: $(BUILD) $(EXEC).8.gz
+- $(INSTALL) -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
++ $(INSTALL) -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+ $(INSTALL) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)/$(EXEC).8.gz
+
+ uninstall:
+--- multipath-tools-0.4.7.orig/multipath/Makefile
++++ multipath-tools-0.4.7/multipath/Makefile
+@@ -39,9 +39,9 @@
+
+ install:
+ install -d $(DESTDIR)$(bindir)
+- install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+- install -d $(DESTDIR)/etc/udev/rules.d
+- install -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/
++ install -m 755 $(EXEC) $(DESTDIR)$(bindir)/
++ install -d $(DESTDIR)/etc/udev
++ install -m 644 multipath.rules $(DESTDIR)/etc/udev/
+ install -d $(DESTDIR)$(mandir)
+ install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
+
Modified: multipath-tools/trunk/debian/patches/exclude-quilt
==============================================================================
--- multipath-tools/trunk/debian/patches/exclude-quilt (original)
+++ multipath-tools/trunk/debian/patches/exclude-quilt Wed Dec 20 11:47:20 2006
@@ -1,3 +1,5 @@
+* make sure we don't try to build the .pc directory
+
Index: multipath-tools/Makefile
===================================================================
--- multipath-tools.orig/Makefile 2006-12-17 20:22:51.000000000 +0100
Modified: multipath-tools/trunk/debian/patches/git-40b575955cc189aa993e6a030b66b5fef6bcf288.patch
==============================================================================
--- multipath-tools/trunk/debian/patches/git-40b575955cc189aa993e6a030b66b5fef6bcf288.patch (original)
+++ multipath-tools/trunk/debian/patches/git-40b575955cc189aa993e6a030b66b5fef6bcf288.patch Wed Dec 20 11:47:20 2006
@@ -1,3 +1,5 @@
+pull from upstream git up to 40b575955cc189aa993e6a030b66b5fef6bcf288
+
diff -u multipath-tools-0.4.7/multipath.conf.annotated multipath-tools-0.4.7/multipath.conf.annotated
--- multipath-tools-0.4.7/multipath.conf.annotated
+++ multipath-tools-0.4.7/multipath.conf.annotated
Added: multipath-tools/trunk/debian/patches/remove-arch-ifdefs.diff
==============================================================================
--- (empty file)
+++ multipath-tools/trunk/debian/patches/remove-arch-ifdefs.diff Wed Dec 20 11:47:20 2006
@@ -0,0 +1,36 @@
+* get rid of arch specific ifdef spaghettis
+
+--- multipath-tools-0.4.7.orig/kpartx/lopart.c
++++ multipath-tools-0.4.7/kpartx/lopart.c
+@@ -26,29 +26,14 @@
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+ #include <sysmacros.h>
+-
+-#if defined(__hppa__) || defined(__powerpc64__) || defined (__alpha__) \
+- || defined (__x86_64__)
+-typedef unsigned long __kernel_old_dev_t;
+-#elif defined(__powerpc__) || defined(__ia64__)
+-typedef unsigned int __kernel_old_dev_t;
+-#else
+-typedef unsigned short __kernel_old_dev_t;
+-#endif
+-
+-#define dev_t __kernel_old_dev_t
++#include <stdint.h>
+
+ #include <linux/loop.h>
+
+ #include "lopart.h"
+ #include "xstrncpy.h"
+
+-#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) \
+- && !defined (__s390x__)
+-#define int2ptr(x) ((void *) ((int) x))
+-#else
+-#define int2ptr(x) ((void *) ((long) x))
+-#endif
++#define int2ptr(x) ((void *) ((uintptr_t) x))
+
+ static char *
+ xstrdup (const char *s)
Added: multipath-tools/trunk/debian/patches/scsi_id.diff
==============================================================================
--- (empty file)
+++ multipath-tools/trunk/debian/patches/scsi_id.diff Wed Dec 20 11:47:20 2006
@@ -0,0 +1,76 @@
+* scsi_id moved from /sbin/scsi_id to /lib/udev/
+
+--- multipath-tools-0.4.7.orig/libmultipath/defaults.h
++++ multipath-tools-0.4.7/libmultipath/defaults.h
+@@ -1,4 +1,4 @@
+-#define DEFAULT_GETUID "/sbin/scsi_id -g -u -s /block/%n"
++#define DEFAULT_GETUID "/lib/udev/scsi_id -g -u -s /block/%n"
+ #define DEFAULT_UDEVDIR "/dev"
+ #define DEFAULT_SELECTOR "round-robin 0"
+ #define DEFAULT_FEATURES "0"
+--- multipath-tools-0.4.7.orig/libmultipath/hwtable.c
++++ multipath-tools-0.4.7/libmultipath/hwtable.c
+@@ -128,7 +128,7 @@
+ {
+ .vendor = "EMC",
+ .product = "SYMMETRIX",
+- .getuid = "/sbin/scsi_id -g -u -ppre-spc3-83 -s /block/%n",
++ .getuid = "/lib/udev/scsi_id -g -u -ppre-spc3-83 -s /block/%n",
+ .getprio = NULL,
+ .features = DEFAULT_FEATURES,
+ .hwhandler = DEFAULT_HWHANDLER,
+--- multipath-tools-0.4.7.orig/multipath.conf.synthetic
++++ multipath-tools-0.4.7/multipath.conf.synthetic
+@@ -7,7 +7,7 @@
+ # polling_interval 10
+ # selector "round-robin 0"
+ # path_grouping_policy multibus
+-# getuid_callout "/sbin/scsi_id -g -u -s /block/%n"
++# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n"
+ # prio_callout /bin/true
+ # path_checker readsector0
+ # rr_min_io 100
+@@ -48,7 +48,7 @@
+ # vendor "COMPAQ "
+ # product "HSV110 (C)COMPAQ"
+ # path_grouping_policy multibus
+-# getuid_callout "/sbin/scsi_id -g -u -s /block/%n"
++# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n"
+ # path_checker readsector0
+ # path_selector "round-robin 0"
+ # hardware_handler "0"
+--- multipath-tools-0.4.7.orig/multipath.conf.annotated
++++ multipath-tools-0.4.7/multipath.conf.annotated
+@@ -11,7 +11,7 @@
+ # #
+ # # name : udev_dir
+ # # desc : directory where udev creates its device nodes
+-# # default : /udev
++# # default : /dev
+ # #
+ # udev_dir /dev
+ #
+@@ -47,9 +47,9 @@
+ # # scope : multipath
+ # # desc : the default program and args to callout to obtain a unique
+ # # path identifier. Absolute path required
+-# # default : /sbin/scsi_id -g -u -s
++# # default : /lib/udev/scsi_id -g -u -s
+ # #
+-# getuid_callout "/sbin/scsi_id -g -u -s /block/%n"
++# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n"
+ #
+ # #
+ # # name : prio_callout
+@@ -275,9 +275,9 @@
+ # # scope : multipath
+ # # desc : the program and args to callout to obtain a unique
+ # # path identifier. Absolute path required
+-# # default : /sbin/scsi_id -g -u -s
++# # default : /lib/udev/scsi_id -g -u -s
+ # #
+-# getuid_callout "/sbin/scsi_id -g -u -s /block/%n"
++# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n"
+ #
+ # #
+ # # name : prio_callout
Modified: multipath-tools/trunk/debian/patches/series
==============================================================================
--- multipath-tools/trunk/debian/patches/series (original)
+++ multipath-tools/trunk/debian/patches/series Wed Dec 20 11:47:20 2006
@@ -1,2 +1,6 @@
git-40b575955cc189aa993e6a030b66b5fef6bcf288.patch
exclude-quilt
+scsi_id.diff
+Makefile-cleanups.diff
+remove-arch-ifdefs.diff
+udev.diff
Added: multipath-tools/trunk/debian/patches/udev.diff
==============================================================================
--- (empty file)
+++ multipath-tools/trunk/debian/patches/udev.diff Wed Dec 20 11:47:20 2006
@@ -0,0 +1,38 @@
+--- multipath-tools-0.4.7.orig/multipath/multipath.rules
++++ multipath-tools-0.4.7/multipath/multipath.rules
+@@ -2,17 +2,9 @@
+ # multipath and multipath partitions nodes are created in /dev/mapper/
+ # this file should be installed in /etc/udev/rules.d
+ #
+-# !! udev must not discard DM events !!
+-# !! check the other installed rules !!
+-#
+-
+-# lookup the devmap name
+-#ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
+-# PROGRAM="/sbin/devmap_name %M %m"
+-ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
+- PROGRAM="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info"
+
+ # take care of devmap partitioning
+ ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
++ PROGRAM="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info", \
+ RUN+="/sbin/kpartx -a /dev/mapper/%c"
+
+--- multipath-tools-0.4.7.orig/multipath/multipath.sh
++++ multipath-tools-0.4.7/multipath/multipath.sh
+@@ -0,0 +1,14 @@
++#!/bin/sh -e
++
++if [ ! "${ACTION}" = add ] ; then
++ exit
++fi
++
++if [ "${1:0:3}" = "dm-" ] ; then
++ dev=$(</sys${DEVPATH}/dev)
++ map=$(/sbin/devmap_name $dev)
++ /sbin/kpartx -v -a /dev/$map
++else
++ /sbin/multipath -v0 /dev/$1
++fi
++
Modified: multipath-tools/trunk/kpartx/lopart.c
==============================================================================
--- multipath-tools/trunk/kpartx/lopart.c (original)
+++ multipath-tools/trunk/kpartx/lopart.c Wed Dec 20 11:47:20 2006
@@ -26,14 +26,29 @@
#include <sys/stat.h>
#include <sys/mman.h>
#include <sysmacros.h>
-#include <stdint.h>
+
+#if defined(__hppa__) || defined(__powerpc64__) || defined (__alpha__) \
+ || defined (__x86_64__)
+typedef unsigned long __kernel_old_dev_t;
+#elif defined(__powerpc__) || defined(__ia64__)
+typedef unsigned int __kernel_old_dev_t;
+#else
+typedef unsigned short __kernel_old_dev_t;
+#endif
+
+#define dev_t __kernel_old_dev_t
#include <linux/loop.h>
#include "lopart.h"
#include "xstrncpy.h"
-#define int2ptr(x) ((void *) ((uintptr_t) x))
+#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) \
+ && !defined (__s390x__)
+#define int2ptr(x) ((void *) ((int) x))
+#else
+#define int2ptr(x) ((void *) ((long) x))
+#endif
static char *
xstrdup (const char *s)
Modified: multipath-tools/trunk/libmultipath/defaults.h
==============================================================================
--- multipath-tools/trunk/libmultipath/defaults.h (original)
+++ multipath-tools/trunk/libmultipath/defaults.h Wed Dec 20 11:47:20 2006
@@ -1,4 +1,4 @@
-#define DEFAULT_GETUID "/lib/udev/scsi_id -g -u -s /block/%n"
+#define DEFAULT_GETUID "/sbin/scsi_id -g -u -s /block/%n"
#define DEFAULT_UDEVDIR "/dev"
#define DEFAULT_SELECTOR "round-robin 0"
#define DEFAULT_FEATURES "0"
Modified: multipath-tools/trunk/libmultipath/hwtable.c
==============================================================================
--- multipath-tools/trunk/libmultipath/hwtable.c (original)
+++ multipath-tools/trunk/libmultipath/hwtable.c Wed Dec 20 11:47:20 2006
@@ -128,7 +128,7 @@
{
.vendor = "EMC",
.product = "SYMMETRIX",
- .getuid = "/lib/udev/scsi_id -g -u -ppre-spc3-83 -s /block/%n",
+ .getuid = "/sbin/scsi_id -g -u -ppre-spc3-83 -s /block/%n",
.getprio = NULL,
.features = DEFAULT_FEATURES,
.hwhandler = DEFAULT_HWHANDLER,
Modified: multipath-tools/trunk/multipath.conf.annotated
==============================================================================
--- multipath-tools/trunk/multipath.conf.annotated (original)
+++ multipath-tools/trunk/multipath.conf.annotated Wed Dec 20 11:47:20 2006
@@ -11,7 +11,7 @@
# #
# # name : udev_dir
# # desc : directory where udev creates its device nodes
-# # default : /dev
+# # default : /udev
# #
# udev_dir /dev
#
@@ -47,9 +47,9 @@
# # scope : multipath
# # desc : the default program and args to callout to obtain a unique
# # path identifier. Absolute path required
-# # default : /lib/udev/scsi_id -g -u -s
+# # default : /sbin/scsi_id -g -u -s
# #
-# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n"
+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n"
#
# #
# # name : prio_callout
@@ -275,9 +275,9 @@
# # scope : multipath
# # desc : the program and args to callout to obtain a unique
# # path identifier. Absolute path required
-# # default : /lib/udev/scsi_id -g -u -s
+# # default : /sbin/scsi_id -g -u -s
# #
-# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n"
+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n"
#
# #
# # name : prio_callout
Modified: multipath-tools/trunk/multipath.conf.synthetic
==============================================================================
--- multipath-tools/trunk/multipath.conf.synthetic (original)
+++ multipath-tools/trunk/multipath.conf.synthetic Wed Dec 20 11:47:20 2006
@@ -7,7 +7,7 @@
# polling_interval 10
# selector "round-robin 0"
# path_grouping_policy multibus
-# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n"
+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n"
# prio_callout /bin/true
# path_checker readsector0
# rr_min_io 100
@@ -48,7 +48,7 @@
# vendor "COMPAQ "
# product "HSV110 (C)COMPAQ"
# path_grouping_policy multibus
-# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n"
+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n"
# path_checker readsector0
# path_selector "round-robin 0"
# hardware_handler "0"
Modified: multipath-tools/trunk/multipath/Makefile
==============================================================================
--- multipath-tools/trunk/multipath/Makefile (original)
+++ multipath-tools/trunk/multipath/Makefile Wed Dec 20 11:47:20 2006
@@ -39,9 +39,9 @@
install:
install -d $(DESTDIR)$(bindir)
- install -m 755 $(EXEC) $(DESTDIR)$(bindir)/
- install -d $(DESTDIR)/etc/udev
- install -m 644 multipath.rules $(DESTDIR)/etc/udev/
+ install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+ install -d $(DESTDIR)/etc/udev/rules.d
+ install -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/
install -d $(DESTDIR)$(mandir)
install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
Modified: multipath-tools/trunk/multipath/multipath.rules
==============================================================================
--- multipath-tools/trunk/multipath/multipath.rules (original)
+++ multipath-tools/trunk/multipath/multipath.rules Wed Dec 20 11:47:20 2006
@@ -2,9 +2,17 @@
# multipath and multipath partitions nodes are created in /dev/mapper/
# this file should be installed in /etc/udev/rules.d
#
+# !! udev must not discard DM events !!
+# !! check the other installed rules !!
+#
+
+# lookup the devmap name
+#ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
+# PROGRAM="/sbin/devmap_name %M %m"
+ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
+ PROGRAM="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info"
# take care of devmap partitioning
ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
- PROGRAM="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info", \
RUN+="/sbin/kpartx -a /dev/mapper/%c"
Modified: multipath-tools/trunk/path_priority/pp_alua/Makefile
==============================================================================
--- multipath-tools/trunk/path_priority/pp_alua/Makefile (original)
+++ multipath-tools/trunk/path_priority/pp_alua/Makefile Wed Dec 20 11:47:20 2006
@@ -36,7 +36,7 @@
$(CC) -static -o $(EXEC) $(OBJS)
install: $(BUILD) $(EXEC).8.gz
- $(INSTALL) -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+ $(INSTALL) -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
$(INSTALL) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)/$(EXEC).8.gz
uninstall:
Modified: multipath-tools/trunk/path_priority/pp_random/Makefile
==============================================================================
--- multipath-tools/trunk/path_priority/pp_random/Makefile (original)
+++ multipath-tools/trunk/path_priority/pp_random/Makefile Wed Dec 20 11:47:20 2006
@@ -14,8 +14,7 @@
$(CC) -static -o $(EXEC) $(OBJS)
install: $(EXEC)
- install -d $(DESTDIR)$(bindir)
- install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+ install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
uninstall:
rm $(DESTDIR)$(bindir)/$(EXEC)
More information about the pkg-lvm-commits
mailing list