config/options: LINUX_DEPENDS not observing correct kernel config when TARGET_PATCH_ARCH in effect

This commit is contained in:
MilhouseVH 2017-11-24 20:49:22 +00:00
parent d34853b033
commit fffd7fb134

View File

@ -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)"