[Pkg-ofed-commits] [mstflint] 12/13: Add patch to fix spelling errors in mstflint.1 and shipped binaries.

Mehdi Dogguy mehdi at moszumanska.debian.org
Thu Dec 31 19:02:35 UTC 2015


This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository mstflint.

commit a3c7d82295929c8aa991eb2b813645e300cc3884
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Dec 31 01:42:57 2015 +0100

    Add patch to fix spelling errors in mstflint.1 and shipped binaries.
---
 debian/changelog                                   |   1 +
 .../0002-Fix-spelling-errors-in-mstflint.1.patch   |  39 ++++++
 ...Fix-spelling-errors-appearing-in-binaries.patch | 153 +++++++++++++++++++++
 debian/patches/series                              |   2 +
 4 files changed, 195 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 12dbfb6..84c034e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mstflint (4.1.0+1.46.gb1cdaf7-1) UNRELEASED; urgency=medium
     - Previous patches were integrated upstream.
   * Add patch to remove date and time from version string to ensure a
     reproducible build.
+  * Add patch to fix spelling errors in mstflint.1 and shipped binaries.
   * Add a debian/gbp.conf file to automatically filter out upstream's debian/
     directory when running "gbp import-orig".
 
diff --git a/debian/patches/0002-Fix-spelling-errors-in-mstflint.1.patch b/debian/patches/0002-Fix-spelling-errors-in-mstflint.1.patch
new file mode 100644
index 0000000..1cc2aa7
--- /dev/null
+++ b/debian/patches/0002-Fix-spelling-errors-in-mstflint.1.patch
@@ -0,0 +1,39 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Thu, 31 Dec 2015 01:37:44 +0100
+Subject: Fix spelling errors in mstflint.1
+
+---
+ man/mstflint.1 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/man/mstflint.1 b/man/mstflint.1
+index 6212dc4..d06a8c8 100644
+--- a/man/mstflint.1
++++ b/man/mstflint.1
+@@ -61,7 +61,7 @@ Commands affected: burn, sg
+ \fB--guids\fP <GUIDS\.\.\.>
+ : 4 GUIDs must be specified here.
+ The specified GUIDs are assigned
+-to the following fields, repectively:
++to the following fields, respectively:
+ node, port1, port2 and system image GUID.
+ .RS
+ .PP
+@@ -95,7 +95,7 @@ Commands affected: burn, sg
+ \fB--macs\fP <MACs\.\.\.>
+ : 2 MACs must be specified here.
+ The specified MACs are assigned
+-to port1, port2, repectively.
++to port1, port2, respectively.
+ Commands affected: burn, sg
+ .RS
+ .PP
+@@ -843,7 +843,7 @@ mstflint \fB-d\fP 04:00.0 wwne 0x10008 0x5a445a44
+ .IP
+ size - size of data to write in bytes
+ .IP
+-data - data to write - space seperated dwords
++data - data to write - space separated dwords
+ .IP
+ Examples:
+ .IP \(bu 4
diff --git a/debian/patches/0003-Fix-spelling-errors-appearing-in-binaries.patch b/debian/patches/0003-Fix-spelling-errors-appearing-in-binaries.patch
new file mode 100644
index 0000000..591ffa6
--- /dev/null
+++ b/debian/patches/0003-Fix-spelling-errors-appearing-in-binaries.patch
@@ -0,0 +1,153 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Thu, 31 Dec 2015 01:42:06 +0100
+Subject: Fix spelling errors appearing in binaries
+
+---
+ flint/cmd_line_parser.cpp      | 4 ++--
+ flint/err_msgs.h               | 4 ++--
+ flint/subcommands.cpp          | 2 +-
+ mlxconfig/mlxcfg_param_lib.cpp | 4 ++--
+ mlxconfig/mlxcfg_parser.cpp    | 2 +-
+ mlxfwops/lib/fs2_ops.cpp       | 2 +-
+ mlxfwops/lib/fw_ops.cpp        | 2 +-
+ mtcr_ul/mtcr_ul.c              | 2 +-
+ small_utils/mcra.c             | 2 +-
+ 9 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/flint/cmd_line_parser.cpp b/flint/cmd_line_parser.cpp
+index 028cd59..77e603d 100644
+--- a/flint/cmd_line_parser.cpp
++++ b/flint/cmd_line_parser.cpp
+@@ -472,7 +472,7 @@ void Flint::initCmdParser() {
+                 "<GUIDS...>",
+                 "4 GUIDs must be specified here.\n"
+                 "The specified GUIDs are assigned\n"
+-                "to the following fields, repectively:\n"
++                "to the following fields, respectively:\n"
+                 "node, port1, port2 and system image GUID.\n\n"
+                 "Note: port2 guid must be specified even for a\n"
+                 "single port HCA - The HCA ignores this value.\n"
+@@ -494,7 +494,7 @@ void Flint::initCmdParser() {
+                 "<MACs...>",
+                 "2 MACs must be specified here.\n"
+                 "The specified MACs are assigned\n"
+-                "to port1, port2, repectively.\n"
++                "to port1, port2, respectively.\n"
+                 "Commands affected: burn, sg\n\n"
+                 "Note: -mac/-macs flags are applicable only for Mellanox\n"
+                 "\tTechnologies ethernet products.");
+diff --git a/flint/err_msgs.h b/flint/err_msgs.h
+index 5cb5cd1..901cea6 100644
+--- a/flint/err_msgs.h
++++ b/flint/err_msgs.h
+@@ -59,8 +59,8 @@ typedef enum {
+ #define FLINT_PARSE_MEM_ERROR                 "Failed to allocate memory for parsing.\n "
+ #define FLINT_NO_OPTIONS_FOUND_ERROR          "No options found. "
+ #define FLINT_INVALID_COMMAD_ERROR            "Invalid command: %s\n"
+-#define FLINT_TOO_MANY_ARGS_ERROR             "Too many arguments. Expected: %d , Recieved: %d\n"
+-#define FLINT_TOO_FEW_ARGS_ERROR              "Too few arguments. Expected: %d , Recieved: %d\n"
++#define FLINT_TOO_MANY_ARGS_ERROR             "Too many arguments. Expected: %d , Received: %d\n"
++#define FLINT_TOO_FEW_ARGS_ERROR              "Too few arguments. Expected: %d , Received: %d\n"
+ #define FLINT_NO_COMMAND_ERROR                "No command found."
+ #define FLINT_OPEN_FWOPS_DEVICE_ERROR         "Cannot open Device: %s. %s\n"
+ #define FLINT_OPEN_FWOPS_IMAGE_ERROR          "Cannot open Image: %s. %s\n"
+diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp
+index 91400a5..449dd28 100644
+--- a/flint/subcommands.cpp
++++ b/flint/subcommands.cpp
+@@ -3810,7 +3810,7 @@ WbneSubCommand:: WbneSubCommand() {
+     _param = "<addr> <size> <data ...>";
+     _paramExp = "addr - address of block\n"
+                 INDENTEX"size - size of data to write in bytes\n"
+-                INDENTEX"data - data to write - space seperated dwords";
++                INDENTEX"data - data to write - space separated dwords";
+     _example = FLINT_NAME" -d "MST_DEV_EXAMPLE1" wbne 0x10000 12 0x30000 0x76800 0x5a445a44";
+     _v = Wtv_Dev;
+     _maxCmdParamNum = -1;
+diff --git a/mlxconfig/mlxcfg_param_lib.cpp b/mlxconfig/mlxcfg_param_lib.cpp
+index d5481ee..a6f10e7 100644
+--- a/mlxconfig/mlxcfg_param_lib.cpp
++++ b/mlxconfig/mlxcfg_param_lib.cpp
+@@ -79,7 +79,7 @@ enum {
+     printf("-I- Data Sent:\n");\
+     tools_open_##struct_name##_print(data_struct, stdout, 1)
+ # define DEBUG_PRINT_RECIEVE(data_struct, struct_name)\
+-    printf("-I- Data Recieved:\n");\
++    printf("-I- Data Received:\n");\
+     tools_open_##struct_name##_print(data_struct, stdout, 1)
+ #else
+ # define DEBUG_PRINT_SEND(data_struct, struct_name)
+@@ -1123,7 +1123,7 @@ bool VpiParams5thGen::cfgSupported(mfile* mf, mlxCfgParam param)
+     bool suppRead, suppWrite;
+     rc = nvqcCom5thGen(mf, getTlvTypeBe(), suppRead, suppWrite);
+     if (rc) {
+-        errmsg("Failed to get VPI params capabilites. %s", m_err2str(rc));
++        errmsg("Failed to get VPI params capabilities. %s", m_err2str(rc));
+         return false;
+     }
+     return suppRead && suppWrite;
+diff --git a/mlxconfig/mlxcfg_parser.cpp b/mlxconfig/mlxcfg_parser.cpp
+index 8ace497..7e9e79a 100644
+--- a/mlxconfig/mlxcfg_parser.cpp
++++ b/mlxconfig/mlxcfg_parser.cpp
+@@ -375,7 +375,7 @@ mlxCfgStatus MlxCfg::parseArgs(int argc, char* argv[])
+         return err(true, "missing configuration arguments. For more information please run "MLXCFG_NAME" -h|--help.");
+     }
+     if (i != argc && (_mlxParams.cmd == Mc_Reset || _mlxParams.cmd == Mc_Query)) {
+-        return err(true, "%s command expects no argument but %d argument recieved", (_mlxParams.cmd == Mc_Reset) ? "reset" : "query", argc -i);
++        return err(true, "%s command expects no argument but %d argument received", (_mlxParams.cmd == Mc_Reset) ? "reset" : "query", argc -i);
+     }
+     if ((_mlxParams.cmd == Mc_Set || _mlxParams.cmd == Mc_Clr_Sem || _mlxParams.cmd == Mc_Set_Raw) && _mlxParams.device.length() == 0) {
+         return err(true, "%s command expects device to be specified.", _mlxParams.cmd == Mc_Set ? "set" : _mlxParams.cmd == Mc_Set_Raw ? "set_raw" : "clear_semaphore");
+diff --git a/mlxfwops/lib/fs2_ops.cpp b/mlxfwops/lib/fs2_ops.cpp
+index c3151ad..aee01c7 100644
+--- a/mlxfwops/lib/fs2_ops.cpp
++++ b/mlxfwops/lib/fs2_ops.cpp
+@@ -1791,7 +1791,7 @@ bool Fs2Operations::FwBurnRom(FImage* romImg, bool ignoreProdIdCheck, bool ignor
+     u_int32_t cntx_image_num;
+     CntxFindAllImageStart(romImg, cntx_image_start, &cntx_image_num);
+     if (cntx_image_num != 0) {
+-        return errmsg("Expecting an expansion ROM image, Recieved Mellanox FW image.");
++        return errmsg("Expecting an expansion ROM image, Received Mellanox FW image.");
+     }
+ 
+     if (!Fs2IntQuery()) {
+diff --git a/mlxfwops/lib/fw_ops.cpp b/mlxfwops/lib/fw_ops.cpp
+index 6ebcea3..33013d2 100644
+--- a/mlxfwops/lib/fw_ops.cpp
++++ b/mlxfwops/lib/fw_ops.cpp
+@@ -713,7 +713,7 @@ bool FwOperations::writeImage(ProgressCallBack progressFunc, u_int32_t addr, voi
+             u_int32_t new_perc = ((cnt - towrite + alreadyWrittenSz) * 100) / totalSz;
+ 
+                     if (progressFunc((int)new_perc)) {
+-                        return errmsg("Aborting... recieved interrupt signal");
++                        return errmsg("Aborting... received interrupt signal");
+                     }
+             }
+         }
+diff --git a/mtcr_ul/mtcr_ul.c b/mtcr_ul/mtcr_ul.c
+index b97d310..f1544bf 100644
+--- a/mtcr_ul/mtcr_ul.c
++++ b/mtcr_ul/mtcr_ul.c
+@@ -2133,7 +2133,7 @@ static int mreg_send_raw(mfile *mf, u_int16_t reg_id, maccess_reg_method_t metho
+     memcpy(reg_data, buffer + OP_TLV_SIZE + REG_TLV_HEADER_LEN, reg_size);
+ 
+ #ifdef _ENABLE_DEBUG_
+-    	fprintf(stdout, "-I-Tlv's of Data Recieved:\n");
++    	fprintf(stdout, "-I-Tlv's of Data Received:\n");
+     	fprintf(stdout, "\tOperation Tlv\n");
+         OperationTlv_dump(&tlv, stdout);
+     	fprintf(stdout, "\tReg Tlv\n");
+diff --git a/small_utils/mcra.c b/small_utils/mcra.c
+index 2fc9a30..74dc62c 100644
+--- a/small_utils/mcra.c
++++ b/small_utils/mcra.c
+@@ -75,7 +75,7 @@ void usage(const char *n, int with_exit)
+     printf("  -v             : Display version info\n");
+     printf("\n");
+     printf("Environment Variables:\n");
+-    printf("   ADB_DUMP      : Holds the path to adb dump, used for access by path (can be overriden by \"-a\").\n");
++    printf("   ADB_DUMP      : Holds the path to adb dump, used for access by path (can be overridden by \"-a\").\n");
+     if (with_exit) {
+         exit(1);
+     }
diff --git a/debian/patches/series b/debian/patches/series
index e0323ee..f4d3101 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 0001-Remove-date-and-time-from-version-string-to-ensure-r.patch
+0002-Fix-spelling-errors-in-mstflint.1.patch
+0003-Fix-spelling-errors-appearing-in-binaries.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/mstflint.git



More information about the Pkg-ofed-commits mailing list