vendor/bliss: Update GSI Patches
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
diff --git a/patches/vendor/bliss/0011-Revert-kernel-Use-a-macro-for-kernel-build-targets.patch b/patches/vendor/bliss/0011-Revert-kernel-Use-a-macro-for-kernel-build-targets.patch
new file mode 100644
index 0000000..3bcb5da
--- /dev/null
+++ b/patches/vendor/bliss/0011-Revert-kernel-Use-a-macro-for-kernel-build-targets.patch
@@ -0,0 +1,127 @@
+From 9afa3ceca47aa1db7f1f2a661d6c75fac6631a27 Mon Sep 17 00:00:00 2001
+From: Jackeagle <jackeagle102@gmail.com>
+Date: Fri, 3 May 2019 14:49:33 +0200
+Subject: [PATCH 11/17] Revert "kernel: Use a macro for kernel build targets"
+
+This reverts commit 50ec7ed057150c875342d461d34fe2cc02dea12d.
+---
+ build/tasks/kernel.mk | 49 +++++++++++++------------------------------
+ 1 file changed, 14 insertions(+), 35 deletions(-)
+
+diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
+index d1862031..5df1ec54 100644
+--- a/build/tasks/kernel.mk
++++ b/build/tasks/kernel.mk
+@@ -199,25 +199,6 @@ endif
+
+ KERNEL_ADDITIONAL_CONFIG_OUT := $(KERNEL_OUT)/.additional_config
+
+-# Internal implementation of make-kernel-target
+-# $(1): output path (The value passed to O=)
+-# $(2): target to build (eg. defconfig, modules, dtbo.img)
+-define internal-make-kernel-target
+-$(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(1) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(2)
+-endef
+-
+-# Make a kernel target
+-# $(1): The kernel target to build (eg. defconfig, modules, modules_install)
+-define make-kernel-target
+-$(call internal-make-kernel-target,$(KERNEL_OUT),$(1))
+-endef
+-
+-# Make a DTBO target
+-# $(1): The DTBO target to build (eg. dtbo.img, defconfig)
+-define make-dtbo-target
+-$(call internal-make-kernel-target,$(PRODUCT_OUT)/dtbo,$(1))
+-endef
+-
+ .PHONY: force_additional_config
+ $(KERNEL_ADDITIONAL_CONFIG_OUT): force_additional_config
+ $(hide) cmp -s $(KERNEL_ADDITIONAL_CONFIG_SRC) $@ || cp $(KERNEL_ADDITIONAL_CONFIG_SRC) $@;
+@@ -225,31 +206,29 @@ $(KERNEL_ADDITIONAL_CONFIG_OUT): force_additional_config
+ $(KERNEL_CONFIG): $(KERNEL_DEFCONFIG_SRC) $(KERNEL_ADDITIONAL_CONFIG_OUT)
+ @echo "Building Kernel Config"
+ $(hide) mkdir -p $(KERNEL_OUT)
+- $(call make-kernel-target,VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG))
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG)
+ $(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
+ echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
+ echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \
+- $(call make-kernel-target,oldconfig); \
+- fi
++ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) oldconfig; fi
+ # Create defconfig build artifact
+- $(call make-kernel-target,savedefconfig)
++ $(hide) $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) savedefconfig
+ $(hide) if [ ! -z "$(KERNEL_ADDITIONAL_CONFIG)" ]; then \
+ echo "Using additional config '$(KERNEL_ADDITIONAL_CONFIG)'"; \
+ $(KERNEL_SRC)/scripts/kconfig/merge_config.sh -m -O $(KERNEL_OUT) $(KERNEL_OUT)/.config $(KERNEL_SRC)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_ADDITIONAL_CONFIG); \
+- $(call make-kernel-target,KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig); \
+- fi
++ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig; fi
+
+ .PHONY: TARGET_KERNEL_BINARIES
+ TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG)
+ @echo "Building Kernel"
+- $(call make-kernel-target,$(BOARD_KERNEL_IMAGE_NAME))
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(BOARD_KERNEL_IMAGE_NAME)
+ $(hide) if grep -q '^CONFIG_OF=y' $(KERNEL_CONFIG); then \
+ echo "Building DTBs"; \
+- $(call make-kernel-target,dtbs); \
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) dtbs; \
+ fi
+ $(hide) if grep -q '=m' $(KERNEL_CONFIG); then \
+ echo "Building Kernel Modules"; \
+- $(call make-kernel-target,modules); \
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) modules; \
+ fi
+
+ .PHONY: INSTALLED_KERNEL_MODULES
+@@ -259,7 +238,7 @@ INSTALLED_KERNEL_MODULES: depmod-host
+ $(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=../../$(KERNEL_MODULES_INSTALL) modules_install) && \
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) 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 \
+@@ -327,7 +306,7 @@ $(KERNEL_HEADERS_INSTALL_DIR): $(KERNEL_HEADERS_INSTALL_DEPS)
+ .PHONY: kerneltags
+ kerneltags: $(KERNEL_CONFIG)
+ $(hide) mkdir -p $(KERNEL_OUT)
+- $(call make-kernel-target,tags)
++ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) tags
+
+ .PHONY: kernelconfig kernelxconfig kernelsavedefconfig alldefconfig
+
+@@ -344,21 +323,21 @@ kernelxconfig kernelconfig:
+
+ kernelsavedefconfig:
+ $(hide) mkdir -p $(KERNEL_OUT)
+- $(call make-kernel-target,$(KERNEL_DEFCONFIG))
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(KERNEL_DEFCONFIG)
+ env KCONFIG_NOTIMESTAMP=true \
+- $(call make-kernel-target,savedefconfig)
++ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) savedefconfig
+ cp $(KERNEL_OUT)/defconfig $(KERNEL_DEFCONFIG_SRC)
+
+ alldefconfig:
+ $(hide) mkdir -p $(KERNEL_OUT)
+ env KCONFIG_NOTIMESTAMP=true \
+- $(call make-kernel-target,alldefconfig)
++ $(PATH_OVERRIDE) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) alldefconfig
+
+ TARGET_PREBUILT_DTBO = $(PRODUCT_OUT)/dtbo/arch/$(KERNEL_ARCH)/boot/dtbo.img
+ $(TARGET_PREBUILT_DTBO): $(AVBTOOL)
+ echo -e ${CL_GRN}"Building DTBO.img"${CL_RST}
+- $(call make-dtbo-target,$(KERNEL_DEFCONFIG))
+- $(call make-dtbo-target,dtbo.img)
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(PRODUCT_OUT)/dtbo ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(KERNEL_DEFCONFIG)
++ $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(PRODUCT_OUT)/dtbo ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) dtbo.img
+ $(AVBTOOL) add_hash_footer \
+ --image $@ \
+ --partition_size $(BOARD_DTBOIMG_PARTITION_SIZE) \
+--
+2.21.0
+