kernel.mk: remove obsolete rules

[android-x86/device-generic-common.git] / build / tasks / kernel.mk

diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index e8f04b0..ee6dbfc 100644 (file)
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2014-2017 The Android-x86 Open Source Project
+# Copyright (C) 2014-2019 The Android-x86 Open Source Project

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -8,6 +8,9 @@
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 

+export LC_CTYPE := C
+export LC_MESSAGES := C
+

 ifneq ($(TARGET_NO_KERNEL),true)
 ifeq ($(TARGET_PREBUILT_KERNEL),)
 
 ifneq ($(TARGET_NO_KERNEL),true)
 ifeq ($(TARGET_PREBUILT_KERNEL),)
 


@@ -59,7 +62,7 @@ KERNEL_ARCH_CHANGED := $(if $(filter 0,$(shell grep -s ^$(if $(filter x86,$(TARG
 $(KERNEL_DOTCONFIG_FILE): $(KERNEL_CONFIG_FILE) $(wildcard $(TARGET_KERNEL_DIFFCONFIG)) $(KERNEL_ARCH_CHANGED)
        $(hide) mkdir -p $(@D) && cat $(wildcard $^) > $@
        $(hide) ln -sf ../../../../../../external $(@D)
 $(KERNEL_DOTCONFIG_FILE): $(KERNEL_CONFIG_FILE) $(wildcard $(TARGET_KERNEL_DIFFCONFIG)) $(KERNEL_ARCH_CHANGED)
        $(hide) mkdir -p $(@D) && cat $(wildcard $^) > $@
        $(hide) ln -sf ../../../../../../external $(@D)

-       $(mk_kernel) oldnoconfig
+       $(mk_kernel) olddefconfig

 
 BUILT_KERNEL_TARGET := $(KBUILD_OUTPUT)/arch/$(TARGET_ARCH)/boot/$(KERNEL_TARGET)
 $(BUILT_KERNEL_TARGET): $(KERNEL_DOTCONFIG_FILE)
 
 BUILT_KERNEL_TARGET := $(KBUILD_OUTPUT)/arch/$(TARGET_ARCH)/boot/$(KERNEL_TARGET)
 $(BUILT_KERNEL_TARGET): $(KERNEL_DOTCONFIG_FILE)


@@ -71,10 +74,10 @@ KERNEL_MODULES_DEP := $(firstword $(wildcard $(TARGET_OUT)/lib/modules/*/modules
 KERNEL_MODULES_DEP := $(if $(KERNEL_MODULES_DEP),$(KERNEL_MODULES_DEP),$(TARGET_OUT)/lib/modules)
 
 ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES))
 KERNEL_MODULES_DEP := $(if $(KERNEL_MODULES_DEP),$(KERNEL_MODULES_DEP),$(TARGET_OUT)/lib/modules)
 
 ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES))

-$(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(BUILT_KERNEL_TARGET)
+$(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(BUILT_KERNEL_TARGET) | $(ACP)

        @echo Building additional kernel module $*
        $(hide) mkdir -p $(@D) && $(ACP) -fr $(EXTRA_KERNEL_MODULE_PATH_$*) $(@D)
        @echo Building additional kernel module $*
        $(hide) mkdir -p $(@D) && $(ACP) -fr $(EXTRA_KERNEL_MODULE_PATH_$*) $(@D)

-       $(mk_kernel) M=$(abspath $@) modules
+       $(mk_kernel) M=$(abspath $@) modules || ( rm -rf $@ && exit 1 )

 
 $(KERNEL_MODULES_DEP): $(BUILT_KERNEL_TARGET) $(ALL_EXTRA_MODULES)
        $(hide) rm -rf $(TARGET_OUT)/lib/modules
 
 $(KERNEL_MODULES_DEP): $(BUILT_KERNEL_TARGET) $(ALL_EXTRA_MODULES)
        $(hide) rm -rf $(TARGET_OUT)/lib/modules


@@ -88,20 +91,12 @@ endif
 
 $(BUILT_SYSTEMIMAGE): $(KERNEL_MODULES_DEP)
 
 
 $(BUILT_SYSTEMIMAGE): $(KERNEL_MODULES_DEP)
 

-# rules to get source of Broadcom 802.11a/b/g/n hybrid device driver
-# based on broadcomsetup.sh of Kyle Evans
-WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/broadcom/wl
-ifeq ($(wildcard $(WL_PATH)/build.mk),)
-WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/wl
-endif
--include $(WL_PATH)/build.mk
-

 installclean: FILES += $(KBUILD_OUTPUT) $(INSTALLED_KERNEL_TARGET)
 
 TARGET_PREBUILT_KERNEL := $(BUILT_KERNEL_TARGET)
 
 .PHONY: kernel $(if $(KERNEL_ARCH_CHANGED),$(KERNEL_HEADERS_COMMON)/linux/binder.h)
 installclean: FILES += $(KBUILD_OUTPUT) $(INSTALLED_KERNEL_TARGET)
 
 TARGET_PREBUILT_KERNEL := $(BUILT_KERNEL_TARGET)
 
 .PHONY: kernel $(if $(KERNEL_ARCH_CHANGED),$(KERNEL_HEADERS_COMMON)/linux/binder.h)

-kernel: $(INSTALLED_KERNEL_TARGET)
+kernel: $(INSTALLED_KERNEL_TARGET) $(KERNEL_MODULES_DEP)

 
 endif # TARGET_PREBUILT_KERNEL
 
 
 endif # TARGET_PREBUILT_KERNEL