diff options
| author | Alexander Filippov <a.filippov@yadro.com> | 2018-10-02 16:29:59 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-10-05 22:12:11 -0400 |
| commit | 7b29b074dc3d016a98bb8c69dc29a0e584d78d57 (patch) | |
| tree | 66d77968d8da91da655336bb28b2982b1a4016f6 /meta-phosphor/recipes-core | |
| parent | 1b7cb12e68d073d400effdab1183590e743d2749 (diff) | |
| download | talos-openbmc-7b29b074dc3d016a98bb8c69dc29a0e584d78d57.tar.gz talos-openbmc-7b29b074dc3d016a98bb8c69dc29a0e584d78d57.zip | |
meta-phosphor: fix reboot of BMC
After the commit bba38f38e7e41525c30116a2fe990d113b8157da the firmware
with a static flash layout is unable to reboot.
It happens because the `reboot` applet was removed from the `busybox`.
This commit restore the `reboot` in the `busybox` for static layout.
Resolves openbmc/openbmc#3399
Tested in the `qemu` with firmwares for `palmetto` and `romulus`.
(From meta-phosphor rev: 8f400dacfc9138bc9395fe995ff914c10bd7eed0)
Change-Id: I5dd7ba0f999f0aa58e54594ad32669e2283e4cee
Signed-off-by: Alexander Filippov <a.filippov@yadro.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-core')
| -rw-r--r-- | meta-phosphor/recipes-core/busybox/busybox/reboot.cfg | 1 | ||||
| -rw-r--r-- | meta-phosphor/recipes-core/busybox/busybox_%.bbappend | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/meta-phosphor/recipes-core/busybox/busybox/reboot.cfg b/meta-phosphor/recipes-core/busybox/busybox/reboot.cfg new file mode 100644 index 000000000..bbd85f402 --- /dev/null +++ b/meta-phosphor/recipes-core/busybox/busybox/reboot.cfg @@ -0,0 +1 @@ +CONFIG_REBOOT=y diff --git a/meta-phosphor/recipes-core/busybox/busybox_%.bbappend b/meta-phosphor/recipes-core/busybox/busybox_%.bbappend index e6678fc8a..cc88bcc40 100644 --- a/meta-phosphor/recipes-core/busybox/busybox_%.bbappend +++ b/meta-phosphor/recipes-core/busybox/busybox_%.bbappend @@ -3,3 +3,4 @@ SRC_URI += "file://busybox.cfg" SRC_URI += "file://flash.cfg" SRC_URI += "file://mountpoint.cfg" SRC_URI += "file://0001-Stop-watchdog-first-on-startup.patch" +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', '', 'file://reboot.cfg', d)}" |
