jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2256 from MilhouseVH/le90_fix_linux_needs

Browse Source 
config/options: LINUX_DEPENDS not observing correct kernel config whe…
This commit is contained in:
Radostan Riedel 2017-11-25 08:44:40 +01:00 committed by GitHub
commit c5711190f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/options
View File

@ -28,8 +28,6 @@ fi
ROOT="${PWD}" ROOT="${PWD}"
DISTRO_DIR="$ROOT/distributions" DISTRO_DIR="$ROOT/distributions"
PROJECT_DIR="$ROOT/projects" 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 # include versioning
. config/version . config/version
@ -54,6 +52,9 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $PROJECT_DIR/
. $PROJECT_DIR/$PROJECT/devices/$DEVICE/options . $PROJECT_DIR/$PROJECT/devices/$DEVICE/options
fi 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 # Need to point to your actual cc
# If you have ccache installed, take care that LOCAL_CC don't point to it # If you have ccache installed, take care that LOCAL_CC don't point to it
[ -z "${LOCAL_CC}" ] && export LOCAL_CC="$(which gcc)" [ -z "${LOCAL_CC}" ] && export LOCAL_CC="$(which gcc)"