From 2f6215b0b601d6e3ec356f720f806910d9e1e458 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 4 Jan 2017 04:53:19 -0600
Subject: easy-kernel: handle STUPID edge case where Portage $ARCH != uname -s
 != kernel $ARCH

---
 .../easy-kernel/easy-kernel-4.4.39_p6.ebuild       | 18 ++++++++++++++++-
 sys-kernel/easy-kernel/files/config_4.4.39_p6_ppc  | 23 +---------------------
 2 files changed, 18 insertions(+), 23 deletions(-)

(limited to 'sys-kernel/easy-kernel')

diff --git a/sys-kernel/easy-kernel/easy-kernel-4.4.39_p6.ebuild b/sys-kernel/easy-kernel/easy-kernel-4.4.39_p6.ebuild
index d14ddc0ec..93afa5ba4 100644
--- a/sys-kernel/easy-kernel/easy-kernel-4.4.39_p6.ebuild
+++ b/sys-kernel/easy-kernel/easy-kernel-4.4.39_p6.ebuild
@@ -25,16 +25,32 @@ src_prepare() {
 src_configure() {
 	cp "${FILESDIR}"/config_${PV}_${ARCH} "${S}"/.config || \
 		die "No configuration available for your architecture."
+
+    case ${ARCH} in
+		ppc)    export ARCH="powerpc" ;;
+		ppc64)  export ARCH="powerpc64" ;;
+	esac
+
 	emake silentoldconfig
 }
 
 src_compile() {
-	emake bzImage
+    case ${ARCH} in
+		ppc)    export ARCH="powerpc" ;;
+		ppc64)  export ARCH="powerpc64" ;;
+	esac
+
+	emake
 	emake modules
 	emake firmware
 }
 
 src_install() {
+    case ${ARCH} in
+		ppc)    export ARCH="powerpc" ;;
+		ppc64)  export ARCH="powerpc64" ;;
+	esac
+
 	dodir /boot
 	emake install INSTALL_PATH="${D}/boot"
 	emake modules_install INSTALL_MOD_PATH="${D}"
diff --git a/sys-kernel/easy-kernel/files/config_4.4.39_p6_ppc b/sys-kernel/easy-kernel/files/config_4.4.39_p6_ppc
index 4feddf5ce..5819a40ac 100644
--- a/sys-kernel/easy-kernel/files/config_4.4.39_p6_ppc
+++ b/sys-kernel/easy-kernel/files/config_4.4.39_p6_ppc
@@ -429,28 +429,7 @@ CONFIG_SUSPEND_FREEZER=y
 CONFIG_HIBERNATE_CALLBACKS=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
-CONFIG_TOI_CORE=y
-
-#
-# Image Storage (you need at least one allocator)
-#
-CONFIG_TOI_FILE=y
-CONFIG_TOI_SWAP=y
-
-#
-# General Options
-#
-CONFIG_TOI_CRYPTO=y
-CONFIG_TOI_USERUI=y
-CONFIG_TOI_USERUI_DEFAULT_PATH="/usr/local/sbin/tuxoniceui_text"
-CONFIG_TOI_DEFAULT_IMAGE_SIZE_LIMIT=-2
-# CONFIG_TOI_KEEP_IMAGE is not set
-CONFIG_TOI_REPLACE_SWSUSP=y
-# CONFIG_TOI_IGNORE_LATE_INITCALL is not set
-CONFIG_TOI_DEFAULT_WAIT=25
-CONFIG_TOI_DEFAULT_EXTRA_PAGES_ALLOWANCE=2000
-# CONFIG_TOI_CHECKSUM is not set
-CONFIG_TOI=y
+# CONFIG_TOI_CORE is not set
 CONFIG_PM_SLEEP=y
 # CONFIG_PM_AUTOSLEEP is not set
 # CONFIG_PM_WAKELOCKS is not set
-- 
cgit v1.2.3-70-g09d2