From fffd7fb1343f46555b50bed1bd14d05b2732a58c Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Fri, 24 Nov 2017 20:49:22 +0000
Subject: [PATCH] config/options: LINUX_DEPENDS not observing correct kernel
 config when TARGET_PATCH_ARCH in effect

---
 config/options | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/options b/config/options
index 99bc5c01da..fb2b1de913 100644
--- a/config/options
+++ b/config/options
@@ -28,8 +28,6 @@ fi
 ROOT="${PWD}"
 DISTRO_DIR="$ROOT/distributions"
 PROJECT_DIR="$ROOT/projects"
-LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $PROJECT_DIR/$PROJECT/devices/$DEVICE/linux/linux.$TARGET_ARCH.conf $ROOT/packages/linux/package.mk"
-[ "$TARGET_ARCH" = "x86_64" ] && LINUX_DEPENDS+=" $ROOT/packages/linux-firmware/intel-ucode/package.mk $ROOT/packages/linux-firmware/x86-firmware/package.mk"
 
 # include versioning
   . config/version
@@ -54,6 +52,9 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $PROJECT_DIR/
    . $PROJECT_DIR/$PROJECT/devices/$DEVICE/options
  fi
 
+LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.${TARGET_PATCH_ARCH:-$TARGET_ARCH}.conf $PROJECT_DIR/$PROJECT/devices/$DEVICE/linux/linux.${TARGET_PATCH_ARCH:-$TARGET_ARCH}.conf $ROOT/packages/linux/package.mk"
+[ "$TARGET_ARCH" = "x86_64" ] && LINUX_DEPENDS+=" $ROOT/packages/linux-firmware/intel-ucode/package.mk $ROOT/packages/linux-firmware/x86-firmware/package.mk"
+
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC don't point to it
   [ -z "${LOCAL_CC}" ] && export LOCAL_CC="$(which gcc)"