|
@@ -66,7 +66,7 @@ do_validate() {
|
|
|
|
|
|
do_validate_one() {
|
|
do_validate_one() {
|
|
local br2_ext="${1}"
|
|
local br2_ext="${1}"
|
|
- local br2_name br2_desc n d
|
|
|
|
|
|
+ local br2_name br2_desc br2_ver n d
|
|
|
|
|
|
if [ ! -d "${br2_ext}" ]; then
|
|
if [ ! -d "${br2_ext}" ]; then
|
|
error "'%s': no such file or directory\n" "${br2_ext}"
|
|
error "'%s': no such file or directory\n" "${br2_ext}"
|
|
@@ -104,8 +104,10 @@ do_validate_one() {
|
|
|
|
|
|
# Register this br2-external tree, use an absolute canonical path
|
|
# Register this br2-external tree, use an absolute canonical path
|
|
br2_ext="$( cd "${br2_ext}"; pwd )"
|
|
br2_ext="$( cd "${br2_ext}"; pwd )"
|
|
|
|
+ br2_ver="$( support/scripts/setlocalversion "${br2_ext}" )"
|
|
BR2_EXT_NAMES+=( "${br2_name}" )
|
|
BR2_EXT_NAMES+=( "${br2_name}" )
|
|
eval BR2_EXT_PATHS_${br2_name}="\"\${br2_ext}\""
|
|
eval BR2_EXT_PATHS_${br2_name}="\"\${br2_ext}\""
|
|
|
|
+ eval BR2_EXT_VERS_${br2_name}="\"\${br2_ver}\""
|
|
eval BR2_EXT_DESCS_${br2_name}="\"\${br2_desc:-\${br2_name}}\""
|
|
eval BR2_EXT_DESCS_${br2_name}="\"\${br2_desc:-\${br2_name}}\""
|
|
}
|
|
}
|
|
|
|
|
|
@@ -113,7 +115,7 @@ do_validate_one() {
|
|
# for the br2-external tree
|
|
# for the br2-external tree
|
|
do_mk() {
|
|
do_mk() {
|
|
local outputdir="${1}"
|
|
local outputdir="${1}"
|
|
- local br2_name br2_desc br2_ext
|
|
|
|
|
|
+ local br2_name br2_desc br2_ext br2_ver
|
|
|
|
|
|
{
|
|
{
|
|
printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n'
|
|
printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n'
|
|
@@ -139,12 +141,14 @@ do_mk() {
|
|
for br2_name in "${BR2_EXT_NAMES[@]}"; do
|
|
for br2_name in "${BR2_EXT_NAMES[@]}"; do
|
|
eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\""
|
|
eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\""
|
|
eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\""
|
|
eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\""
|
|
|
|
+ eval br2_ver="\"\${BR2_EXT_VERS_${br2_name}}\""
|
|
printf '\n'
|
|
printf '\n'
|
|
printf 'BR2_EXTERNAL_NAMES += %s\n' "${br2_name}"
|
|
printf 'BR2_EXTERNAL_NAMES += %s\n' "${br2_name}"
|
|
printf 'BR2_EXTERNAL_DIRS += %s\n' "${br2_ext}"
|
|
printf 'BR2_EXTERNAL_DIRS += %s\n' "${br2_ext}"
|
|
printf 'BR2_EXTERNAL_MKS += %s/external.mk\n' "${br2_ext}"
|
|
printf 'BR2_EXTERNAL_MKS += %s/external.mk\n' "${br2_ext}"
|
|
printf 'export BR2_EXTERNAL_%s_PATH = %s\n' "${br2_name}" "${br2_ext}"
|
|
printf 'export BR2_EXTERNAL_%s_PATH = %s\n' "${br2_name}" "${br2_ext}"
|
|
printf 'export BR2_EXTERNAL_%s_DESC = %s\n' "${br2_name}" "${br2_desc}"
|
|
printf 'export BR2_EXTERNAL_%s_DESC = %s\n' "${br2_name}" "${br2_desc}"
|
|
|
|
+ printf 'export BR2_EXTERNAL_%s_VERSION = %s\n' "${br2_name}" "${br2_ver}"
|
|
done
|
|
done
|
|
} >"${outputdir}/.br2-external.mk"
|
|
} >"${outputdir}/.br2-external.mk"
|
|
}
|
|
}
|
|
@@ -152,7 +156,7 @@ do_mk() {
|
|
# Generate the kconfig snippets for the br2-external tree.
|
|
# Generate the kconfig snippets for the br2-external tree.
|
|
do_kconfig() {
|
|
do_kconfig() {
|
|
local outputdir="${1}"
|
|
local outputdir="${1}"
|
|
- local br2_name br2_desc br2_ext br2
|
|
|
|
|
|
+ local br2_name br2_desc br2_ext br2_ver br2
|
|
local -a items
|
|
local -a items
|
|
|
|
|
|
items=(
|
|
items=(
|
|
@@ -192,11 +196,15 @@ do_kconfig() {
|
|
for br2_name in "${BR2_EXT_NAMES[@]}"; do
|
|
for br2_name in "${BR2_EXT_NAMES[@]}"; do
|
|
eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\""
|
|
eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\""
|
|
eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\""
|
|
eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\""
|
|
|
|
+ eval br2_ver="\"\${BR2_EXT_VERS_${br2_name}}\""
|
|
|
|
|
|
{
|
|
{
|
|
printf 'config BR2_EXTERNAL_%s_PATH\n' "${br2_name}"
|
|
printf 'config BR2_EXTERNAL_%s_PATH\n' "${br2_name}"
|
|
printf '\tstring\n'
|
|
printf '\tstring\n'
|
|
printf '\tdefault "%s"\n' "${br2_ext}"
|
|
printf '\tdefault "%s"\n' "${br2_ext}"
|
|
|
|
+ printf 'config BR2_EXTERNAL_%s_VERSION\n' "${br2_name}"
|
|
|
|
+ printf '\tstring\n'
|
|
|
|
+ printf '\tdefault "%s"\n' "${br2_ver}"
|
|
printf '\n'
|
|
printf '\n'
|
|
} >>"${outputdir}/.br2-external.in.paths"
|
|
} >>"${outputdir}/.br2-external.in.paths"
|
|
|
|
|