diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-09-23 08:48:14 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-09-23 08:48:14 -0400 |
commit | 3144017073c6a7d237ed6d6ea6eb6839349d321f (patch) | |
tree | e253f59709c026a37339e21965cccbba68050878 /meta-openbmc-machines | |
parent | 8162abb05f4d0df9352c89927c34a9a776066ad9 (diff) | |
download | talos-openbmc-3144017073c6a7d237ed6d6ea6eb6839349d321f.tar.gz talos-openbmc-3144017073c6a7d237ed6d6ea6eb6839349d321f.zip |
firestone/garrison: fix build break
Firestone & Garrison systems weren't building after
a6bd1e.
Change-Id: Ida8deaf8d5d00b1c5df16ab9b0410ca6f2b17cb6
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openbmc-machines')
5 files changed, 3 insertions, 3 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/obmc-op-control-power/obmc-op-control-power.bbappend index bfac34307..bfac34307 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton.bbappend +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/obmc-op-control-power/obmc-op-control-power.bbappend diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/obmc-op-control-power/obmc-op-control-power/0001-Add-power-control-support-for-the-Garrison-system.patch b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/obmc-op-control-power/obmc-op-control-power/0001-Add-power-control-support-for-the-Garrison-system.patch new file mode 120000 index 000000000..24c9afb16 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/obmc-op-control-power/obmc-op-control-power/0001-Add-power-control-support-for-the-Garrison-system.patch @@ -0,0 +1 @@ +../../../../meta-garrison/recipes-phosphor/obmc-op-control-power/obmc-op-control-power/0001-Add-power-control-support-for-the-Garrison-system.patch
\ No newline at end of file diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/0001-Add-power-control-support-for-the-Garrison-system.patch b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/0001-Add-power-control-support-for-the-Garrison-system.patch deleted file mode 120000 index afd75d872..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/0001-Add-power-control-support-for-the-Garrison-system.patch +++ /dev/null @@ -1 +0,0 @@ -../../../../meta-garrison/recipes-phosphor/skeleton/skeleton/0001-Add-power-control-support-for-the-Garrison-system.patch
\ No newline at end of file diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/obmc-op-control-power/obmc-op-control-power.bbappend index bfac34307..bfac34307 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton.bbappend +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/obmc-op-control-power/obmc-op-control-power.bbappend diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/0001-Add-power-control-support-for-the-Garrison-system.patch b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/obmc-op-control-power/obmc-op-control-power/0001-Add-power-control-support-for-the-Garrison-system.patch index ac5465532..d4c2f8c6e 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/0001-Add-power-control-support-for-the-Garrison-system.patch +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/obmc-op-control-power/obmc-op-control-power/0001-Add-power-control-support-for-the-Garrison-system.patch @@ -10,8 +10,8 @@ Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> diff --git a/op-pwrctl/power_control_obj.c b/op-pwrctl/power_control_obj.c index 85a8cff..f6bc996 100644 ---- a/git/op-pwrctl/power_control_obj.c -+++ b/git/op-pwrctl/power_control_obj.c +--- a/power_control_obj.c ++++ b/power_control_obj.c @@ -17,11 +17,15 @@ static const gchar* instance_name = "power0"; static const gchar* dbus_name = "org.openbmc.control.Power"; |