diff --git a/pkg_auto/impl/inside_sdk_container_lib.sh b/pkg_auto/impl/inside_sdk_container_lib.sh index 71400f7e89..c10c43400e 100644 --- a/pkg_auto/impl/inside_sdk_container_lib.sh +++ b/pkg_auto/impl/inside_sdk_container_lib.sh @@ -403,7 +403,7 @@ function packages_for_board() { sed "${@}" "${!name}" | sort -u } -# Prints package name, slot and version information for SDK. +# Prints package name, version and slot information for SDK. function versions_sdk() { local -a sed_opts sed_opts=( @@ -412,7 +412,7 @@ function versions_sdk() { packages_for_sdk "${sed_opts[@]}" } -# Prints package name, slot, version and key-values information for +# Prints package name, version, slot and key-values information for # SDK. Key-values may be something like USE="foo bar -baz". function versions_sdk_with_key_values() { local -a sed_opts @@ -422,7 +422,7 @@ function versions_sdk_with_key_values() { packages_for_sdk "${sed_opts[@]}" } -# Prints package name, slot and version information for board. +# Prints package name, version and slot information for board. function versions_board() { local arch=${1}; shift local -a sed_opts @@ -433,6 +433,18 @@ function versions_board() { packages_for_board "${arch}" "${sed_opts[@]}" } +# Prints package name, version, slot and key-values information for +# board. Key-values may be something like USE="foo bar -baz". +function versions_board_with_key_values() { + local arch=${1}; shift + local -a sed_opts + sed_opts=( + "${BOARD_ONLY_PKGS[@]}" + "${PKG_VER_SLOT_KV_SED_FILTERS[@]}" + ) + packages_for_board "${arch}" "${sed_opts[@]}" +} + # Prints package name, slot, version and key-values information for # build dependencies of board. Key-values may be something like # USE="foo bar -baz". diff --git a/pkg_auto/inside_sdk_container.sh b/pkg_auto/inside_sdk_container.sh index 1d53b9661b..355724debe 100755 --- a/pkg_auto/inside_sdk_container.sh +++ b/pkg_auto/inside_sdk_container.sh @@ -9,8 +9,9 @@ ## Reports generated: ## sdk-pkgs - contains package information for SDK ## sdk-pkgs-kv - contains package information with key values (USE, PYTHON_TARGETS, CPU_FLAGS_X86) for SDK -## ${arch}-board-pkgs - contains package information for board for chosen architecture -## ${arch}-board-bdeps - contains package information with key values (USE, PYTHON_TARGETS, CPU_FLAGS_X86) of board build dependencies +## ${arch}-board-pkgs - contains package information of a board with chosen architecture +## ${arch}-board-pkgs-kv - contains package information with key values (USE, PYTHON_TARGETS, CPU_FLAGS_X86) of a board with chosen architecture +## ${arch}-board-bdeps - contains package information with key values (USE, PYTHON_TARGETS, CPU_FLAGS_X86, etc) of a board (with chosen architecture) build dependencies ## sdk-profiles - contains a list of profiles used by the SDK, in evaluation order ## ${arch}-board-profiles - contains a list of profiles used by the board for the chosen architecture, in evaluation order ## sdk-package-repos - contains package information with their repos for SDK @@ -113,6 +114,8 @@ package_sources_sdk >"${reports_dir}/sdk-package-repos" 2>"${reports_dir}/sdk-pa for arch; do echo "Generating ${arch} board packages listing" versions_board "${arch}" >"${reports_dir}/${arch}-board-pkgs" 2>"${reports_dir}/${arch}-board-pkgs-warnings" + echo "Generating ${arch} board packages listing with key-values (USE, PYTHON_TARGETS CPU_FLAGS_X86, etc)" + versions_board_with_key_values "${arch}" >"${reports_dir}/${arch}-board-pkgs-kv" 2>"${reports_dir}/${arch}-board-pkgs-kv-warnings" echo "Generating ${arch} board packages bdeps listing" board_bdeps "${arch}" >"${reports_dir}/${arch}-board-bdeps" 2>"${reports_dir}/${arch}-board-bdeps-warnings" echo "Generating ${arch} board profiles evaluation list"