Commit 4cb15b28 authored by Sam bobroff's avatar Sam bobroff Committed by Thomas Petazzoni
Browse files

package/linux: handle generated defconfigs 



Signed-off-by: default avatarSam Bobroff <sam.bobroff@au1.ibm.com>
[yann.morin.1998@free.fr: move the kconfig-package hunk to the
 corresponding patch]
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 217493ee

linux/linux.mk

+7 −6
Original line number Diff line number Diff line
@@ -188,12 +188,10 @@ endef 
LINUX_POST_PATCH_HOOKS += LINUX_APPLY_LOCAL_PATCHES



ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)

KERNEL_SOURCE_CONFIG = $(KERNEL_ARCH_PATH)/configs/$(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig

LINUX_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig

else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)

KERNEL_SOURCE_CONFIG = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE))

LINUX_KCONFIG_FILE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE))

endif



LINUX_KCONFIG_FILE = $(KERNEL_SOURCE_CONFIG)

LINUX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES))

LINUX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig

LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS)
@@ -404,13 +402,16 @@ LINUX_POST_INSTALL_TARGET_HOOKS += $(foreach tool,$(LINUX_TOOLS),\ 
ifeq ($(BR_BUILDING),y)



ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)

ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG)),)

# We must use the user-supplied kconfig value, because

# LINUX_KCONFIG_DEFCONFIG will at least contain the

# trailing _defconfig

ifeq ($(qstrip $(BR2_LINUX_KERNEL_DEFCONFIG)),)

$(error No kernel defconfig name specified, check your BR2_LINUX_KERNEL_DEFCONFIG setting)

endif

endif



ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)

ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)),)

ifeq ($(LINUX_KCONFIG_FILE),)

$(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE setting)

endif

endif