diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-04-04 02:07:24 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2020-04-04 02:07:24 -0700 |
| commit | 24af6297de21494d9b4800e858b3066a4553dfdf (patch) | |
| tree | 7d7fc04a1f62b947ae7025ae8669e4d77bf8853a | |
| parent | 7c68196de024cd886ac4630db447bb17bf7670a0 (diff) | |
| parent | 446e85b261da65781b0c55bcf50eadc68167f03d (diff) | |
Merge 446e85b261da65781b0c55bcf50eadc68167f03d on remote branch
Change-Id: I15441b5a0bd78fa117b884dd84a5da2ed82db259
| -rwxr-xr-x | buildkernel.sh | 16 | ||||
| -rw-r--r-- | kernel_definitions.mk | 3 | ||||
| -rw-r--r-- | modules_blacklist/modules.blacklist.lahaina | 1 |
3 files changed, 7 insertions, 13 deletions
diff --git a/buildkernel.sh b/buildkernel.sh index d11e7b5..3e2dc59 100755 --- a/buildkernel.sh +++ b/buildkernel.sh @@ -145,9 +145,10 @@ copy_modules_to_prebuilt() { PREBUILT_OUT=$1 - if [[ ! -e ${KERNEL_MODULES_OUT} ]]; then - mkdir -p ${KERNEL_MODULES_OUT} - fi + # Clean the DLKM directory to remove stale modules + rm -rf ${KERNEL_MODULES_OUT} + + mkdir -p ${KERNEL_MODULES_OUT} MODULES=$(find ${MODULES_STAGING_DIR} -type f -name "*.ko") if [ -n "${MODULES}" ]; then @@ -247,14 +248,6 @@ copy_all_to_prebuilt() cp -p -r ${OUT_DIR}/${KERNEL_SCRIPTS} ${PREBUILT_OUT} } -extract_kernel_sha1() -{ - CUR_DIR=$(pwd) - cd ${KERNEL_DIR} - git rev-list --max-count=1 HEAD > ${KERN_SHA1_LOC} - cd ${CUR_DIR} -} - copy_from_prebuilt() { PREBUILT_OUT=$1 @@ -367,7 +360,6 @@ else modules_install copy_all_to_prebuilt ${KERNEL_BINS} archive_kernel_modules - extract_kernel_sha1 fi exit 0 diff --git a/kernel_definitions.mk b/kernel_definitions.mk index a5759b7..666a4f0 100644 --- a/kernel_definitions.mk +++ b/kernel_definitions.mk @@ -82,8 +82,9 @@ ifeq ($(KERNEL_LLVM_SUPPORT),true) ifeq ($(USE_KERNEL_AOSP_LLVM), true) #Using kernel aosp-llvm compiler KERNEL_LLVM_BIN := $(KERNEL_AOSP_LLVM_CLANG) $(warning "Using latest kernel aosp llvm" $(KERNEL_LLVM_BIN)) - else + else #Using platform aosp-llvm binaries KERNEL_LLVM_BIN := $(shell pwd)/$(CLANG) + KERNEL_AOSP_LLVM_BIN := $(shell pwd)/$(shell (dirname $(CLANG))) $(warning "Not using latest aosp-llvm" $(KERNEL_LLVM_BIN)) endif real_cc := REAL_CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=aarch64-linux-gnu- AR=$(KERNEL_AOSP_LLVM_BIN)/llvm-ar LLVM_NM=$(KERNEL_AOSP_LLVM_BIN)/llvm-nm LD=$(KERNEL_AOSP_LLVM_BIN)/ld.lld diff --git a/modules_blacklist/modules.blacklist.lahaina b/modules_blacklist/modules.blacklist.lahaina index eb9261f..88471c6 100644 --- a/modules_blacklist/modules.blacklist.lahaina +++ b/modules_blacklist/modules.blacklist.lahaina @@ -81,3 +81,4 @@ blacklist vmw_vsock_virtio_transport blacklist vmw_vsock_virtio_transport_common blacklist vsock_diag blacklist vsock +blacklist qca_cld3_wlan |