diff options
| author | Prakruthi Deepak Heragu <pheragu@codeaurora.org> | 2020-07-13 20:36:22 -0700 |
|---|---|---|
| committer | Prakruthi Deepak Heragu <pheragu@codeaurora.org> | 2020-07-16 16:34:35 -0700 |
| commit | f334c127ec23d4e78c7fd395104ec8501d01950c (patch) | |
| tree | c91655b92923383dbd915368e9665b76df23a04a /buildkernel.sh | |
| parent | 0a4795c80064b10ff97c6e974bdbd08c1a785a0b (diff) | |
kernelscripts: Rename modules.blacklist to modules.blocklist
As modprobe utility now uses modules.blocklist file to find the list of
modules not to insert into the kernel, rename the modules.blacklist file
to modules.blocklist. Replace all blacklist to blocklist in the
modules.blocklist file.
Change-Id: I9205b4f41149c60a8c2d06e329d34d61f46780a1
Signed-off-by: Prakruthi Deepak Heragu <pheragu@codeaurora.org>
Diffstat (limited to 'buildkernel.sh')
| -rwxr-xr-x | buildkernel.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/buildkernel.sh b/buildkernel.sh index f5e8e0a..6020ec6 100755 --- a/buildkernel.sh +++ b/buildkernel.sh @@ -1,6 +1,6 @@ #!/bin/bash -xE -# Copyright (c) 2019 The Linux Foundation. All rights reserved. +# Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. # Not a Contribution. # # Copyright (C) 2019 The Android Open Source Project @@ -128,14 +128,14 @@ archive_kernel_modules() echo "Archiving vendor kernel modules: " echo ${VENDOR_KERNEL_MODULES} - # Also package the modules.blacklist file + # Also package the modules.blocklist file set -x - BLACKLIST_FILE="" - if [ -f "modules.blacklist" ]; then - BLACKLIST_FILE="modules.blacklist" + BLOCKLIST_FILE="" + if [ -f "modules.blocklist" ]; then + BLOCKLIST_FILE="modules.blocklist" fi - zip -rq ${VENDOR_KERNEL_MODULES_ARCHIVE} ${VENDOR_KERNEL_MODULES} ${BLACKLIST_FILE} + zip -rq ${VENDOR_KERNEL_MODULES_ARCHIVE} ${VENDOR_KERNEL_MODULES} ${BLOCKLIST_FILE} set +x popd @@ -172,11 +172,11 @@ copy_modules_to_prebuilt() fi cp -p ${OUT_DIR}/certs/*.* ${PREBUILT_OUT}/certs/ - # Copy the modules.blacklist file + # Copy the modules.blocklist file set -x - BLACKLIST_FILE=${PWD}/device/qcom/kernelscripts/modules_blacklist/modules.blacklist.${TARGET_PRODUCT} - if [ -f "${BLACKLIST_FILE}" ]; then - cp ${BLACKLIST_FILE} ${KERNEL_MODULES_OUT}/modules.blacklist + BLOCKLIST_FILE=${PWD}/device/qcom/kernelscripts/modules_blocklist/modules.blocklist.${TARGET_PRODUCT} + if [ -f "${BLOCKLIST_FILE}" ]; then + cp ${BLOCKLIST_FILE} ${KERNEL_MODULES_OUT}/modules.blocklist fi set +x } |