Skip to content

framework extensions deep magic - add extension_optout for boards/families #8897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −1
Open

framework extensions deep magic - add extension_optout for boards/families #8897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/sources/families/rockchip-rv1106.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ BOOTSOURCE="https://github.com/radxa/u-boot.git"
BOOTBRANCH="branch:next-dev-buildroot"
BOOTPATCHDIR="legacy/u-boot-rockchip-buildroot"
BOOTDIR="u-boot-rockchip"
declare -ga extension_optout=( armbian_kernel_config__enable_docker_support )

# Set defaults based on BOOT_SOC (overridable in board config)
if [[ "$BOOT_SOC" == "rv1103" ]]; then
Expand Down
17 changes: 16 additions & 1 deletion lib/functions/general/extensions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ function dump_extension_method_sources_body() {
# to avoid hard coding the list of hook-points (eg: user_config, image_tweaks_pre_customize, etc) we use
# a marker in the function names, namely "__" (two underscores) to determine the hook point.
function initialize_extension_manager() {
declare -ga extension_optout # do not init here!
# before starting, auto-add extensions specified (eg, on the command-line) via the ENABLE_EXTENSIONS or EXT env var. Do it only once.
[[ ${initialize_extension_manager_counter} -lt 1 ]] && [[ "${ENABLE_EXTENSIONS:-"${EXT}"}" != "" ]] && {
local auto_extension
Expand Down Expand Up @@ -232,7 +233,21 @@ function initialize_extension_manager() {
hook_point_functions=""
declare hook_point_function_sortname
for hook_point_function_sortname in ${hook_point_functions_sorted_by_sort_id}; do
hook_point_functions="${hook_point_functions} ${hook_point_functions_sortname_to_realname[${hook_point_function_sortname}]}"
realname="${hook_point_functions_sortname_to_realname[${hook_point_function_sortname}]}"
# If a board/family has defined the global extension_optout array,
# skip any hook implementations matching those names exactly.
# Format: extension_optout=( "hook_point__impl_name1" "hook_point__impl_name2" )
# Example: extension_optout=( "user_config__early_config" ) would skip that hook.
if [[ ${#extension_optout[@]} -ne 0 ]]; then
# most common case this array is empty/non-existent, so bail out soonest
for func in "${extension_optout[@]}"; do
if [[ "$func" == "${hook_point}__${realname}" ]]; then
continue 2
fi
done
fi

hook_point_functions="${hook_point_functions} ${realname}"
done
# shellcheck disable=SC2086
hook_point_functions="$(echo -n ${hook_point_functions})"
Expand Down