[Pkg-ofed-commits] [mstflint] 04/09: Drop patches that were accepted upstream

Benjamin Drung bdrung at moszumanska.debian.org
Tue Jan 24 13:23:31 UTC 2017


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

bdrung pushed a commit to branch master
in repository mstflint.

commit 58882e0ec215c320f3c40496ac823dd43cbd8a6b
Author: Benjamin Drung <benjamin.drung at profitbricks.com>
Date:   Wed Jan 18 16:43:45 2017 +0100

    Drop patches that were accepted upstream
---
 .../patches/0003-Fix-typo-missmatch-mismatch.patch | 205 ---------------------
 .../0005-Fix-section-mismatch-in-man-pages.patch   |  90 ---------
 debian/patches/0007-Pass-foreign-to-automake.patch |  15 --
 debian/patches/series                              |   3 -
 4 files changed, 313 deletions(-)

diff --git a/debian/patches/0003-Fix-typo-missmatch-mismatch.patch b/debian/patches/0003-Fix-typo-missmatch-mismatch.patch
deleted file mode 100644
index 5f70495..0000000
--- a/debian/patches/0003-Fix-typo-missmatch-mismatch.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-From 89b16dee4bcba85053455abfcb4cb7a56d2634d5 Mon Sep 17 00:00:00 2001
-From: Benjamin Drung <benjamin.drung at profitbricks.com>
-Date: Tue, 9 Aug 2016 16:59:13 +0200
-Subject: Fix typo missmatch -> mismatch
-
----
- flint/err_msgs.h             |  2 +-
- flint/subcommands.cpp        |  2 +-
- mlxfwops/lib/aux_tlv_ops.cpp |  2 +-
- mlxfwops/lib/aux_tlv_ops.h   |  2 +-
- mlxfwops/lib/fs2_ops.cpp     |  6 +++---
- mlxfwops/lib/fs3_ops.cpp     | 12 ++++++------
- mlxfwops/lib/fw_ops.cpp      |  6 +++---
- mlxfwops/lib/mlxfwops.cpp    |  6 +++---
- mlxfwops/lib/mlxfwops_com.h  |  8 ++++----
- 9 files changed, 23 insertions(+), 23 deletions(-)
-
---- a/flint/err_msgs.h
-+++ b/flint/err_msgs.h
-@@ -131,7 +131,7 @@
- #define FLINT_NO_GUID_MAC_FLAGS_ERROR         "Can not set GUIDs/MACs: please run with -uid/-guid/-mac flag.\n"
- #define FLINT_NO_UID_FLAG_ERROR               "Can not set GUIDs/MACs: uid is not specified, please run with -uid flag.\n"
- #define FLINT_CHECKSUM_ERROR                  "Failed to calculate checksum on %s: %s\n"
--#define FLINT_CHECKSUM_MISSMATCH_ERROR        "Given checksum: %s does not match the checksum calculated on device FW: %s.\n"
-+#define FLINT_CHECKSUM_MISMATCH_ERROR         "Given checksum: %s does not match the checksum calculated on device FW: %s.\n"
- #define FLINT_CHECKSUM_PARSE_ERROR            "Failed to parse given checksum.\n"
- #define FLINT_CHECKSUM_LEN_ERROR              "MD5 checksum should be exactly 16 bytes long.\n"
- #define FLINT_CHECKSUM_HEX_ERROR              "MD5 checksum should contain only hexadecimal digits.\n"
---- a/flint/subcommands.cpp
-+++ b/flint/subcommands.cpp
-@@ -1381,7 +1381,7 @@
- 
-     // Warn if a fw which does not support config is burnt over fw that does support config
-     // The other way (new fw with config, old fw w/o config) is a normal update flow.
--    // Update: all fw should now support config sectors, so we just check any missmatch in the config pads
-+    // Update: all fw should now support config sectors, so we just check any mismatch in the config pads
- 
- 
-     // Verify config offset. Should never be different between image and flash (unless changing PSID).
---- a/mlxfwops/lib/aux_tlv_ops.cpp
-+++ b/mlxfwops/lib/aux_tlv_ops.cpp
-@@ -339,7 +339,7 @@
-         if (tlv.hdr.header_type == 0x0) { // only know how to deal with header of type 0x0
-             // check CRC and store
-             if (tlv.hdr.crc != calcTlvCrc(tlv)) {
--                return (Tlv_Status_t)errmsgWCode(TS_TLV_CRC_MISSMATCH, "Failed to parse TLVs, CRC missmatch for TLV type 0x%x", tlv.hdr.type);
-+                return (Tlv_Status_t)errmsgWCode(TS_TLV_CRC_MISMATCH, "Failed to parse TLVs, CRC mismatch for TLV type 0x%x", tlv.hdr.type);
-             }
-             // store it
-             _tlvVec.push_back(tlv);
---- a/mlxfwops/lib/aux_tlv_ops.h
-+++ b/mlxfwops/lib/aux_tlv_ops.h
-@@ -46,7 +46,7 @@
-     TS_OLD_TIMESTAMP,
-     TS_UNSUPPORTED_ICMD_VERSION,
-     // image related errors,
--    TS_TLV_CRC_MISSMATCH,
-+    TS_TLV_CRC_MISMATCH,
-     TS_TLV_PARSE_ERROR,
-     TS_NO_TLV_SECTION_FOUND,
-     TS_FAILED_TO_OPEN_FILE,
---- a/mlxfwops/lib/fs2_ops.cpp
-+++ b/mlxfwops/lib/fs2_ops.cpp
-@@ -927,7 +927,7 @@
-         }
- 
-         if (_fwImgInfo.cntxLog2ChunkSize != imageOps._fwImgInfo.cntxLog2ChunkSize) {
--            return errmsg(MLXFW_FS_INFO_MISSMATCH_ERR, "Failsafe chunk sizes in flash (0x%x) and in image (0x%x) are not the same.",
-+            return errmsg(MLXFW_FS_INFO_MISMATCH_ERR, "Failsafe chunk sizes in flash (0x%x) and in image (0x%x) are not the same.",
-                           1 << _fwImgInfo.cntxLog2ChunkSize,
-                           1 << imageOps._fwImgInfo.cntxLog2ChunkSize);
-         }
-@@ -1416,11 +1416,11 @@
-                                          _ioAccess->get_rev_id(),
-                                          imageOps._fwImgInfo.supportedHwId,
-                                          imageOps._fwImgInfo.supportedHwIdNum)) {
--                 return errmsg(MLXFW_DEVICE_IMAGE_MISSMATCH_ERR, "Device/Image mismatch: %s\n",this->err( ));
-+                 return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "Device/Image mismatch: %s\n",this->err( ));
-              }
-          } else if (imageOps._fs2ImgInfo.infoOffs[II_DeviceType]) {
-              if (!CheckMatchingDevId(_ioAccess->get_dev_id(), imageOps._fwImgInfo.ext_info.dev_type)) {
--                 return errmsg(MLXFW_DEVICE_IMAGE_MISSMATCH_ERR, "Device/Image mismatch: %s\n",this->err());
-+                 return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "Device/Image mismatch: %s\n",this->err());
-              }
-          }
- 
---- a/mlxfwops/lib/fs3_ops.cpp
-+++ b/mlxfwops/lib/fs3_ops.cpp
-@@ -704,7 +704,7 @@
-             if ( (flash_toc_entry->device_data != image_toc_entry->device_data) || \
-                  (flash_toc_entry->no_crc != image_toc_entry->no_crc) || \
-                  (flash_toc_entry->relative_addr != image_toc_entry->relative_addr)) {
--                    return errmsg(MLXFW_DEVICE_IMAGE_MISSMATCH_ERR, "An inconsistency was found in %s section attributes. %s ITOC attribute differs",\
-+                    return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "An inconsistency was found in %s section attributes. %s ITOC attribute differs",\
-                             GetSectionNameByType(image_toc_entry->type), GET_DIFFER_STR(flash_toc_entry, image_toc_entry));
-             }
-             // replace itoc entry in the image
-@@ -927,10 +927,10 @@
-                                          _ioAccess->get_rev_id(),
-                                          imageOps._fwImgInfo.supportedHwId,
-                                          imageOps._fwImgInfo.supportedHwIdNum)) {
--                 return errmsg(MLXFW_DEVICE_IMAGE_MISSMATCH_ERR, "Device/Image mismatch: %s\n",this->err( ));
-+                 return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "Device/Image mismatch: %s\n",this->err( ));
-              }
-          } else { // no suppored hw ids (problem with the image ?)
--             return errmsg(MLXFW_DEVICE_IMAGE_MISSMATCH_ERR, "No supported devices were found in the FW image.");
-+             return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "No supported devices were found in the FW image.");
-          }
-     }
- 
-@@ -2456,7 +2456,7 @@
-                 // versions match allow update
-                 retRc = true;
-             } else {
--                retRc = errmsg("Stamped FW version missmatch: %d.%d.%04d differs from %d.%d.%04d", devFwVer.fw_ver_major,\
-+                retRc = errmsg("Stamped FW version mismatch: %d.%d.%04d differs from %d.%d.%04d", devFwVer.fw_ver_major,\
-                                                                                                 devFwVer.fw_ver_minor,\
-                                                                                                 devFwVer.fw_ver_subminor,\
-                                                                                                 imageOps._fwImgInfo.ext_info.fw_ver[0],\
---- a/mlxfwops/lib/fw_ops.cpp
-+++ b/mlxfwops/lib/fw_ops.cpp
-@@ -982,7 +982,7 @@
- 
- // This function gets the HW ID of the target device and the dev ID from
- // the image. It then matches the 2 IDs and returns an error in case of
--// missmatch. The match is not 1:1 , since the FW image contains the SW
-+// mismatch. The match is not 1:1 , since the FW image contains the SW
- // dev id, and a single hw dev id may match multiple SW dev IDs.
- //
- bool FwOperations::CheckMatchingHwDevId(u_int32_t hwDevId, u_int32_t rev_id, u_int32_t* supportedHwId, u_int32_t supportedHwIdNum) {
-@@ -1031,7 +1031,7 @@
-         return false;
-     }
- 
--    return errmsg(MLXFW_DEVICE_IMAGE_MISSMATCH_ERR, "FW image file cannot be programmed to device %s, it is intended for: %s only",
-+    return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "FW image file cannot be programmed to device %s, it is intended for: %s only",
-             curr_hw_id_name, supp_hw_id_list);
- }
- bool FwOperations::CheckMatchingDevId(u_int32_t hwDevId, u_int32_t imageDevId) {
-@@ -1085,7 +1085,7 @@
- {
-     if (!allow_psid_change) {
-         if (strncmp( _fwImgInfo.ext_info.psid, imageOps._fwImgInfo.ext_info.psid, PSID_LEN)) {
--            return errmsg(MLXFW_PSID_MISSMATCH_ERR, "Image PSID is %s, it cannot be burnt into current device (PSID: %s)",
-+            return errmsg(MLXFW_PSID_MISMATCH_ERR, "Image PSID is %s, it cannot be burnt into current device (PSID: %s)",
-                     imageOps._fwImgInfo.ext_info.psid, _fwImgInfo.ext_info.psid);
-         }
-     }
---- a/mlxfwops/lib/mlxfwops.cpp
-+++ b/mlxfwops/lib/mlxfwops.cpp
-@@ -105,7 +105,7 @@
-         return "Memory allocation Error";
-     case MLXFW_ERR_IN_STR:
-         return "Error in String";
--    case MLXFW_PSID_MISSMATCH_ERR:
-+    case MLXFW_PSID_MISMATCH_ERR:
-         return "PSID Mismatch";
-     case MLXFW_FLASH_WRITE_ERR:
-         return "Flash write Failed";
-@@ -127,11 +127,11 @@
-         return "Image too large";
-     case MLXFW_IMAGE_FORMAT_ERR:
-         return "Incompatible image format";
--    case MLXFW_DEVICE_IMAGE_MISSMATCH_ERR:
-+    case MLXFW_DEVICE_IMAGE_MISMATCH_ERR:
-         return "FW image does not match device";
-     case MLXFW_IMAGE_CORRUPTED_ERR:
-         return "FW image corrupted";
--    case MLXFW_FS_INFO_MISSMATCH_ERR:
-+    case MLXFW_FS_INFO_MISMATCH_ERR:
-         return "Failsafe information mismatch";
-     case MLXFW_DEV_ID_ERR:
-         return "Unsupported device ID";
---- a/mlxfwops/lib/mlxfwops_com.h
-+++ b/mlxfwops/lib/mlxfwops_com.h
-@@ -94,7 +94,7 @@
-     MLXFW_ERR,
-     MLXFW_MEM_ERR,
-     MLXFW_ERR_IN_STR,
--    MLXFW_PSID_MISSMATCH_ERR,
-+    MLXFW_PSID_MISMATCH_ERR,
-     MLXFW_FLASH_WRITE_ERR,
-     MLXFW_NO_VALID_IMAGE_ERR,
-     MLXFW_MULTIPLE_VALID_IMAGES_ERR,
-@@ -105,9 +105,9 @@
-     MLXFW_IMAGE_NOT_FS_ERR,
-     MLXFW_IMAGE_TOO_LARGE_ERR,
-     MLXFW_IMAGE_FORMAT_ERR,
--    MLXFW_DEVICE_IMAGE_MISSMATCH_ERR,
-+    MLXFW_DEVICE_IMAGE_MISMATCH_ERR,
-     MLXFW_IMAGE_CORRUPTED_ERR,
--    MLXFW_FS_INFO_MISSMATCH_ERR,
-+    MLXFW_FS_INFO_MISMATCH_ERR,
-     MLXFW_DEV_ID_ERR,
-     MLXFW_UNSUPPORTED_BIN_VER_ERR,
-     MLXFW_NO_VALID_ITOC_ERR,
-@@ -120,7 +120,7 @@
-     MLXFW_GET_SECT_ERR,
-     MLXFW_UPDATE_SECT_ERR,
-     MLXFW_BAD_PARAM_ERR,
--    MLXFW_PRS_MISSMATCH_ERR,
-+    MLXFW_PRS_MISMATCH_ERR,
-     MLXFW_NO_VALID_DEVICE_INFO_ERR,
-     MLXFW_TWO_VALID_DEVICE_INFO_ERR,
-     MLXFW_DTOC_OVERWRITE_CHUNK
diff --git a/debian/patches/0005-Fix-section-mismatch-in-man-pages.patch b/debian/patches/0005-Fix-section-mismatch-in-man-pages.patch
deleted file mode 100644
index 0b0d218..0000000
--- a/debian/patches/0005-Fix-section-mismatch-in-man-pages.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From ad676810797edf91ccdbea13c868cfb865ce9c4a Mon Sep 17 00:00:00 2001
-From: Benjamin Drung <benjamin.drung at profitbricks.com>
-Date: Tue, 9 Aug 2016 17:31:24 +0200
-Subject: Fix section mismatch in man pages
-
-A man page usually should contain a .TH header, specifying the
-section. The section in this manpage doesn't match with the section in
-the filename.
-
-Refer to the groff_man(7) manual page and the man(1) manual page for
-details.
----
- man/mstconfig.1   | 2 +-
- man/mstflint.1    | 2 +-
- man/mstmcra.1     | 2 +-
- man/mstmread.1    | 2 +-
- man/mstmtserver.1 | 2 +-
- man/mstmwrite.1   | 2 +-
- man/mstregdump.1  | 2 +-
- man/mstvpd.1      | 2 +-
- 8 files changed, 8 insertions(+), 8 deletions(-)
-
---- a/man/mstconfig.1
-+++ b/man/mstconfig.1
-@@ -1,6 +1,6 @@
--.TH MSTCONFIG "4.4.0" "" ""
-+.TH MSTCONFIG "1" "4.4.0" ""
- .SH NAME
--mstconfig
-+mstconfig \- set or query non-volatile configurable options for Mellanox HCAs
- .IP
- .SH SYNOPSIS:
- .IP
---- a/man/mstflint.1
-+++ b/man/mstflint.1
-@@ -1,5 +1,5 @@
- .\"Text automatically generated by txt2man
--.TH mstflint 4.4.0  "May 2016" "" ""
-+.TH mstflint "1" "4.4.0" "May 2016" ""
- .SH NAME
- \fBmstflint \fP- Flash Interface
- .SH SYNOPSIS
---- a/man/mstmcra.1
-+++ b/man/mstmcra.1
-@@ -1,4 +1,4 @@
--.TH MSTMCRA "4.4.0" "" ""
-+.TH MSTMCRA "1" "4.4.0" ""
- .SH NAME
- mstmcra
- .IP
---- a/man/mstmread.1
-+++ b/man/mstmread.1
-@@ -1,4 +1,4 @@
--.TH MSTMREAD "4.4.0" "" ""
-+.TH MSTMREAD "1" "4.4.0" ""
- .SH NAME
- mstmread
- .IP
---- a/man/mstmtserver.1
-+++ b/man/mstmtserver.1
-@@ -1,4 +1,4 @@
--.TH MSTMTSERVER "4.4.0" "" ""
-+.TH MSTMTSERVER "1" "4.4.0" ""
- .SH NAME
- mstmtserver
- .IP
---- a/man/mstmwrite.1
-+++ b/man/mstmwrite.1
-@@ -1,4 +1,4 @@
--.TH MSTMWRITE "4.4.0" "" ""
-+.TH MSTMWRITE "1" "4.4.0" ""
- .SH NAME
- mstmwrite
- .IP
---- a/man/mstregdump.1
-+++ b/man/mstregdump.1
-@@ -1,4 +1,4 @@
--.TH MSTREGDUMP "4.4.0" "" ""
-+.TH MSTREGDUMP "1" "4.4.0" ""
- .SH NAME
- mstregdump
- .IP
---- a/man/mstvpd.1
-+++ b/man/mstvpd.1
-@@ -1,4 +1,4 @@
--.TH MSTVPD "4.4.0" "" ""
-+.TH MSTVPD "1" "4.4.0" ""
- .SH NAME
- mstvpd
- .IP
diff --git a/debian/patches/0007-Pass-foreign-to-automake.patch b/debian/patches/0007-Pass-foreign-to-automake.patch
deleted file mode 100644
index f47e6fc..0000000
--- a/debian/patches/0007-Pass-foreign-to-automake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Add "foreign" option to automake to make autoreconf work
- The "foreign" option avoid complaints about missing NEWS, README, etc.
-Author: Benjamin Drung <benjamin.drung at profitbricks.com>
-
---- mstflint-4.4.0+1.12.gd1edd58.orig/configure.ac
-+++ mstflint-4.4.0+1.12.gd1edd58/configure.ac
-@@ -10,7 +10,7 @@ AC_SUBST([VERSION])
- 
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_SRCDIR([README])
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([foreign])
- 
- dnl Checks for programs
- AC_PROG_CC
diff --git a/debian/patches/series b/debian/patches/series
index 26cc415..6bf7d53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,8 @@
 0001-Remove-date-and-time-from-version-string-to-ensure-r.patch
 0002-Fix-typo-allign-align.patch
-0003-Fix-typo-missmatch-mismatch.patch
 Fix-typo-recieved-received.patch
 0004-Fix-other-typos.patch
-0005-Fix-section-mismatch-in-man-pages.patch
 0006-Fix-man-page-errors.patch
-0007-Pass-foreign-to-automake.patch
 Fix-compilation-on-unknown-architectures.patch
 disable-werror.patch
 use-system-libs.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