diff options
author | Xu Chao | 2018-09-12 22:48:29 -0500 |
---|---|---|
committer | Praneeth Bajjuri | 2018-09-13 16:09:33 -0500 |
commit | 479043d9582b055b7661f1ceb95fa99e72f64b57 (patch) | |
tree | 426c10641212c2c772cc11890e53ed266d5b2699 | |
parent | af0825a6bc29efb651389ccd1f8e277acff24941 (diff) | |
download | platform-build-d-oreo-mr1-core-release.tar.gz platform-build-d-oreo-mr1-core-release.tar.xz platform-build-d-oreo-mr1-core-release.zip |
Move build-image-kernel-modules out of recovery macrod-oreo-mr1-core-release
commit 2b04bf4725da85f74680f5e0736cb99da5d06eb6 upstream.
build-image-kernel-modules is defined under recovery macro
when build without recovery,the driver kos are not packed
into the vendor image
Test: build with TARGET_NO_RECOVERY on and set ko to be build
in BOARD_VENDOR_KERNEL_MODULES to see if kos are packed into
vendor image
Change-Id: I162ccb2fe50c09ece07b6b07e416721985228006
Signed-off-by: Andrew F. Davis <afd@ti.com>
-rw-r--r-- | core/Makefile | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/core/Makefile b/core/Makefile index 618e98317..1590f3096 100644 --- a/core/Makefile +++ b/core/Makefile | |||
@@ -1049,6 +1049,23 @@ $(if $(filter true,$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)),\ | |||
1049 | $(if $(2),$(hide) $(foreach kv,$(2),echo "$(kv)" >> $(1);)) | 1049 | $(if $(2),$(hide) $(foreach kv,$(2),echo "$(kv)" >> $(1);)) |
1050 | endef | 1050 | endef |
1051 | 1051 | ||
1052 | # $(1): modules list | ||
1053 | # $(2): output dir | ||
1054 | # $(3): mount point | ||
1055 | # $(4): staging dir | ||
1056 | # Depmod requires a well-formed kernel version so 0.0 is used as a placeholder. | ||
1057 | define build-image-kernel-modules | ||
1058 | $(hide) rm -rf $(2)/lib/modules | ||
1059 | $(hide) mkdir -p $(2)/lib/modules | ||
1060 | $(hide) cp $(1) $(2)/lib/modules/ | ||
1061 | $(hide) rm -rf $(4) | ||
1062 | $(hide) mkdir -p $(4)/lib/modules/0.0/$(3)lib/modules | ||
1063 | $(hide) cp $(1) $(4)/lib/modules/0.0/$(3)lib/modules | ||
1064 | $(hide) $(DEPMOD) -b $(4) 0.0 | ||
1065 | $(hide) sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/ \([^ ]*modules[^ ]*\)/ \/\1/g' $(4)/lib/modules/0.0/modules.dep > $(2)/lib/modules/modules.dep | ||
1066 | $(hide) cp $(4)/lib/modules/0.0/modules.alias $(2)/lib/modules | ||
1067 | endef | ||
1068 | |||
1052 | # ----------------------------------------------------------------- | 1069 | # ----------------------------------------------------------------- |
1053 | # Recovery image | 1070 | # Recovery image |
1054 | 1071 | ||
@@ -1183,23 +1200,6 @@ $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys) | |||
1183 | 1200 | ||
1184 | RECOVERYIMAGE_ID_FILE := $(PRODUCT_OUT)/recovery.id | 1201 | RECOVERYIMAGE_ID_FILE := $(PRODUCT_OUT)/recovery.id |
1185 | 1202 | ||
1186 | # $(1): modules list | ||
1187 | # $(2): output dir | ||
1188 | # $(3): mount point | ||
1189 | # $(4): staging dir | ||
1190 | # Depmod requires a well-formed kernel version so 0.0 is used as a placeholder. | ||
1191 | define build-image-kernel-modules | ||
1192 | $(hide) rm -rf $(2)/lib/modules | ||
1193 | $(hide) mkdir -p $(2)/lib/modules | ||
1194 | $(hide) cp $(1) $(2)/lib/modules/ | ||
1195 | $(hide) rm -rf $(4) | ||
1196 | $(hide) mkdir -p $(4)/lib/modules/0.0/$(3)lib/modules | ||
1197 | $(hide) cp $(1) $(4)/lib/modules/0.0/$(3)lib/modules | ||
1198 | $(hide) $(DEPMOD) -b $(4) 0.0 | ||
1199 | $(hide) sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/ \([^ ]*modules[^ ]*\)/ \/\1/g' $(4)/lib/modules/0.0/modules.dep > $(2)/lib/modules/modules.dep | ||
1200 | $(hide) cp $(4)/lib/modules/0.0/modules.alias $(2)/lib/modules | ||
1201 | endef | ||
1202 | |||
1203 | # $(1): output file | 1203 | # $(1): output file |
1204 | define build-recoveryimage-target | 1204 | define build-recoveryimage-target |
1205 | @echo ----- Making recovery image ------ | 1205 | @echo ----- Making recovery image ------ |