mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-23 22:51:03 +02:00
remote_access.sh: fix learn_arch to return x86 instead of i686
learn_arch is only called by update_kernel.sh. Until recently, we were only using learn_arch to detect whether the device is arm or not. However, with a recent change, update_kernel.sh is now passing the arch flag to vbutil_kernel which only knows about x86 and not i686. BUG=chromium-os:15932 TEST=Before change update_kernel.sh fails on x86 and now it works. Change-Id: Idafc71c017c8ed0595fd0260fce63f327ff021bd Reviewed-on: http://gerrit.chromium.org/gerrit/1831 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> Reviewed-by: Olof Johansson <olofj@chromium.org> Tested-by: Mandeep Singh Baines <msb@chromium.org>
This commit is contained in:
parent
7961f9dbe1
commit
175422fec6
@ -66,7 +66,7 @@ function learn_board() {
|
|||||||
function learn_arch() {
|
function learn_arch() {
|
||||||
[ -n "${FLAGS_arch}" ] && return
|
[ -n "${FLAGS_arch}" ] && return
|
||||||
remote_sh uname -m
|
remote_sh uname -m
|
||||||
FLAGS_arch=$(echo "${REMOTE_OUT}" | sed s/armv7l/arm/g)
|
FLAGS_arch=$(echo "${REMOTE_OUT}" | sed -e s/armv7l/arm/ -e s/i686/x86/ )
|
||||||
if [ -z "${FLAGS_arch}" ]; then
|
if [ -z "${FLAGS_arch}" ]; then
|
||||||
error "Arch required"
|
error "Arch required"
|
||||||
exit 1
|
exit 1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user