diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-06-15 21:31:51 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-06-15 22:10:15 -0400 |
commit | ced4c34ee252d0036b714425eecb0ed8bb528750 (patch) | |
tree | e149803e0b6a3f97471fa48670be646e35dbf2dc /meta-openbmc-machines | |
parent | 420a00764fbccf3523c46d1bcf076cc0f522217c (diff) | |
download | talos-openbmc-ced4c34ee252d0036b714425eecb0ed8bb528750.tar.gz talos-openbmc-ced4c34ee252d0036b714425eecb0ed8bb528750.zip |
Fix Garrison/Firestone build breaks
A number of skeleton patches no longer applied due to 40a360c
and 54decc8.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openbmc-machines')
7 files changed, 20 insertions, 28 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/skeleton/skeleton.bbappend index 6c14b2210..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/skeleton/skeleton.bbappend @@ -1,3 +1,2 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" -SRC_URI += "file://poweron.patch" -SRC_URI += "file://occ-path.patch" +SRC_URI += "file://0001-Add-power-control-support-for-the-Garrison-system.patch" 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 new file mode 120000 index 000000000..afd75d872 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/0001-Add-power-control-support-for-the-Garrison-system.patch @@ -0,0 +1 @@ +../../../../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-firestone/recipes-phosphor/skeleton/skeleton/occ-path.patch b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/occ-path.patch deleted file mode 120000 index 2fc0f2cbb..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/occ-path.patch +++ /dev/null @@ -1 +0,0 @@ -../../../../meta-garrison/recipes-phosphor/skeleton/skeleton/occ-path.patch
\ No newline at end of file diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/poweron.patch b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/poweron.patch deleted file mode 120000 index 27acaeb42..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/poweron.patch +++ /dev/null @@ -1 +0,0 @@ -../../../../meta-garrison/recipes-phosphor/skeleton/skeleton/poweron.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/skeleton/skeleton.bbappend index 6c14b2210..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/skeleton/skeleton.bbappend @@ -1,3 +1,2 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" -SRC_URI += "file://poweron.patch" -SRC_URI += "file://occ-path.patch" +SRC_URI += "file://0001-Add-power-control-support-for-the-Garrison-system.patch" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/poweron.patch b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/0001-Add-power-control-support-for-the-Garrison-system.patch index c50ce3d48..ac5465532 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/poweron.patch +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/0001-Add-power-control-support-for-the-Garrison-system.patch @@ -1,5 +1,17 @@ ---- a/git/objects/power_control_obj.c -+++ b/git/objects/power_control_obj.c +From c2f1b1115f6a7f814a05622a33984f5a4797fede Mon Sep 17 00:00:00 2001 +From: Brad Bishop <bradleyb@fuzziesquirrel.com> +Date: Wed, 15 Jun 2016 21:16:43 -0400 +Subject: [PATCH] Add power control support for the Garrison system + +Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> +--- + op-pwrctl/power_control_obj.c | 70 +++++++++++++++++++++++++++++-------------- + 1 file changed, 48 insertions(+), 22 deletions(-) + +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 @@ -17,11 +17,15 @@ static const gchar* instance_name = "power0"; static const gchar* dbus_name = "org.openbmc.control.Power"; @@ -111,3 +123,6 @@ uint8_t gpio; rc = gpio_open(&pgood); +-- +2.1.4 + diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/occ-path.patch b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/occ-path.patch deleted file mode 100644 index 04304e4ec..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/occ-path.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/git/bin/sensor_manager2.py -+++ b/git/bin/sensor_manager2.py -@@ -63,13 +63,13 @@ if __name__ == '__main__': - root_sensor.add(obj_path,Sensors.BootProgressSensor(bus,obj_path)) - - obj_path = OBJ_PATH+"/host/cpu0/OccStatus" -- sensor_obj = Sensors.OccStatusSensor(bus,obj_path) -- sensor_obj.sysfs_attr = "/sys/class/i2c-adapter/i2c-3/3-0050/online" -+ sensor_obj = Sensors.OccStatusSensor(bus,obj_path, -+ "/sys/class/i2c-adapter/i2c-4/4-0050/online") - root_sensor.add(obj_path,sensor_obj) - - obj_path = OBJ_PATH+"/host/cpu1/OccStatus" -- sensor_obj = Sensors.OccStatusSensor(bus,obj_path) -- sensor_obj.sysfs_attr = "/sys/class/i2c-adapter/i2c-3/3-0051/online" -+ sensor_obj = Sensors.OccStatusSensor(bus,obj_path, -+ "/sys/class/i2c-adapter/i2c-5/5-0050/online") - root_sensor.add(obj_path,sensor_obj) - - obj_path = OBJ_PATH+"/host/BootCount" |