Convert mario and alex to 32bit.
BUG=chromium-os:30820
TEST=Launch release trybots for these overlays.
Change-Id: Ic477345cd9a70a0443f0d821ba33c08a001cbe84
Reviewed-on: https://gerrit.chromium.org/gerrit/22487
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: David James <davidjames@chromium.org>
(cherry picked from commit 32dc74dad896b31d53a15382a23640df935bb843)
Reviewed-on: https://gerrit.chromium.org/gerrit/22733
Reviewed-by: Brian Harring <ferringb@chromium.org>
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
diff --git a/overlay-x86-alex/make.conf b/overlay-x86-alex/make.conf
index 91e4a18..7983c02 100644
--- a/overlay-x86-alex/make.conf
+++ b/overlay-x86-alex/make.conf
@@ -1,7 +1,6 @@
-CHROMEOS_KERNEL_SPLITCONFIG="chromeos-intel-pineview"
-CHROMEOS_KERNEL_ARCH="x86_64"
+CHROMEOS_KERNEL_SPLITCONFIG="chromeos-pinetrail-i386"
-USE="${USE} 32bit_au alex is_touchpad new_power_button lockvt cmt als disable_login_animations broken_partialswaps"
+USE="${USE} alex is_touchpad new_power_button lockvt cmt als disable_login_animations broken_partialswaps"
INPUT_DEVICES="${INPUT_DEVICES} evdev cmt"
# Used by the power manager ebuild to update light-sensor-install.sh
diff --git a/overlay-x86-alex/profiles/base/parent b/overlay-x86-alex/profiles/base/parent
index 837de1f..fc23d1c 100644
--- a/overlay-x86-alex/profiles/base/parent
+++ b/overlay-x86-alex/profiles/base/parent
@@ -1 +1 @@
-/usr/local/portage/chromiumos/profiles/default/linux/amd64/10.0/chromeos
+/usr/local/portage/chromiumos/profiles/default/linux/x86/10.0/chromeos
diff --git a/overlay-x86-alex/profiles/kernel-next/parent b/overlay-x86-alex/profiles/kernel-next/parent
index d3c614b..cacd833 100644
--- a/overlay-x86-alex/profiles/kernel-next/parent
+++ b/overlay-x86-alex/profiles/kernel-next/parent
@@ -1,2 +1,2 @@
-/usr/local/portage/chromiumos/profiles/default/linux/amd64/10.0/chromeos
+/usr/local/portage/chromiumos/profiles/default/linux/x86/10.0/chromeos
/usr/local/portage/chromiumos/profiles/features/kernel-next
diff --git a/overlay-x86-alex/toolchain.conf b/overlay-x86-alex/toolchain.conf
index c64e36b..f11a8d9 100644
--- a/overlay-x86-alex/toolchain.conf
+++ b/overlay-x86-alex/toolchain.conf
@@ -1,4 +1 @@
-x86_64-cros-linux-gnu
-
-# This is required for building the 32bit updater
i686-pc-linux-gnu
diff --git a/overlay-x86-mario/make.conf b/overlay-x86-mario/make.conf
index 52941b6..74a7974 100644
--- a/overlay-x86-mario/make.conf
+++ b/overlay-x86-mario/make.conf
@@ -1,6 +1,5 @@
-CHROMEOS_KERNEL_SPLITCONFIG="chromeos-intel-pineview"
-CHROMEOS_KERNEL_ARCH="x86_64"
+CHROMEOS_KERNEL_SPLITCONFIG="chromeos-pinetrail-i386"
INPUT_DEVICES="${INPUT_DEVICES} cmt"
-USE="${USE} 32bit_au gobi google_qdl cmt mario novatel_gobi ps_touchpad new_power_button lockvt als disable_login_animations broken_partialswaps"
+USE="${USE} gobi google_qdl cmt mario novatel_gobi ps_touchpad new_power_button lockvt als disable_login_animations broken_partialswaps"
diff --git a/overlay-x86-mario/profiles/base/parent b/overlay-x86-mario/profiles/base/parent
index 837de1f..fc23d1c 100644
--- a/overlay-x86-mario/profiles/base/parent
+++ b/overlay-x86-mario/profiles/base/parent
@@ -1 +1 @@
-/usr/local/portage/chromiumos/profiles/default/linux/amd64/10.0/chromeos
+/usr/local/portage/chromiumos/profiles/default/linux/x86/10.0/chromeos
diff --git a/overlay-x86-mario/profiles/kernel-next/parent b/overlay-x86-mario/profiles/kernel-next/parent
index d3c614b..cacd833 100644
--- a/overlay-x86-mario/profiles/kernel-next/parent
+++ b/overlay-x86-mario/profiles/kernel-next/parent
@@ -1,2 +1,2 @@
-/usr/local/portage/chromiumos/profiles/default/linux/amd64/10.0/chromeos
+/usr/local/portage/chromiumos/profiles/default/linux/x86/10.0/chromeos
/usr/local/portage/chromiumos/profiles/features/kernel-next
diff --git a/overlay-x86-mario/toolchain.conf b/overlay-x86-mario/toolchain.conf
index c64e36b..f11a8d9 100644
--- a/overlay-x86-mario/toolchain.conf
+++ b/overlay-x86-mario/toolchain.conf
@@ -1,4 +1 @@
-x86_64-cros-linux-gnu
-
-# This is required for building the 32bit updater
i686-pc-linux-gnu
