android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build.config: Remove the generation of system_dlkm twice

Browse Source 
This commits avoids the generation of system_dlkm image in msm-kernel
as it is already being generated in common kernel.

Change-Id: I98a612ec611947f373e8facc29e407d74b832ca8
Signed-off-by: Vamsi Krishna Lanka <quic_vamslank@quicinc.com>
This commit is contained in:
Vamsi Krishna Lanka 2022-06-10 12:38:48 -07:00
parent 3b138f9259
commit 352835c849
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.config.msm.common
View File

@ -165,7 +165,7 @@ if [ "${BUILD_VENDOR_DLKM}" == "1" ]; then
COMBINED_MODULE_LIST=$(mktemp) COMBINED_MODULE_LIST=$(mktemp)
fi fi
if [[ "${BUILD_SYSTEM_DLKM}" == "1" && ! -z "${SYSTEM_DLKM_MODULES_LIST}" ]]; then if [[ "${PREPARE_SYSTEM_DLKM}" == "1" && ! -z "${SYSTEM_DLKM_MODULES_LIST}" ]]; then
{ {
awk -F'/' '{print $NF}' ${SYSTEM_DLKM_MODULES_LIST} awk -F'/' '{print $NF}' ${SYSTEM_DLKM_MODULES_LIST}
[ -f "${MODULES_LIST}" ] && cat "${MODULES_LIST}" [ -f "${MODULES_LIST}" ] && cat "${MODULES_LIST}"
@ -200,16 +200,15 @@ if [ "${BUILD_VENDOR_DLKM}" == "1" ]; then
fi fi
function prepare_system_dlkm() { function prepare_system_dlkm() {
if [ "${PREPARE_SYSTEM_DLKM}" == "1" ]; then
if [ -e "${KERNEL_DIR}/modules.systemdlkm_blocklist.${CONFIG_TARGET}" ]; then if [ -e "${KERNEL_DIR}/modules.systemdlkm_blocklist.${CONFIG_TARGET}" ]; then
SYSTEM_DLKM_MODULES_BLOCKLIST="${KERNEL_DIR}/modules.systemdlkm_blocklist.${CONFIG_TARGET}" SYSTEM_DLKM_MODULES_BLOCKLIST="${KERNEL_DIR}/modules.systemdlkm_blocklist.${CONFIG_TARGET}"
cp $SYSTEM_DLKM_MODULES_BLOCKLIST ${DIST_DIR}/system_dlkm.modules.blocklist cp $SYSTEM_DLKM_MODULES_BLOCKLIST ${DIST_DIR}/system_dlkm.modules.blocklist
fi fi
SUPER_IMAGE_CONTENTS+=("${DIST_DIR}/system_dlkm.img") SUPER_IMAGE_CONTENTS+=("${DIST_DIR}/system_dlkm.img")
fi
} }
append_cmd DIST_CMDS 'prepare_system_dlkm'
if [ "${BUILD_SYSTEM_DLKM}" == "1" ]; then
append_cmd DIST_CMDS 'prepare_system_dlkm'
fi
KERNEL_BINARY=Image KERNEL_BINARY=Image

1
build.config.msm.gki
View File

@ -34,6 +34,7 @@ function sanity_check_abi() {
# In that case, turn on some options for trimming and strict mode # In that case, turn on some options for trimming and strict mode
# which would normally be disabled because they conflict with # which would normally be disabled because they conflict with
# mixed build # mixed build
PREPARE_SYSTEM_DLKM=0
if [ "${VARIANT}" = gki ]; then if [ "${VARIANT}" = gki ]; then
TRIM_NONLISTED_KMI=1 TRIM_NONLISTED_KMI=1
KMI_SYMBOL_LIST_STRICT_MODE=1 KMI_SYMBOL_LIST_STRICT_MODE=1

3
build.config.msm.kalama
View File

@ -14,9 +14,8 @@ BOOT_IMAGE_HEADER_VERSION=4
BASE_ADDRESS=0x80000000 BASE_ADDRESS=0x80000000
PAGE_SIZE=4096 PAGE_SIZE=4096
BUILD_VENDOR_DLKM=1 BUILD_VENDOR_DLKM=1
BUILD_SYSTEM_DLKM=1 PREPARE_SYSTEM_DLKM=1
SYSTEM_DLKM_MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules SYSTEM_DLKM_MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules
SYSTEM_DLKM_MODULES_ORDER=android/gki_aarch64_modules
SUPER_IMAGE_SIZE=0x10000000 SUPER_IMAGE_SIZE=0x10000000
TRIM_UNUSED_MODULES=1 TRIM_UNUSED_MODULES=1
BUILD_INIT_BOOT_IMG=1 BUILD_INIT_BOOT_IMG=1

3
build.config.msm.pineapple
View File

@ -14,9 +14,8 @@ BOOT_IMAGE_HEADER_VERSION=4
BASE_ADDRESS=0x80000000 BASE_ADDRESS=0x80000000
PAGE_SIZE=4096 PAGE_SIZE=4096
BUILD_VENDOR_DLKM=1 BUILD_VENDOR_DLKM=1
BUILD_SYSTEM_DLKM=1 PREPARE_SYSTEM_DLKM=1
SYSTEM_DLKM_MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules SYSTEM_DLKM_MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules
SYSTEM_DLKM_MODULES_ORDER=android/gki_aarch64_modules
SUPER_IMAGE_SIZE=0x10000000 SUPER_IMAGE_SIZE=0x10000000
TRIM_UNUSED_MODULES=1 TRIM_UNUSED_MODULES=1
BUILD_INIT_BOOT_IMG=1 BUILD_INIT_BOOT_IMG=1