mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-09 17:03:35 -09:00
Merge branch 'next'
Quite some conflicts, so here goes .. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
@@ -18,6 +18,10 @@ config BR2_EXTERNAL
|
||||
string
|
||||
option env="BR2_EXTERNAL"
|
||||
|
||||
config BR2_BUILD_DIR
|
||||
string
|
||||
option env="BUILD_DIR"
|
||||
|
||||
# Hidden config symbols for packages to check system gcc version
|
||||
config BR2_HOST_GCC_VERSION
|
||||
string
|
||||
@@ -763,3 +767,5 @@ menu "User-provided options"
|
||||
source "$BR2_EXTERNAL/Config.in"
|
||||
|
||||
endmenu
|
||||
|
||||
source "$BR2_BUILD_DIR/.br2-external.in"
|
||||
|
||||
Reference in New Issue
Block a user