From 1e6f3ffe1425cb2db23fd95a69b9f50f7d250330 Mon Sep 17 00:00:00 2001 From: Hongguang Date: Mon, 23 May 2022 16:15:47 -0700 Subject: [PATCH] Private modules should be installed into private Bug: 220644706 Test: make and find the private modules in dist. Change-Id: I920715ccdb4d39c11a9ca74e2d97096babbc7ffe --- bcmdhd.100.10.315.x/Makefile | 4 ++-- bcmdhd.101.10.240.x/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bcmdhd.100.10.315.x/Makefile b/bcmdhd.100.10.315.x/Makefile index 60837c3..78a7ae5 100644 --- a/bcmdhd.100.10.315.x/Makefile +++ b/bcmdhd.100.10.315.x/Makefile @@ -249,8 +249,8 @@ all: bcmdhd_sdio EXTRA_CFLAGS += -I$(KERNEL_SRC)/$(M)/include -I$(KERNEL_SRC)/$(M)/ modules_install: @$(MAKE) INSTALL_MOD_STRIP=1 M=$(M) -C $(KERNEL_SRC) modules_install - mkdir -p ${OUT_DIR}/../vendor_lib/modules - cd ${OUT_DIR}/$(M)/; find -name "*.ko" -exec cp {} ${OUT_DIR}/../vendor_lib/modules/ \; + mkdir -p ${OUT_DIR}/private/modules + cd ${OUT_DIR}/$(M)/; find -name "*.ko" -exec cp {} ${OUT_DIR}/private/modules/ \; clean: $(MAKE) -C $(KERNEL_SRC) M=$(M) clean $(KBUILD_OPTIONS) diff --git a/bcmdhd.101.10.240.x/Makefile b/bcmdhd.101.10.240.x/Makefile index 8177ba7..9b15cad 100644 --- a/bcmdhd.101.10.240.x/Makefile +++ b/bcmdhd.101.10.240.x/Makefile @@ -244,8 +244,8 @@ all: bcmdhd_sdio EXTRA_CFLAGS += -I$(KERNEL_SRC)/$(M)/include -I$(KERNEL_SRC)/$(M)/ modules_install: @$(MAKE) INSTALL_MOD_STRIP=1 M=$(M) -C $(KERNEL_SRC) modules_install - mkdir -p ${OUT_DIR}/../vendor_lib/modules - cd ${OUT_DIR}/$(M)/; find -name "*.ko" -exec cp {} ${OUT_DIR}/../vendor_lib/modules/ \; + mkdir -p ${OUT_DIR}/private/modules + cd ${OUT_DIR}/$(M)/; find -name "*.ko" -exec cp {} ${OUT_DIR}/private/modules/ \; clean: $(MAKE) -C $(KERNEL_SRC) M=$(M) clean $(KBUILD_OPTIONS) -- 2.20.1