diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-06-16 13:50:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-16 13:50:56 -0500 |
| commit | 46e8769570f3284915df7a643461dec64c30f29c (patch) | |
| tree | e149803e0b6a3f97471fa48670be646e35dbf2dc /meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone | |
| parent | 420a00764fbccf3523c46d1bcf076cc0f522217c (diff) | |
| parent | ced4c34ee252d0036b714425eecb0ed8bb528750 (diff) | |
| download | talos-openbmc-46e8769570f3284915df7a643461dec64c30f29c.tar.gz talos-openbmc-46e8769570f3284915df7a643461dec64c30f29c.zip | |
Merge pull request #372 from bradbishop/garrison
Fix Garrison/Firestone build breaks
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone')
4 files changed, 2 insertions, 4 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 |
