[Dmraid-debian-commits] [SCM] Maintenance of the dmraid package branch, master, updated. debian/1.0.0.rc15-1.exp4-2-gdb69b2c
Giuseppe Iuculano
giuseppe at iuculano.it
Mon Jan 12 10:41:50 UTC 2009
The following commit has been merged in the master branch:
commit db69b2c36d7f656912c483b7a95a5f0545f75775
Author: Giuseppe Iuculano <giuseppe at iuculano.it>
Date: Sat Dec 27 14:45:40 2008 +0100
Switch to quilt
diff --git a/debian/control b/debian/control
index 213c3e4..d6f21e4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Giuseppe Iuculano <giuseppe at iuculano.it>
Uploaders: Luke Yelavich <themuso at ubuntu.com>
Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 5), libdevmapper-dev, libklibc-dev, libselinux1-dev, dpatch, autotools-dev
+Build-Depends: debhelper (>= 5), libdevmapper-dev, libklibc-dev, libselinux1-dev, quilt (>= 0.40), autotools-dev
Vcs-git: git://git.debian.org/git/users/derevko-guest/dmraid.git
Vcs-Browser: http://git.debian.org/?p=users/derevko-guest/dmraid.git;a=summary
Homepage: http://people.redhat.com/~heinzm/sw/dmraid/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e9179cd..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,9 +0,0 @@
-01_fix_broken_linking.dpatch
-02_scsi_serial_remove_ws.dpatch
-03_fix_hyphen-used-as-minus-sign.dpatch
-04_do_not_use_p_for_partition.dpatch
-05_kernel-event-handling.dpatch
-06_fix_led_support_compilation.dpatch
-09_promise-add-offsets.dpatch
-10_exit_code.dpatch
-12_support_virtio_devices.dpatch
diff --git a/debian/patches/01_fix_broken_linking.dpatch b/debian/patches/01_fix_broken_linking.patch
old mode 100755
new mode 100644
similarity index 63%
rename from debian/patches/01_fix_broken_linking.dpatch
rename to debian/patches/01_fix_broken_linking.patch
index 7e7548b..7bca3b6
--- a/debian/patches/01_fix_broken_linking.dpatch
+++ b/debian/patches/01_fix_broken_linking.patch
@@ -1,14 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix-lib-symlinking.dpatch by Luke Yelavich <themuso at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix library symbolic link creation and library linking.
-
- at DPATCH@
-diff -urNad trunk~/1.0.0.rc15/configure trunk/1.0.0.rc15/configure
---- trunk~/1.0.0.rc15/configure 2008-10-01 13:28:31.000000000 +0200
-+++ trunk/1.0.0.rc15/configure 2008-10-01 13:31:28.000000000 +0200
-@@ -693,6 +693,7 @@
+Author: Luke Yelavich <themuso at ubuntu.com>
+Description: Fix library symbolic link creation and library linking.
+--- a/1.0.0.rc15/configure
++++ b/1.0.0.rc15/configure
+@@ -693,6 +693,7 @@ DEBUG_MALLOC
DMRAID_TEST
DMRAID_VERSION
DMRAID_LIB_VERSION
@@ -16,7 +10,7 @@ diff -urNad trunk~/1.0.0.rc15/configure trunk/1.0.0.rc15/configure
DIETLIBC
GROUP
JOBS
-@@ -5767,8 +5768,10 @@
+@@ -5767,8 +5768,10 @@ fi
if test "-f lib/version.h"; then
DMRAID_LIB_VERSION="`sed --quiet 's/^.*\(DMRAID_LIB_VERSION\)[^_].*"\(.*\)"/\2/p' lib/version.h`"
@@ -27,10 +21,9 @@ diff -urNad trunk~/1.0.0.rc15/configure trunk/1.0.0.rc15/configure
fi
-diff -urNad trunk~/1.0.0.rc15/configure.in trunk/1.0.0.rc15/configure.in
---- trunk~/1.0.0.rc15/configure.in 2008-10-01 13:28:31.000000000 +0200
-+++ trunk/1.0.0.rc15/configure.in 2008-10-01 13:30:55.000000000 +0200
-@@ -178,7 +178,7 @@
+--- a/1.0.0.rc15/configure.in
++++ b/1.0.0.rc15/configure.in
+@@ -178,7 +178,7 @@ if test x$DEBUG_MALLOC = xyes; then
fi
dnl Mess with default exec_prefix
@@ -39,7 +32,7 @@ diff -urNad trunk~/1.0.0.rc15/configure.in trunk/1.0.0.rc15/configure.in
then exec_prefix="";
fi;
-@@ -220,8 +220,10 @@
+@@ -220,8 +220,10 @@ fi
if test "-f lib/version.h"; then
DMRAID_LIB_VERSION="`sed --quiet 's/^.*\(DMRAID_LIB_VERSION\)[[^_]].*"\(.*\)"/\2/p' lib/version.h`"
@@ -50,7 +43,7 @@ diff -urNad trunk~/1.0.0.rc15/configure.in trunk/1.0.0.rc15/configure.in
fi
AC_SUBST(CC)
-@@ -232,6 +234,7 @@
+@@ -232,6 +234,7 @@ AC_SUBST(DEBUG_MALLOC)
AC_SUBST(DMRAID_TEST)
AC_SUBST(DMRAID_VERSION)
AC_SUBST(DMRAID_LIB_VERSION)
@@ -58,10 +51,9 @@ diff -urNad trunk~/1.0.0.rc15/configure.in trunk/1.0.0.rc15/configure.in
AC_SUBST(DIETLIBC)
AC_SUBST(GROUP)
AC_SUBST(JOBS)
-diff -urNad trunk~/1.0.0.rc15/lib/Makefile.in trunk/1.0.0.rc15/lib/Makefile.in
---- trunk~/1.0.0.rc15/lib/Makefile.in 2008-10-01 13:28:31.000000000 +0200
-+++ trunk/1.0.0.rc15/lib/Makefile.in 2008-10-01 13:30:55.000000000 +0200
-@@ -56,6 +56,11 @@
+--- a/1.0.0.rc15/lib/Makefile.in
++++ b/1.0.0.rc15/lib/Makefile.in
+@@ -56,6 +56,11 @@ ifeq ("@KLIBC@", "no")
LIB_SHARED=$(top_srcdir)/lib/libdmraid.so
TARGETS += $(LIB_SHARED)
INSTALL_TARGETS += $(LIB_SHARED)
@@ -73,7 +65,7 @@ diff -urNad trunk~/1.0.0.rc15/lib/Makefile.in trunk/1.0.0.rc15/lib/Makefile.in
endif
endif
-@@ -72,10 +77,11 @@
+@@ -72,10 +77,11 @@ install_dmraid_libs: $(INSTALL_TARGETS)
for f in $(INSTALL_TARGETS); \
do \
n=$$(basename $${f}) ; \
@@ -87,10 +79,9 @@ diff -urNad trunk~/1.0.0.rc15/lib/Makefile.in trunk/1.0.0.rc15/lib/Makefile.in
else \
$(INSTALL) -m 555 $(STRIP) $$f $(libdir)/$${n}; \
fi \
-diff -urNad trunk~/1.0.0.rc15/make.tmpl.in trunk/1.0.0.rc15/make.tmpl.in
---- trunk~/1.0.0.rc15/make.tmpl.in 2008-10-01 13:28:31.000000000 +0200
-+++ trunk/1.0.0.rc15/make.tmpl.in 2008-10-01 13:30:55.000000000 +0200
-@@ -44,6 +44,7 @@
+--- a/1.0.0.rc15/make.tmpl.in
++++ b/1.0.0.rc15/make.tmpl.in
+@@ -44,6 +44,7 @@ endif
OWNER = @OWNER@
GROUP = @GROUP@
DMRAID_LIB_VERSION = @DMRAID_LIB_VERSION@
@@ -98,7 +89,7 @@ diff -urNad trunk~/1.0.0.rc15/make.tmpl.in trunk/1.0.0.rc15/make.tmpl.in
# The number of jobs to run, if blank, defaults to the make standard
ifndef MAKEFLAGS
-@@ -131,7 +132,7 @@
+@@ -131,7 +132,7 @@ $(TARGETS): $(OBJECTS)
%.so: $(OBJECTS)
$(CC) -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \
@@ -107,10 +98,9 @@ diff -urNad trunk~/1.0.0.rc15/make.tmpl.in trunk/1.0.0.rc15/make.tmpl.in
$(LIB_STATIC): $(OBJECTS)
$(RM) $@
-diff -urNad trunk~/1.0.0.rc15/tools/Makefile.in trunk/1.0.0.rc15/tools/Makefile.in
---- trunk~/1.0.0.rc15/tools/Makefile.in 2008-10-01 13:28:31.000000000 +0200
-+++ trunk/1.0.0.rc15/tools/Makefile.in 2008-10-01 13:30:55.000000000 +0200
-@@ -28,9 +28,13 @@
+--- a/1.0.0.rc15/tools/Makefile.in
++++ b/1.0.0.rc15/tools/Makefile.in
+@@ -28,9 +28,13 @@ ifeq ("@KLIBC@", "yes")
DMRAIDLIBS += -ldevmapper_klibc
else
ifeq ("@DIETLIBC@", "yes")
diff --git a/debian/patches/02_scsi_serial_remove_ws.dpatch b/debian/patches/02_scsi_serial_remove_ws.dpatch
deleted file mode 100755
index 9ccb6b9..0000000
--- a/debian/patches/02_scsi_serial_remove_ws.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_scsi_serial_remove_ws.dpatch by Giuseppe Iuculano <giuseppe at iuculano.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: remove whitespace from serial id (LP: #305011)
-
- at DPATCH@
-diff -urNad trunk~/1.0.0.rc15/lib/device/scsi.c trunk/1.0.0.rc15/lib/device/scsi.c
---- trunk~/1.0.0.rc15/lib/device/scsi.c 2008-09-29 18:47:41.000000000 +0200
-+++ trunk/1.0.0.rc15/lib/device/scsi.c 2008-12-05 19:16:50.000000000 +0100
-@@ -110,7 +110,10 @@
- }
-
- ret = ret &&
-- (di->serial = dbg_strdup((char *) &response[p->start + 1]));
-+ (di->serial =
-+ dbg_strdup(remove_white_space(lc,
-+ (char *) &response[p->start + 1],
-+ serial_len)));
- }
-
- dbg_free(response);
diff --git a/debian/patches/02_scsi_serial_remove_ws.patch b/debian/patches/02_scsi_serial_remove_ws.patch
new file mode 100644
index 0000000..dd30db9
--- /dev/null
+++ b/debian/patches/02_scsi_serial_remove_ws.patch
@@ -0,0 +1,16 @@
+Author: Giuseppe Iuculano <giuseppe at iuculano.it>
+Description: remove whitespace from serial id (LP: #305011)
+--- a/1.0.0.rc15/lib/device/scsi.c
++++ b/1.0.0.rc15/lib/device/scsi.c
+@@ -110,7 +110,10 @@ get_scsi_serial(struct lib_context *lc,
+ }
+
+ ret = ret &&
+- (di->serial = dbg_strdup((char *) &response[p->start + 1]));
++ (di->serial =
++ dbg_strdup(remove_white_space(lc,
++ (char *) &response[p->start + 1],
++ serial_len)));
+ }
+
+ dbg_free(response);
diff --git a/debian/patches/03_fix_hyphen-used-as-minus-sign.dpatch b/debian/patches/03_fix_hyphen-used-as-minus-sign.patch
old mode 100755
new mode 100644
similarity index 88%
rename from debian/patches/03_fix_hyphen-used-as-minus-sign.dpatch
rename to debian/patches/03_fix_hyphen-used-as-minus-sign.patch
index eb71b14..976b763
--- a/debian/patches/03_fix_hyphen-used-as-minus-sign.dpatch
+++ b/debian/patches/03_fix_hyphen-used-as-minus-sign.patch
@@ -1,14 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_fix_hyphen-used-as-minus-sign.dpatch by Giuseppe Iuculano <giuseppe at iuculano.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix hyphen-used-as-minus-sign
-
- at DPATCH@
-diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
---- trunk~/1.0.0.rc15/man/dmraid.8 2008-10-04 20:28:36.000000000 +0200
-+++ trunk/1.0.0.rc15/man/dmraid.8 2008-10-04 23:34:54.000000000 +0200
-@@ -4,19 +4,19 @@
+Author: Giuseppe Iuculano <giuseppe at iuculano.it>
+Description: Fix hyphen-used-as-minus-sign
+--- a/1.0.0.rc15/man/dmraid.8
++++ b/1.0.0.rc15/man/dmraid.8
+@@ -4,19 +4,19 @@ dmraid \- discover, configure and activa
.SH SYNOPSIS
.B dmraid
{-a|--activate} {y|n|yes|no}
@@ -36,7 +30,7 @@ diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
[device-path...]
.B dmraid
-@@ -24,60 +24,60 @@
+@@ -24,60 +24,60 @@ dmraid \- discover, configure and activa
.B dmraid
{-l|--list_formats}
@@ -125,7 +119,7 @@ diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
[RAID-set...]
.B dmraid
-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ When activating RAID sets,
.B -p
disables the activation of partitions on them.
RAID set names given on command line don't need to be fully specified
@@ -134,7 +128,7 @@ diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
RAID sets).
.TP
-@@ -129,7 +129,7 @@
+@@ -129,7 +129,7 @@ See description of
below for FIELD identifiers.
.TP
@@ -143,7 +137,7 @@ diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
Enable debugging output. Opion can be given multiple times
increasing the debug output level.
-@@ -209,18 +209,18 @@
+@@ -209,18 +209,18 @@ is added to the system.
During system reboot, enter OROM and mark the new drive as the rebuild drive.
After booting to the OS, use the dmraid command to rebuild.
@@ -166,7 +160,7 @@ diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
.TP
.I {-x|--remove} [RAID-set]
-@@ -230,11 +230,11 @@
+@@ -230,11 +230,11 @@ Delete one or all existing software RAID
.I -f FORMAT-handler {-C|--create} --type raidlevel [--size=setsize --strip stripsize] --disk "device-path, device-path [,device-path]"
Delete one or all existing Configure a software RAID device and store the configuration data in a group of hard drive devices consisting of this array. This command requires the following options:
@@ -181,7 +175,7 @@ diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
.br
specify the raid level of the software RAID set.
.br
-@@ -246,7 +246,7 @@
+@@ -246,7 +246,7 @@ Delete one or all existing Configure a s
.br
01: raid01 (isw raid10)
.br
@@ -190,7 +184,7 @@ diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
.br
specify the size of the RAID set.The number is an integer followed by [kKmMgG] and/or [bB].
.br
-@@ -262,11 +262,11 @@
+@@ -262,11 +262,11 @@ Delete one or all existing Configure a s
.br
If this option is missing, it's set to the default value pre-configured by the vendor. Note that different vendors may apply different constraints on the granularity of the size or the minimal value.
.br
@@ -204,7 +198,7 @@ diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
.br
specify the array of the hard drives, e.g. /dev/sda.
-@@ -344,7 +344,7 @@
+@@ -344,7 +344,7 @@ Use SEPARATOR as a delimiter for all opt
.TP
.I -s... [a|i] [RAID-set...]
Display properties of RAID sets. Multiple RAID set names can be given
@@ -213,7 +207,7 @@ diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
would display all discovered Highpoint RAID sets). Enter
.B -s
twice to display RAID subsets too.
-@@ -372,7 +372,7 @@
+@@ -372,7 +372,7 @@ Enable verbose runtime information outpu
increasing the verbosity level.
.SH EXAMPLES
@@ -222,7 +216,7 @@ diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
some descriptive information, eg:
.br
hpt37x : (+) Highpoint HPT37X
-@@ -395,16 +395,16 @@
+@@ -395,16 +395,16 @@ dos : (+) DOS partitions on SW RAIDs
.br
(0): Discover, (+): Discover+Activate
@@ -243,7 +237,7 @@ diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
.br
/dev/dm-46: hpt45x, "hpt45x_chidjhaiaa-0", striped, ok, 320172928 sectors, data@ 0
.br
-@@ -415,7 +415,7 @@
+@@ -415,7 +415,7 @@ supported formats.
/dev/dm-58: hpt45x, "hpt45x_chidjhaiaa-1", striped, ok, 320172928 sectors, data@ 0
@@ -252,7 +246,7 @@ diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
set "hpt45x_chidjhaiaa", eg:
.br
*** Superset
-@@ -473,7 +473,7 @@
+@@ -473,7 +473,7 @@ dev : 2
spare : 0
.br
@@ -261,7 +255,7 @@ diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
and subsets with hpt45* format, eg:
.br
hpt45x_chidjhaiaa,640345856,128,raid10,ok,4,0
-@@ -482,7 +482,7 @@
+@@ -482,7 +482,7 @@ hpt45x_chidjhaiaa-a,640345856,128,stripe
.br
hpt45x_chidjhaiaa-b,640345856,128,stripe,ok,2,0
@@ -270,7 +264,7 @@ diff -urNad trunk~/1.0.0.rc15/man/dmraid.8 trunk/1.0.0.rc15/man/dmraid.8
RAID devices in column format using ':' as a delimiter, eg:
.br
/dev/dm-8:320173055
-@@ -513,18 +513,18 @@
+@@ -513,18 +513,18 @@ RAID devices in column format using ':'
.br
/dev/dm-66:390624896
diff --git a/debian/patches/04_do_not_use_p_for_partition.dpatch b/debian/patches/04_do_not_use_p_for_partition.dpatch
deleted file mode 100755
index 101c9ee..0000000
--- a/debian/patches/04_do_not_use_p_for_partition.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_do_not_use_p_for_partition.dpatch by Giuseppe Iuculano <giuseppe at iuculano.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removed "p" from device name. A proper upgrade script is needed before using it.
-
- at DPATCH@
-diff -urNad trunk~/1.0.0.rc15/lib/format/partition/dos.c trunk/1.0.0.rc15/lib/format/partition/dos.c
---- trunk~/1.0.0.rc15/lib/format/partition/dos.c 2008-09-29 18:47:41.000000000 +0200
-+++ trunk/1.0.0.rc15/lib/format/partition/dos.c 2008-10-04 22:09:46.000000000 +0200
-@@ -31,7 +31,7 @@
- {
- const char *base = get_basename(lc, rd->di->path);
-
-- return type ? snprintf(str, len, "%s%s%u", base, OPT_STR_PARTCHAR(lc),
-+ return type ? snprintf(str, len, "%s%u", base,
- partition) : snprintf(str, len, "%s", base);
- }
-
diff --git a/debian/patches/04_do_not_use_p_for_partition.patch b/debian/patches/04_do_not_use_p_for_partition.patch
new file mode 100644
index 0000000..6636b05
--- /dev/null
+++ b/debian/patches/04_do_not_use_p_for_partition.patch
@@ -0,0 +1,13 @@
+Author: Giuseppe Iuculano <giuseppe at iuculano.it>
+Description: Removed "p" from device name. A proper upgrade script is needed before using it.
+--- a/1.0.0.rc15/lib/format/partition/dos.c
++++ b/1.0.0.rc15/lib/format/partition/dos.c
+@@ -31,7 +31,7 @@ _name(struct lib_context *lc, struct rai
+ {
+ const char *base = get_basename(lc, rd->di->path);
+
+- return type ? snprintf(str, len, "%s%s%u", base, OPT_STR_PARTCHAR(lc),
++ return type ? snprintf(str, len, "%s%u", base,
+ partition) : snprintf(str, len, "%s", base);
+ }
+
diff --git a/debian/patches/05_kernel-event-handling.dpatch b/debian/patches/05_kernel-event-handling.dpatch
deleted file mode 100755
index f0f8366..0000000
--- a/debian/patches/05_kernel-event-handling.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_kernel-event-handling.dpatch by Luke Yelavich <themuso at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add support for kernel driver event handling support.
-
- at DPATCH@
-diff -urNad trunk~/1.0.0.rc15/lib/activate/activate.c trunk/1.0.0.rc15/lib/activate/activate.c
---- trunk~/1.0.0.rc15/lib/activate/activate.c 2008-09-29 18:47:41.000000000 +0200
-+++ trunk/1.0.0.rc15/lib/activate/activate.c 2008-09-30 09:05:58.000000000 +0200
-@@ -239,7 +239,11 @@
- (*stripes)++;
- }
-
-- return 1;
-+ /* Append the flag/feature required for dmraid1
-+ * event handling in the kernel driver
-+ */
-+ if(p_fmt(lc, table, " 1 handle_errors"))
-+ return 1;
-
- err:
- return 0;
diff --git a/debian/patches/05_kernel-event-handling.patch b/debian/patches/05_kernel-event-handling.patch
new file mode 100644
index 0000000..a04e7af
--- /dev/null
+++ b/debian/patches/05_kernel-event-handling.patch
@@ -0,0 +1,17 @@
+Author: Luke Yelavich <themuso at ubuntu.com>
+Description: Add support for kernel driver event handling support.
+--- a/1.0.0.rc15/lib/activate/activate.c
++++ b/1.0.0.rc15/lib/activate/activate.c
+@@ -239,7 +239,11 @@ _dm_raid0_eol(struct lib_context *lc,
+ (*stripes)++;
+ }
+
+- return 1;
++ /* Append the flag/feature required for dmraid1
++ * event handling in the kernel driver
++ */
++ if(p_fmt(lc, table, " 1 handle_errors"))
++ return 1;
+
+ err:
+ return 0;
diff --git a/debian/patches/06_fix_led_support_compilation.dpatch b/debian/patches/06_fix_led_support_compilation.dpatch
deleted file mode 100755
index 7ea7f10..0000000
--- a/debian/patches/06_fix_led_support_compilation.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_fix_led_support_compilation.dpatch by Giuseppe Iuculano <giuseppe at iuculano.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix FTBFS when LED support is enabled
-
- at DPATCH@
-diff -urNad dmraid-debian~/1.0.0.rc15/include/dmraid/misc.h dmraid-debian/1.0.0.rc15/include/dmraid/misc.h
---- dmraid-debian~/1.0.0.rc15/include/dmraid/misc.h 2008-12-17 14:17:43.000000000 +0100
-+++ dmraid-debian/1.0.0.rc15/include/dmraid/misc.h 2008-12-17 16:30:00.000000000 +0100
-@@ -64,7 +64,7 @@
- #define LED_OFF 0
- #define LED_REBUILD 1
-
--int led(char *rd, int status);
-+int led(const char *rd, int status);
- #endif
-
- #endif
diff --git a/debian/patches/06_fix_led_support_compilation.patch b/debian/patches/06_fix_led_support_compilation.patch
new file mode 100644
index 0000000..dfe1a72
--- /dev/null
+++ b/debian/patches/06_fix_led_support_compilation.patch
@@ -0,0 +1,13 @@
+Author: Giuseppe Iuculano <giuseppe at iuculano.it>
+Description: fix FTBFS when LED support is enabled
+--- a/1.0.0.rc15/include/dmraid/misc.h
++++ b/1.0.0.rc15/include/dmraid/misc.h
+@@ -64,7 +64,7 @@ div_up(uint64_t what, unsigned int by)
+ #define LED_OFF 0
+ #define LED_REBUILD 1
+
+-int led(char *rd, int status);
++int led(const char *rd, int status);
+ #endif
+
+ #endif
diff --git a/debian/patches/09_promise-add-offsets.dpatch b/debian/patches/09_promise-add-offsets.dpatch
deleted file mode 100755
index 359e136..0000000
--- a/debian/patches/09_promise-add-offsets.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_promise-add-offsets.dpatch by Luke Yelavich <themuso at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add extra offsets where promise metadata can be found.
-
- at DPATCH@
-diff -urNad trunk~/1.0.0.rc15/lib/format/ataraid/pdc.h trunk/1.0.0.rc15/lib/format/ataraid/pdc.h
---- trunk~/1.0.0.rc15/lib/format/ataraid/pdc.h 2008-09-29 18:47:41.000000000 +0200
-+++ trunk/1.0.0.rc15/lib/format/ataraid/pdc.h 2008-09-30 09:47:04.000000000 +0200
-@@ -13,7 +13,7 @@
-
- #include <stdint.h>
-
--#define PDC_CONFIGOFFSETS 63,255,256,16,399,675,735,974,991
-+#define PDC_CONFIGOFFSETS 63,255,256,16,399,675,735,974,991,911,974
- #define PDC_DATAOFFSET 0
-
- /*
diff --git a/debian/patches/09_promise-add-offsets.patch b/debian/patches/09_promise-add-offsets.patch
new file mode 100644
index 0000000..f523b55
--- /dev/null
+++ b/debian/patches/09_promise-add-offsets.patch
@@ -0,0 +1,13 @@
+Author: Luke Yelavich <themuso at ubuntu.com>
+Description: Add extra offsets where promise metadata can be found.
+--- a/1.0.0.rc15/lib/format/ataraid/pdc.h
++++ b/1.0.0.rc15/lib/format/ataraid/pdc.h
+@@ -13,7 +13,7 @@
+
+ #include <stdint.h>
+
+-#define PDC_CONFIGOFFSETS 63,255,256,16,399,675,735,974,991
++#define PDC_CONFIGOFFSETS 63,255,256,16,399,675,735,974,991,911,974
+ #define PDC_DATAOFFSET 0
+
+ /*
diff --git a/debian/patches/10_exit_code.dpatch b/debian/patches/10_exit_code.dpatch
deleted file mode 100755
index ac3e57d..0000000
--- a/debian/patches/10_exit_code.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_exit_code.dpatch by Giuseppe Iuculano <giuseppe at iuculano.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix exit-code for "No RAID disks" and "no block devices found" errors (LP: #300825)
-
- at DPATCH@
-diff -urNad dmraid.git~/1.0.0.rc15/lib/metadata/metadata.c dmraid.git/1.0.0.rc15/lib/metadata/metadata.c
---- dmraid.git~/1.0.0.rc15/lib/metadata/metadata.c 2008-12-26 20:12:32.000000000 +0100
-+++ dmraid.git/1.0.0.rc15/lib/metadata/metadata.c 2008-12-26 20:37:27.000000000 +0100
-@@ -2092,7 +2092,7 @@
-
- if (!count_devices(lc, DEVICE)) {
- log_print(lc, "no block devices found");
-- return 1;
-+ return 0;
- }
-
- if (!(M_RAID & p->metadata))
-@@ -2114,7 +2114,7 @@
- if (!OPT_HOT_SPARE_SET(lc) && !OPT_CREATE(lc)
- && !count_devices(lc, RAID)) {
- format_error(lc, "disks", argv);
-- return 1;
-+ return 0;
- }
-
- if (M_SET & p->metadata) {
diff --git a/debian/patches/10_exit_code.patch b/debian/patches/10_exit_code.patch
new file mode 100644
index 0000000..b74bdfb
--- /dev/null
+++ b/debian/patches/10_exit_code.patch
@@ -0,0 +1,22 @@
+Author: Giuseppe Iuculano <giuseppe at iuculano.it>
+Description: Fix exit-code for "No RAID disks" and "no block devices found" errors (LP: #300825)
+--- a/1.0.0.rc15/lib/metadata/metadata.c
++++ b/1.0.0.rc15/lib/metadata/metadata.c
+@@ -2092,7 +2092,7 @@ get_metadata(struct lib_context *lc, enu
+
+ if (!count_devices(lc, DEVICE)) {
+ log_print(lc, "no block devices found");
+- return 1;
++ return 0;
+ }
+
+ if (!(M_RAID & p->metadata))
+@@ -2114,7 +2114,7 @@ get_metadata(struct lib_context *lc, enu
+ if (!OPT_HOT_SPARE_SET(lc) && !OPT_CREATE(lc)
+ && !count_devices(lc, RAID)) {
+ format_error(lc, "disks", argv);
+- return 1;
++ return 0;
+ }
+
+ if (M_SET & p->metadata) {
diff --git a/debian/patches/12_support_virtio_devices.dpatch b/debian/patches/12_support_virtio_devices.dpatch
deleted file mode 100755
index 9aa14c9..0000000
--- a/debian/patches/12_support_virtio_devices.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_support_virtio_devices.dpatch by Luke Yelavich <themuso at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support for checking virtio devices for dmraid metadata.
-
- at DPATCH@
-diff -urNad trunk~/1.0.0.rc15/lib/device/scan.c trunk/1.0.0.rc15/lib/device/scan.c
---- trunk~/1.0.0.rc15/lib/device/scan.c 2008-09-29 18:47:41.000000000 +0200
-+++ trunk/1.0.0.rc15/lib/device/scan.c 2008-11-17 15:42:48.000000000 +0100
-@@ -174,7 +174,7 @@
- * Whole IDE and SCSI disks only.
- */
- return (!isdigit(name[strlen(name) - 1]) &&
-- (*(name + 1) == 'd' && (*name == 'h' || *name == 's')))
-+ (*(name + 1) == 'd' && (*name == 'h' || *name == 's' || *name == 'v')))
- #ifdef DMRAID_TEST
- /*
- * Include dm devices for testing.
diff --git a/debian/patches/12_support_virtio_devices.patch b/debian/patches/12_support_virtio_devices.patch
new file mode 100644
index 0000000..b5ad558
--- /dev/null
+++ b/debian/patches/12_support_virtio_devices.patch
@@ -0,0 +1,13 @@
+Author: Luke Yelavich <themuso at ubuntu.com>
+Description: Support for checking virtio devices for dmraid metadata.
+--- a/1.0.0.rc15/lib/device/scan.c
++++ b/1.0.0.rc15/lib/device/scan.c
+@@ -174,7 +174,7 @@ interested(struct lib_context *lc, char
+ * Whole IDE and SCSI disks only.
+ */
+ return (!isdigit(name[strlen(name) - 1]) &&
+- (*(name + 1) == 'd' && (*name == 'h' || *name == 's')))
++ (*(name + 1) == 'd' && (*name == 'h' || *name == 's' || *name == 'v')))
+ #ifdef DMRAID_TEST
+ /*
+ * Include dm devices for testing.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d3aa54a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,9 @@
+01_fix_broken_linking.patch
+02_scsi_serial_remove_ws.patch
+03_fix_hyphen-used-as-minus-sign.patch
+04_do_not_use_p_for_partition.patch
+05_kernel-event-handling.patch
+06_fix_led_support_compilation.patch
+09_promise-add-offsets.patch
+10_exit_code.patch
+12_support_virtio_devices.patch
diff --git a/debian/rules b/debian/rules
index 2618dec..359e183 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -51,7 +51,7 @@ configure-stamp: $(addprefix configure-, $(flavours))
dh_testdir
touch $@
-build: patch-stamp configure build-stamp
+build: $(QUILT_STAMPFN) configure build-stamp
build-stamp:
dh_testdir
for i in ${flavours}; do cd ${buildroot}/$$i && make; done
--
Maintenance of the dmraid package
More information about the Dmraid-debian-commits
mailing list