From a6af201ff8207ba3c4d5fef9a3a7c09bafe55610 Mon Sep 17 00:00:00 2001 From: Tom Wai-Hong Tam Date: Thu, 28 Apr 2011 12:12:08 +0800 Subject: [PATCH] Use initramfs on x86 but not on arm for factory install image. On x86, booting factory install shim on SD card needs to have the kernel initrmafs enabled. But on ARM, booting factory install image on network does not needs initramfs. TEST=build_image --factory_install BUG=chromium-os:13211 Change-Id: Id008a3bfaf4f17772e04f02d18844dd09b33fbe1 R=rongchang@chromium.org Review URL: http://codereview.chromium.org/6901047 --- build_image | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/build_image b/build_image index 306c753135..8fbc2d8043 100755 --- a/build_image +++ b/build_image @@ -190,10 +190,16 @@ OVERLAY_CHROMEOS_DIR="${SRC_ROOT}/third_party/chromiumos-overlay/chromeos/" # Configure extra USE or packages for this type of build. EXTRA_PACKAGES="" if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ] ; then - # Factory install needs to have the kernel initrmafs enabled, - # and the factory installer added. + # Factory install needs to have the factory installer added. EXTRA_PACKAGES="${EXTRA_PACKAGES} chromeos-base/chromeos-factoryinstall" - export USE="${USE} fbconsole initramfs" + # On x86, booting factory install shim on SD card needs to have the kernel + # initrmafs enabled. On ARM, booting factory install image on network does + # not needs initramfs. Force to enable fbconsole to fix a display driver bug. + if [ ${ARCH} -eq "arm" ] ; then + export USE="${USE} fbconsole" + else + export USE="${USE} initramfs" + fi fi emerge_to_image() {