[Dmraid-debian-commits] r7 - in /trunk/debian: changelog patches/00list patches/01_fix_broken_linking.dpatch patches/03_fix_hyphen-used-as-minus-sign.dpatch patches/04_do_not_use_p_for_partition.dpatch
derevko-guest at users.alioth.debian.org
derevko-guest at users.alioth.debian.org
Sun Oct 5 12:19:53 UTC 2008
Author: derevko-guest
Date: Sat Oct 4 20:45:11 2008
New Revision: 7
URL: http://svn.debian.org/wsvn/dmraid-debian/?sc=1&rev=7
Log:
Updated changelog
Removed "p" from device name. A proper upgrade script is needed before using it.
Fixed 01_fix_broken_linking.dpatch, this should be reviewed
Updated 03_fix_hyphen-used-as-minus-sign.dpatch
Added:
trunk/debian/patches/04_do_not_use_p_for_partition.dpatch (with props)
Modified:
trunk/debian/changelog
trunk/debian/patches/00list
trunk/debian/patches/01_fix_broken_linking.dpatch
trunk/debian/patches/03_fix_hyphen-used-as-minus-sign.dpatch
Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/changelog?rev=7&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Sat Oct 4 20:45:11 2008
@@ -1,6 +1,6 @@
-dmraid (1.0.0.rc15-1) UNRELEASED; urgency=low
-
- * (NOT RELEASED YET) New upstream release
+dmraid (1.0.0.rc15-1) experimental; urgency=low
+
+ * New upstream release
* debian/control:
+ Added Version Control System location
+ Create new packages, libdmraid1, libdmraid-dev and libdmraid1-udeb
@@ -13,6 +13,8 @@
02_raid45_toraid456.dpatch, 11_fix_segfault_on_big_endian.dpatch
+ Added 02_raid45_to_raid4-5.dpatch
+ Updated all patches to work with 1.0.0.rc15
+ + 04_do_not_use_p_for_partition.dpatch: Removed "p" from device name. A
+ proper upgrade script is needed before using it.
* debian/rules:
+ copy config.sub and config.guess in the right location
+ fix mandir location
@@ -26,7 +28,7 @@
* debian/initramfs/dmraid.initramfs-hook/dmraid: Use force_load instead of
manual_add_modules
- -- Giuseppe Iuculano <giuseppe at iuculano.it> Thu, 02 Oct 2008 19:18:12 +0200
+ -- Giuseppe Iuculano <giuseppe at iuculano.it> Sat, 04 Oct 2008 22:10:18 +0200
dmraid (1.0.0.rc14-4) unstable; urgency=high
@@ -40,7 +42,7 @@
* debian/dmraid-activate: Don't take out any locks, added -i
(--ignorelocking) option in every dmraid command executed by
dmraid-activate, and do not use /usr/bin/basename, it is pointless and
- breaks fakeraid detenction if /usr isn't mounted (Closes: 499060)
+ breaks fakeraid detection if /usr isn't mounted (Closes: 499060)
* debian/control: Removed lsb-base and added udev in dmraid Depends
-- Giuseppe Iuculano <giuseppe at iuculano.it> Sun, 21 Sep 2008 15:54:38 +0200
Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/patches/00list?rev=7&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Sat Oct 4 20:45:11 2008
@@ -1,5 +1,6 @@
01_fix_broken_linking.dpatch
02_raid45_to_raid4-5.dpatch
03_fix_hyphen-used-as-minus-sign.dpatch
+04_do_not_use_p_for_partition.dpatch
05_kernel-event-handling.dpatch
09_promise-add-offsets.dpatch
Modified: trunk/debian/patches/01_fix_broken_linking.dpatch
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/patches/01_fix_broken_linking.dpatch?rev=7&op=diff
==============================================================================
--- trunk/debian/patches/01_fix_broken_linking.dpatch (original)
+++ trunk/debian/patches/01_fix_broken_linking.dpatch Sat Oct 4 20:45:11 2008
@@ -27,14 +27,6 @@
fi
-@@ -6508,6 +6511,7 @@
- DMRAID_TEST!$DMRAID_TEST$ac_delim
- DMRAID_VERSION!$DMRAID_VERSION$ac_delim
- DMRAID_LIB_VERSION!$DMRAID_LIB_VERSION$ac_delim
-+DMRAID_LIB_MAJOR_VERSION!$DMRAID_LIB_MAJOR_VERSION$ac_delim
- DIETLIBC!$DIETLIBC$ac_delim
- GROUP!$GROUP$ac_delim
- JOBS!$JOBS$ac_delim
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
Modified: trunk/debian/patches/03_fix_hyphen-used-as-minus-sign.dpatch
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/patches/03_fix_hyphen-used-as-minus-sign.dpatch?rev=7&op=diff
==============================================================================
--- trunk/debian/patches/03_fix_hyphen-used-as-minus-sign.dpatch (original)
+++ trunk/debian/patches/03_fix_hyphen-used-as-minus-sign.dpatch Sat Oct 4 20:45:11 2008
@@ -6,9 +6,9 @@
@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-09-29 18:47:41.000000000 +0200
-+++ trunk/1.0.0.rc15/man/dmraid.8 2008-09-30 09:01:54.000000000 +0200
-@@ -4,18 +4,18 @@
+--- 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 21:52:06.000000000 +0200
+@@ -4,19 +4,19 @@
.SH SYNOPSIS
.B dmraid
{-a|--activate} {y|n|yes|no}
@@ -18,9 +18,10 @@
+ [\-f|--format FORMAT[,FORMAT...]]
[{-P|--partchar} CHAR]
- [-p|--no_partitions]
+- [--separator SEPARATOR]
+- [-t|--test]
+ [\-p|--no_partitions]
- [--separator SEPARATOR]
-- [-t|--test]
++ [\--separator SEPARATOR]
+ [\-t|--test]
[RAID-set...]
@@ -28,11 +29,13 @@
{-b|--block_devices}
- [-c|--display_columns][FIELD[,FIELD...]]...
- [-d|--debug]... [-v|--verbose]...
+- [--separator SEPARATOR]
+ [\-c|--display_columns][FIELD[,FIELD...]]...
-+ [\-d|--debug]... [-v|--verbose]...
- [--separator SEPARATOR]
- [device-path...]
-
++ [\-d|--debug]... [\-v|--verbose]...
++ [\--separator SEPARATOR]
+ [device-path...]
+
+ .B dmraid
@@ -24,12 +24,12 @@
.B dmraid
@@ -44,12 +47,12 @@
{-n|--native_log}
- [-d|--debug]... [-v|--verbose]... [-i|--ignorelocking]
- [-f|--format FORMAT[,FORMAT...]]
-+ [\-d|--debug]... [-v|--verbose]... [-i|--ignorelocking]
++ [\-d|--debug]... [\-v|--verbose]... [\-i|--ignorelocking]
+ [\-f|--format FORMAT[,FORMAT...]]
[--separator SEPARATOR]
[device-path...]
-@@ -56,27 +56,27 @@
+@@ -56,28 +56,28 @@
.B dmraid
{-r|--raid_devices}
@@ -57,11 +60,12 @@
- [-d|--debug]... [-v|--verbose]... [-i|--ignorelocking]
- [-D|--dump_metadata]
- [-f|--format FORMAT[,FORMAT...]]
+- [--separator SEPARATOR]
+ [\-c|--display_columns][FIELD[,FIELD...]]...
-+ [\-d|--debug]... [-v|--verbose]... [-i|--ignorelocking]
++ [\-d|--debug]... [-v|--verbose]... [\-i|--ignorelocking]
+ [\-D|--dump_metadata]
+ [\-f|--format FORMAT[,FORMAT...]]
- [--separator SEPARATOR]
++ [\--separator SEPARATOR]
[device-path...]
.B dmraid
@@ -69,10 +73,11 @@
- [-d|--debug]... [-v|--verbose]... [-i|--ignorelocking]
- [-E|--erase_metadata]
- [-f|--format FORMAT[,FORMAT...]]
-+ [\-d|--debug]... [-v|--verbose]... [-i|--ignorelocking]
+- [--separator SEPARATOR]
++ [\-d|--debug]... [\-v|--verbose]... [\-i|--ignorelocking]
+ [\-E|--erase_metadata]
+ [\-f|--format FORMAT[,FORMAT...]]
- [--separator SEPARATOR]
++ [\--separator SEPARATOR]
[device-path...]
.B dmraid
@@ -81,13 +86,24 @@
- [-d|--debug]... [-v|--verbose]... [-i|--ignorelocking]
- [-f|--format FORMAT[,FORMAT...]]
- [-g|--display_group]
+- [--separator SEPARATOR]
+ [\-c|--display_columns][FIELD[,FIELD...]]...
-+ [\-d|--debug]... [-v|--verbose]... [-i|--ignorelocking]
++ [\-d|--debug]... [\-v|--verbose]... [\-i|--ignorelocking]
+ [\-f|--format FORMAT[,FORMAT...]]
+ [\-g|--display_group]
- [--separator SEPARATOR]
++ [\--separator SEPARATOR]
[RAID-set...]
+ .B dmraid
+@@ -112,7 +112,7 @@
+ .B -p
+ disables the activation of partitions on them.
+ RAID set names given on command line don't need to be fully specified
+-(eg, "dmraid -ay sil" would activate all discovered Silicon Image Medley
++(eg, "dmraid \-ay sil" would activate all discovered Silicon Image Medley
+ RAID sets).
+
+ .TP
@@ -129,7 +129,7 @@
below for FIELD identifiers.
@@ -97,3 +113,93 @@
Enable debugging output. Opion can be given multiple times
increasing the debug output level.
+@@ -344,7 +344,7 @@
+ .TP
+ .I -s... [a|i] [RAID-set...]
+ Display properties of RAID sets. Multiple RAID set names can be given
+-on the command line which don't need to be fully specified (eg, "dmraid -s hpt"
++on the command line which don't need to be fully specified (eg, "dmraid \-s hpt"
+ would display all discovered Highpoint RAID sets). Enter
+ .B -s
+ twice to display RAID subsets too.
+@@ -372,7 +372,7 @@
+ increasing the verbosity level.
+
+ .SH EXAMPLES
+-"dmraid -l" lists all supported metadata formats with their names along with
++"dmraid \-l" lists all supported metadata formats with their names along with
+ some descriptive information, eg:
+ .br
+ hpt37x : (+) Highpoint HPT37X
+@@ -395,16 +395,16 @@
+ .br
+ (0): Discover, (+): Discover+Activate
+
+-"dmraid -ay" activates all software RAID sets discovered.
++"dmraid \-ay" activates all software RAID sets discovered.
+
+-"dmraid -an" deactivates all active software RAID sets which are not open
++"dmraid \-an" deactivates all active software RAID sets which are not open
+ (eg, mounted filesystem on them).
+
+-"dmraid -ay -f pdc" (pdc looked up from "dmraid -l") activates all
++"dmraid \-ay \-f pdc" (pdc looked up from "dmraid -l") activates all
+ software RAID sets with Promise format discovered and ignores all other
+ supported formats.
+
+-"dmraid -r" discovers all software RAID devices supported on your system, eg:
++"dmraid \-r" discovers all software RAID devices supported on your system, eg:
+ .br
+ /dev/dm-46: hpt45x, "hpt45x_chidjhaiaa-0", striped, ok, 320172928 sectors, data@ 0
+ .br
+@@ -415,7 +415,7 @@
+ /dev/dm-58: hpt45x, "hpt45x_chidjhaiaa-1", striped, ok, 320172928 sectors, data@ 0
+
+
+-"dmraid -s -s hpt45x_chidjhaiaa" displays properties of
++"dmraid \-s \-s hpt45x_chidjhaiaa" displays properties of
+ set "hpt45x_chidjhaiaa", eg:
+ .br
+ *** Superset
+@@ -473,7 +473,7 @@
+ spare : 0
+ .br
+
+-"dmraid -s -ccs hpt45" displays properties in column format of all sets
++"dmraid \-s \-ccs hpt45" displays properties in column format of all sets
+ and subsets with hpt45* format, eg:
+ .br
+ hpt45x_chidjhaiaa,640345856,128,raid10,ok,4,0
+@@ -482,7 +482,7 @@
+ .br
+ hpt45x_chidjhaiaa-b,640345856,128,stripe,ok,2,0
+
+-"dmraid -r --sep : -cpath:size" display paths and sizes in sectors for
++"dmraid \-r \--sep : \-cpath:size" display paths and sizes in sectors for
+ RAID devices in column format using ':' as a delimiter, eg:
+ .br
+ /dev/dm-8:320173055
+@@ -513,18 +513,18 @@
+ .br
+ /dev/dm-66:390624896
+
+-"dmraid -f isw -C Raid0 --type 0 --strip 8k --size 20g --disk "/dev/sdb /dev/sdc"" creates an ISW volume with
++"dmraid \-f isw \-C Raid0 \--type 0 \--strip 8k \--size 20g \--disk "/dev/sdb /dev/sdc"" creates an ISW volume with
+ a name of "Raid0", 20Gig bytes in total, and 8kilo bytes strip size on two disks.
+
+-"dmraid -f isw -C Test0 --type 0 --disk "/dev/sdd /dev/sde"" creates an ISW volume with the default size and strip size.
++"dmraid \-f isw \-C Test0 \--type 0 \--disk "/dev/sdd /dev/sde"" creates an ISW volume with the default size and strip size.
+
+-"dmraid -f isw -C Test10 --type 01 --strip 128B --disk "/dev/sda /dev/sdb /dev/sdc /dev/sdd" creates a stacked
++"dmraid \-f isw \-C Test10 \--type 01 \--strip 128B \--disk "/dev/sda /dev/sdb /dev/sdc /dev/sdd" creates a stacked
+ RAID device, RAID10 (isw format), with a name of "Test10", 128 blocks (512bytes) strip size , and the default volume size on
+ 4 disks.
+
+-"dmraid -f isw -S -M /dev/sde" marks the device /dev/sde as a hot spare for rebuild
++"dmraid \-f isw \-S -M /dev/sde" marks the device /dev/sde as a hot spare for rebuild
+
+-"dmraid -R isw_djaggchdde_RAID1 /dev/sde" starts rebuild of the RAID volume on device /dev/sde
++"dmraid \-R isw_djaggchdde_RAID1 /dev/sde" starts rebuild of the RAID volume on device /dev/sde
+
+ .SH DIAGNOSTICS
+ dmraid returns an exit code of 0 for success or 1 for error.
Added: trunk/debian/patches/04_do_not_use_p_for_partition.dpatch
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/patches/04_do_not_use_p_for_partition.dpatch?rev=7&op=file
==============================================================================
--- trunk/debian/patches/04_do_not_use_p_for_partition.dpatch (added)
+++ trunk/debian/patches/04_do_not_use_p_for_partition.dpatch Sat Oct 4 20:45:11 2008
@@ -1,0 +1,19 @@
+#! /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);
+ }
+
Propchange: trunk/debian/patches/04_do_not_use_p_for_partition.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Dmraid-debian-commits
mailing list