From b9173d7850fa25c69cc821fa71e5ddaed8633634 Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Thu, 11 Jul 2019 15:37:05 -0400 Subject: [PATCH] relocate 'compilation_prepare' prior too patching --- lib/compilation.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/compilation.sh b/lib/compilation.sh index 15037407f6..d9018fb6de 100644 --- a/lib/compilation.sh +++ b/lib/compilation.sh @@ -275,6 +275,12 @@ compile_kernel() patch --batch --silent -t -p1 < $SRC/patch/kernel/compiler.patch >> $DEST/debug/output.log 2>&1 fi + # read kernel version + local version=$(grab_version "$kerneldir") + + # build 3rd party drivers + compilation_prepare + advanced_patch "kernel" "$KERNELPATCHDIR" "$BOARD" "" "$BRANCH" "$LINUXFAMILY-$BRANCH" if ! grep -qoE '^-rc[[:digit:]]+' <(grep "^EXTRAVERSION" Makefile | head -1 | awk '{print $(NF)}'); then @@ -282,12 +288,6 @@ compile_kernel() fi rm -f localversion - # read kernel version - local version=$(grab_version "$kerneldir") - - # build 3rd party drivers - compilation_prepare - # create linux-source package - with already patched sources local sources_pkg_dir=$SRC/.tmp/${CHOSEN_KSRC}_${REVISION}_all rm -rf ${sources_pkg_dir}