| commit | 6fb5cb689138d8eb21a20c8a96ce9a1e27f5833f | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Fri Sep 23 08:48:14 2016 -0400 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Fri Sep 23 08:48:14 2016 -0400 |
| tree | 38a57df36f5340f06149560d5062849949bd18b5 | |
| parent | 15fb6c71bdfa3794c075a1cccfcbdb7dc34a4442 [diff] |
firestone/garrison: fix build break Firestone & Garrison systems weren't building after a6bd1e. Change-Id: Ida8deaf8d5d00b1c5df16ab9b0410ca6f2b17cb6 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton.bbappend b/meta-ibm/meta-firestone/recipes-phosphor/obmc-op-control-power/obmc-op-control-power.bbappend similarity index 100% rename from meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton.bbappend rename to meta-ibm/meta-firestone/recipes-phosphor/obmc-op-control-power/obmc-op-control-power.bbappend
diff --git a/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-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 0000000..24c9afb --- /dev/null +++ b/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-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/0001-Add-power-control-support-for-the-Garrison-system.patch b/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/0001-Add-power-control-support-for-the-Garrison-system.patch deleted file mode 120000 index afd75d8..0000000 --- a/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-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton.bbappend b/meta-ibm/meta-garrison/recipes-phosphor/obmc-op-control-power/obmc-op-control-power.bbappend similarity index 100% rename from meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton.bbappend rename to meta-ibm/meta-garrison/recipes-phosphor/obmc-op-control-power/obmc-op-control-power.bbappend
diff --git a/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/0001-Add-power-control-support-for-the-Garrison-system.patch b/meta-ibm/meta-garrison/recipes-phosphor/obmc-op-control-power/obmc-op-control-power/0001-Add-power-control-support-for-the-Garrison-system.patch similarity index 97% rename from meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/0001-Add-power-control-support-for-the-Garrison-system.patch rename to 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 ac54655..d4c2f8c 100644 --- a/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/0001-Add-power-control-support-for-the-Garrison-system.patch +++ b/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 @@ 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";