diff options
author | Vernon Mauery <vernon.mauery@linux.intel.com> | 2019-04-24 01:31:51 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-25 19:59:48 +0300 |
commit | 5896a23a772947bb149670beecf8a7178f78eca6 (patch) | |
tree | b3b4fe52a0076163080987a19c052ffd79385e42 /meta-phosphor/recipes-phosphor/ipmi/ipmitool/0001-create_pen_list-only-print-if-values-are-set.patch | |
parent | 18d6327e2994b5a92c9cc81078b926937e08a2eb (diff) | |
download | openbmc-5896a23a772947bb149670beecf8a7178f78eca6.tar.xz |
rebase ipmitool to use upstream git
Upstream ipmitool has been under active development for a while now.
This includes adding the D-Bus interface to ipmitool as an option as
well as a mechanism to set the default interface. So now, building
ipmitool for openbmc is possible directly from upstream. The new patch
that is included in this commit has been pushed upstream and in under
review. It is needed to build in environments that don't have internet
access.
Tested-by: build ipmitool, run it on the BMC and see that it works
bitbake ipmitool; scp <>/ipmitool <....>:/tmp;
/tmp/ipmitool mc info
/tmp/ipmitool -h
...
Interfaces:
open Linux OpenIPMI Interface
imb Intel IMB Interface
lan IPMI v1.5 LAN Interface
lanplus IPMI v2.0 RMCP+ LAN Interface
serial-terminal Serial Interface, Terminal Mode
serial-basic Serial Interface, Basic Mode
dbus OpenBMC D-Bus interface [default]
(From meta-phosphor rev: c89d95e58d44d0f8e955892b59da2ac0c2beaf91)
Change-Id: I00c15fb8693fca13cdd174661f924e7af684d19d
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-phosphor/ipmi/ipmitool/0001-create_pen_list-only-print-if-values-are-set.patch')
-rw-r--r-- | meta-phosphor/recipes-phosphor/ipmi/ipmitool/0001-create_pen_list-only-print-if-values-are-set.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmitool/0001-create_pen_list-only-print-if-values-are-set.patch b/meta-phosphor/recipes-phosphor/ipmi/ipmitool/0001-create_pen_list-only-print-if-values-are-set.patch new file mode 100644 index 000000000..c9b955d6f --- /dev/null +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmitool/0001-create_pen_list-only-print-if-values-are-set.patch @@ -0,0 +1,35 @@ +From 51f3c26190f91981e35671ac87bb716dac8a9b7f Mon Sep 17 00:00:00 2001 +From: Vernon Mauery <vernon.mauery@intel.com> +Date: Wed, 27 Feb 2019 15:22:52 -0800 +Subject: [PATCH] create_pen_list: only print if values are set + +On a failed download of the PEN list, the create_pen_list script +improperly printed an invalid entry of { , "" } causing the build to +fail. The last line print must check that it has something to print or +it will print the wrong thing. + +Partially resolves ipmitool/ipmitool#11 + +Signed-off-by: Vernon Mauery <vernon.mauery@intel.com> +--- + lib/create_pen_list | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/create_pen_list b/lib/create_pen_list +index e2b44d2..81864ad 100755 +--- a/lib/create_pen_list ++++ b/lib/create_pen_list +@@ -67,7 +67,9 @@ parse_pen_list() { + } + + END { +- print "{ " PEN ", \"" ENTERPRISE "\" }," ++ if(PEN) { ++ print "{ " PEN ", \"" ENTERPRISE "\" }," ++ } + }' + } + +-- +2.17.1 + |