Fix bug: Fix spelling errors
Fix spelling errors.
Signed-off-by: Chicago Duan <duanzhijia01@inspur.com>
Change-Id: Ibf7c6598be90d6a19d4a39adef0dee2202d9f0a6
diff --git a/README.md b/README.md
index 6cd1fcb..cc858c6 100644
--- a/README.md
+++ b/README.md
@@ -133,8 +133,8 @@
1. Generate a tarball of PSU firmware image by [generate-psu-tar tool][4].
```
- ./generate-psu-tar --image <psu-image> --version <version> --model <model> --manufacture \
- <manufacture> --machineName <machineName> --outfile <psu.tar> --sign
+ ./generate-psu-tar --image <psu-image> --version <version> --model <model> --manufacturer \
+ <manufacturer> --machineName <machineName> --outfile <psu.tar> --sign
```
2. To update the PSU firmware, follow the same steps as described in
[code-update.md][5]:
diff --git a/test/psu-images-one-valid-one-invalid/model-1/MANIFEST b/test/psu-images-one-valid-one-invalid/model-1/MANIFEST
index 09ceb08..8daa067 100644
--- a/test/psu-images-one-valid-one-invalid/model-1/MANIFEST
+++ b/test/psu-images-one-valid-one-invalid/model-1/MANIFEST
@@ -1,4 +1,4 @@
purpose=xyz.openbmc_project.Software.Version.VersionPurpose.PSU
version=psu-test.v0.4
-extended_version=model=model-1,manufacture=test-manu
+extended_version=model=model-1,manufacturer=test-manu
diff --git a/test/test_version.cpp b/test/test_version.cpp
index 431afc0..e0e8532 100644
--- a/test/test_version.cpp
+++ b/test/test_version.cpp
@@ -14,14 +14,14 @@
constexpr auto validManifest = R"(
purpose=xyz.openbmc_project.Software.Version.VersionPurpose.PSU
version=psu-dummy-test.v0.1
-extended_version=model=dummy_model,manufacture=dummy_manufacture)";
+extended_version=model=dummy_model,manufacturer=dummy_manufacturer)";
}
constexpr auto validManifestWithCRLF =
"\r\n"
"purpose=xyz.openbmc_project.Software.Version.VersionPurpose.PSU\r\n"
"version=psu-dummy-test.v0.1\r\n"
- "extended_version=model=dummy_model,manufacture=dummy_manufacture\r\n";
+ "extended_version=model=dummy_model,manufacturer=dummy_manufacturer\r\n";
class TestVersion : public ::testing::Test
{
@@ -69,7 +69,7 @@
EXPECT_EQ("xyz.openbmc_project.Software.Version.VersionPurpose.PSU",
purpose);
EXPECT_EQ("psu-dummy-test.v0.1", version);
- EXPECT_EQ("model=dummy_model,manufacture=dummy_manufacture", extVersion);
+ EXPECT_EQ("model=dummy_model,manufacturer=dummy_manufacturer", extVersion);
}
TEST_F(TestVersion, getExtVersionInfo)
@@ -99,5 +99,5 @@
EXPECT_EQ("xyz.openbmc_project.Software.Version.VersionPurpose.PSU",
purpose);
EXPECT_EQ("psu-dummy-test.v0.1", version);
- EXPECT_EQ("model=dummy_model,manufacture=dummy_manufacture", extVersion);
+ EXPECT_EQ("model=dummy_model,manufacturer=dummy_manufacturer", extVersion);
}
diff --git a/tools/generate-psu-tar b/tools/generate-psu-tar
index 7ff6827..916ac7a 100755
--- a/tools/generate-psu-tar
+++ b/tools/generate-psu-tar
@@ -8,7 +8,7 @@
--image <file> PSU FW image
--version <version> PSU FW version
--model <model> PSU FW model
- --manufacture <version> PSU FW manufacture
+ --manufacturer <version> PSU FW manufacturer
--machineName <machineName> Optionally specify the target machine name of this image.
--outfile <filename> Outfile name
For example : -o psufw.tar
@@ -47,7 +47,7 @@
outfile=""
version=""
model=""
-manufacture=""
+manufacturer=""
machineName=""
@@ -66,8 +66,8 @@
model="$2"
shift 2
;;
- --manufacture)
- manufacture="$2"
+ --manufacturer)
+ manufacturer="$2"
shift 2
;;
--machineName)
@@ -118,8 +118,8 @@
exit 1
fi
-if [ -z "${manufacture}" ]; then
- echo "Please enter a valid PSU FW image manufacture."
+if [ -z "${manufacturer}" ]; then
+ echo "Please enter a valid PSU FW image manufacturer."
echo "$help"
exit 1
fi
@@ -164,7 +164,7 @@
echo "Creating MANIFEST for the image"
echo -e "purpose=xyz.openbmc_project.Software.Version.VersionPurpose.PSU\nversion=$version\n\
-extended_version=model=$model,manufacture=$manufacture" > $manifest_location
+extended_version=model=$model,manufacturer=$manufacturer" > $manifest_location
if [[ -n "${machineName}" ]]; then
echo -e "MachineName=${machineName}" >> $manifest_location