vendor/bliss: Update GSI Patches
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
diff --git a/patches/vendor/bliss/0010-Revert-kernel-Use-build-image-kernel-modules-instead.patch b/patches/vendor/bliss/0010-Revert-kernel-Use-build-image-kernel-modules-instead.patch
new file mode 100644
index 0000000..489c20e
--- /dev/null
+++ b/patches/vendor/bliss/0010-Revert-kernel-Use-build-image-kernel-modules-instead.patch
@@ -0,0 +1,73 @@
+From 51c9997f5ec7f6735480441b045a129dc327416f Mon Sep 17 00:00:00 2001
+From: Jackeagle <jackeagle102@gmail.com>
+Date: Fri, 3 May 2019 14:49:16 +0200
+Subject: [PATCH 10/17] Revert "kernel: Use build-image-kernel-modules instead
+ of copying it"
+
+This reverts commit dbda78c5e62807ec700be086216d5e2cbb28330f.
+---
+ build/tasks/kernel.mk | 29 ++++++++++++++++++++---------
+ 1 file changed, 20 insertions(+), 9 deletions(-)
+
+diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
+index eeba2c0d..d1862031 100644
+--- a/build/tasks/kernel.mk
++++ b/build/tasks/kernel.mk
+@@ -155,19 +155,21 @@ KERNEL_HEADERS_INSTALL_DIR := $(KERNEL_OUT)/usr
+ KERNEL_HEADERS_INSTALL_DEPS := $(KERNEL_OUT)/.headers_install_deps
+
+ ifeq ($(NEED_KERNEL_MODULE_ROOT),true)
+-KERNEL_MODULES_OUT := $(TARGET_ROOT_OUT)
++KERNEL_MODULES_INSTALL := root
++KERNEL_MODULES_OUT := $(TARGET_ROOT_OUT)/lib/modules
+ KERNEL_DEPMOD_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_recovery)
+ KERNEL_MODULE_MOUNTPOINT :=
+ else ifeq ($(NEED_KERNEL_MODULE_SYSTEM),true)
+-KERNEL_MODULES_OUT := $(TARGET_OUT)
++KERNEL_MODULES_INSTALL := $(TARGET_COPY_OUT_SYSTEM)
++KERNEL_MODULES_OUT := $(TARGET_OUT)/lib/modules
+ KERNEL_DEPMOD_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_system)
+ KERNEL_MODULE_MOUNTPOINT := system
+ else
+-KERNEL_MODULES_OUT := $(TARGET_OUT_VENDOR)
++KERNEL_MODULES_INSTALL := $(TARGET_COPY_OUT_VENDOR)
++KERNEL_MODULES_OUT := $(TARGET_OUT_VENDOR)/lib/modules
+ KERNEL_DEPMOD_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_vendor)
+ KERNEL_MODULE_MOUNTPOINT := vendor
+ endif
+-MODULES_INTERMEDIATES := $(call intermediates-dir-for,PACKAGING,kernel_modules)
+
+ ifeq ($(TARGET_KERNEL_CLANG_COMPILE),true)
+ ifneq ($(TARGET_KERNEL_CLANG_VERSION),)
+@@ -252,14 +254,23 @@ TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG)
+
+ .PHONY: INSTALLED_KERNEL_MODULES
+ INSTALLED_KERNEL_MODULES: depmod-host
++ $(hide) rm -rf $(KERNEL_MODULES_OUT)
++ $(hide) mkdir -p $(KERNEL_MODULES_OUT)
++ $(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR)
+ $(hide) if grep -q '=m' $(KERNEL_CONFIG); then \
+ echo "Installing Kernel Modules"; \
+- $(call make-kernel-target,INSTALL_MOD_PATH=$(MODULES_INTERMEDIATES) modules_install); \
+- modules=$$(find $(MODULES_INTERMEDIATES) -type f -name '*.ko'); \
+- for f in $$modules; do \
++ $(call make-kernel-target,INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) modules_install) && \
++ mofile=$$(find $(KERNEL_MODULES_OUT) -type f -name modules.order) && \
++ mpath=$$(dirname $$mofile) && \
++ for f in $$(find $$mpath/kernel -type f -name '*.ko'); do \
+ $(KERNEL_TOOLCHAIN_PATH)strip --strip-unneeded $$f; \
+- done; \
+- ($(call build-image-kernel-modules,$$modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT),$(KERNEL_DEPMOD_STAGING_DIR))); \
++ mv $$f $(KERNEL_MODULES_OUT); \
++ done && \
++ rm -rf $$mpath && \
++ mkdir -p $(KERNEL_DEPMOD_STAGING_DIR)/lib/modules/0.0/$(KERNEL_MODULE_MOUNTPOINT)/lib/modules && \
++ find $(KERNEL_MODULES_OUT) -name *.ko -exec cp {} $(KERNEL_DEPMOD_STAGING_DIR)/lib/modules/0.0/$(KERNEL_MODULE_MOUNTPOINT)/lib/modules \; && \
++ $(DEPMOD) -b $(KERNEL_DEPMOD_STAGING_DIR) 0.0 && \
++ sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/ \([^ ]*modules[^ ]*\)/ \/\1/g' $(KERNEL_DEPMOD_STAGING_DIR)/lib/modules/0.0/modules.dep > $(KERNEL_MODULES_OUT)/modules.dep; \
+ fi
+
+ $(TARGET_KERNEL_MODULES): TARGET_KERNEL_BINARIES
+--
+2.21.0
+