jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: move generated .br2-external kconfig file to $(BASE_DIR)

Browse Source 
Currently, that file is generated rather late in the configuration
process, so BUILD_DIR is known (and exists) by then.

We're soon to generate that file much earlier, at a point where
BUILD_DIR is not yet known, so we have two options:
 1- declare BUILD_DIR earlier;
 2- generate the file in an already-known location.

We go with the second solution, as we're already generating a
br2-external related file in BASE_DIR, so we can as well generate all
br2-external files in the same place.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Vadim Kochan <vadim4j@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2019-07-29 22:19:53 +02:00 committed by Peter Korsgaard
parent fa3a2f139f
commit 54af0551b8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in
View File

@ -14,9 +14,9 @@ config BR2_HOSTARCH
string string
option env="HOSTARCH" option env="HOSTARCH"
config BR2_BUILD_DIR config BR2_BASE_DIR
string string
option env="BUILD_DIR" option env="BASE_DIR"
# Hidden config symbols for packages to check system gcc version # Hidden config symbols for packages to check system gcc version
config BR2_HOST_GCC_VERSION config BR2_HOST_GCC_VERSION
@ -865,4 +865,4 @@ source "package/Config.in.host"
source "Config.in.legacy" source "Config.in.legacy"
source "$BR2_BUILD_DIR/.br2-external.in" source "$BR2_BASE_DIR/.br2-external.in"

10
Makefile
View File

@ -934,7 +934,7 @@ HOSTCFLAGS = $(CFLAGS_FOR_BUILD)
export HOSTCFLAGS export HOSTCFLAGS
.PHONY: prepare-kconfig .PHONY: prepare-kconfig
prepare-kconfig: outputmakefile $(BUILD_DIR)/.br2-external.in prepare-kconfig: outputmakefile $(BASE_DIR)/.br2-external.in
$(BUILD_DIR)/buildroot-config/%onf: $(BUILD_DIR)/buildroot-config/%onf:
mkdir -p $(@D)/lxdialog mkdir -p $(@D)/lxdialog
@ -952,7 +952,7 @@ COMMON_CONFIG_ENV = \
KCONFIG_TRISTATE=$(BUILD_DIR)/buildroot-config/tristate.config \ KCONFIG_TRISTATE=$(BUILD_DIR)/buildroot-config/tristate.config \
BR2_CONFIG=$(BR2_CONFIG) \ BR2_CONFIG=$(BR2_CONFIG) \
HOST_GCC_VERSION="$(HOSTCC_VERSION)" \ HOST_GCC_VERSION="$(HOSTCC_VERSION)" \
BUILD_DIR=$(BUILD_DIR) \ BASE_DIR=$(BASE_DIR) \
SKIP_LEGACY= SKIP_LEGACY=
xconfig: $(BUILD_DIR)/buildroot-config/qconf prepare-kconfig xconfig: $(BUILD_DIR)/buildroot-config/qconf prepare-kconfig
@ -1034,8 +1034,8 @@ endif
# Even though the target is a real file, we mark it as PHONY as we # Even though the target is a real file, we mark it as PHONY as we
# want it to be re-generated each time make is invoked, in case the # want it to be re-generated each time make is invoked, in case the
# value of BR2_EXTERNAL is changed. # value of BR2_EXTERNAL is changed.
.PHONY: $(BUILD_DIR)/.br2-external.in .PHONY: $(BASE_DIR)/.br2-external.in
$(BUILD_DIR)/.br2-external.in: $(BUILD_DIR) $(BASE_DIR)/.br2-external.in: $(BUILD_DIR)
$(Q)support/scripts/br2-external -k -o "$(@)" $(BR2_EXTERNAL) $(Q)support/scripts/br2-external -k -o "$(@)" $(BR2_EXTERNAL)
# printvars prints all the variables currently defined in our # printvars prints all the variables currently defined in our
@ -1066,7 +1066,7 @@ ifeq ($(O),$(CURDIR)/output)
rm -rf $(O) rm -rf $(O)
endif endif
rm -rf $(TOPDIR)/dl $(BR2_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/..config.tmp \ rm -rf $(TOPDIR)/dl $(BR2_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/..config.tmp \
$(CONFIG_DIR)/.auto.deps $(BR2_EXTERNAL_FILE) $(CONFIG_DIR)/.auto.deps $(BR2_EXTERNAL_FILE) $(BASE_DIR)/.br2-external.in
.PHONY: help .PHONY: help
help: help: