From: Kerin Millar <[email protected]> Presently, the kernel-build_merge_configs() function captures a command that would restore the prior state of the nullglob shell option. Yet, it never subsequently bothers to evaluate that command. Instead, it ends up disabling the option, irrespective of its prior state.
Address this issue by evaluating the content of the 'shopt_save' variable after the 'user_configs' array variable has been assigned. Note that to use eval is wholly proper; those eclasses that do not, should. Fixes: d5b0c16d1d3fdf63d743b22e7192e88e04556b05 Signed-off-by: Kerin Millar <[email protected]> Signed-off-by: Sam James <[email protected]> --- Pushed. eclass/kernel-build.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index aa0f7b5894ead..a92151a0b8a63 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -713,7 +713,7 @@ kernel-build_merge_configs() { local shopt_save=$(shopt -p nullglob) shopt -s nullglob local user_configs=( "${BROOT}"/etc/kernel/config.d/*.config ) - shopt -u nullglob + eval "${shopt_save}" local merge_configs=( "${@}" ) base-commit: 4848fe62f40e97be0e0e86a5ac1ec46ffb21e3c9 -- 2.52.0
