jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 14:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow selection of kernel config tool

Browse Source
This commit is contained in:
Ulf Samuelsson 2008-03-30 20:04:55 +00:00
parent 399a1f27fa
commit 62ce637fed
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
target/linux/Config.in.advanced
View File

@ -416,12 +416,14 @@ config BR2_PACKAGE_LINUX_USE_DEFCONFIG
Configure Linux by make <board>_defconfig Configure Linux by make <board>_defconfig
config BR2_PACKAGE_LINUX_USE_XCONFIG config BR2_PACKAGE_LINUX_USE_XCONFIG
bool "Run make ARCH=$(ARCH) xconfig before build" bool "Run make ARCH=$(ARCH) [xconfig|menuconfig] before build"
depends BR2_PACKAGE_LINUX depends BR2_PACKAGE_LINUX
help help
Configure Linux by make xconfig Configure Linux by make xconfig
endchoice endchoice
config BR2_PACKAGE_LINUX_KCONFIG config BR2_PACKAGE_LINUX_KCONFIG
string ".config file" string ".config file"
depends on BR2_PACKAGE_LINUX_USE_KCONFIG depends on BR2_PACKAGE_LINUX_USE_KCONFIG
@ -433,6 +435,29 @@ config BR2_PACKAGE_LINUX_KCONFIG
board-imposed value by passing LINUX26_KCONFIG=<path> to board-imposed value by passing LINUX26_KCONFIG=<path> to
make. make.
choice
prompt "Preferred config tool"
default BR2_MAKE_XCONFIG
help
Define the preferred tool to invoke if a configuration is invalid
config BR2_MAKE_XCONFIG
bool "make xconfig"
help
Run "make menuconfig" if kernel ".config" is invalid
config BR2_MAKE_MENUCONFIG
bool "make menuconfig"
help
Run "make menuconfig" if kernel ".config" is invalid
endchoice
config BR2_KERNEL_CONFIG_METHOD
string
default "xconfig" if BR2_MAKE_XCONFIG
default "menuconfig" if BR2_MAKE_MENUCONFIG
endmenu endmenu
choice choice

10
target/linux/Makefile.in.advanced
View File

@ -103,6 +103,12 @@ endif
endif endif
endif endif
KERNEL_CONFIG_METHOD:=($(strip $(subst ",,$(BR2_KERNEL_CONFIG_METHOD))),)
#"))
ifeq ($(KERNEL_CONFIG_METHOD),)
KERNEL_CONFIG_METHOD:=xconfig
endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
ifndef LINUX26_FORMAT ifndef LINUX26_FORMAT
ifneq ($(strip $(subst ",,$(BR2_PACKAGE_LINUX_FORMAT))),) ifneq ($(strip $(subst ",,$(BR2_PACKAGE_LINUX_FORMAT))),)
@ -302,7 +308,7 @@ ifeq ($(BR2_PACKAGE_LINUX_USE_DEFCONFIG),y)
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(BOARD_NAME)_defconfig $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(BOARD_NAME)_defconfig
endif endif
ifeq ($(BR2_PACKAGE_LINUX_USE_XCONFIG),y) ifeq ($(BR2_PACKAGE_LINUX_USE_XCONFIG),y)
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) xconfig $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(KERNEL_CONFIG_METHOD)
endif endif
ifeq ($(BR2_PACKAGE_LINUX_USE_KCONFIG),y) ifeq ($(BR2_PACKAGE_LINUX_USE_KCONFIG),y)
# Try user defined config # Try user defined config
@ -326,7 +332,7 @@ ifeq ($(BR2_PACKAGE_LINUX_USE_KCONFIG),y)
fi fi
# let the user create his/her own config # let the user create his/her own config
if [ ! -f "$(LINUX26_DIR)/.config" ] ; then \ if [ ! -f "$(LINUX26_DIR)/.config" ] ; then \
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) xconfig ; \ $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(KERNEL_CONFIG_METHOD) ; \
fi fi
endif endif