github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-11-04 03:29:55 +00:00
Code Issues Projects Releases Wiki Activity

package: assign proper value to redefined_string

Browse Source 
Fixes: #2624

Signed-off-by: zhanghj <zhanghj.lc@inspur.com>
This commit is contained in:
zhanghj
2021-09-14 14:38:36 +08:00
parent 967db0cbcc
commit d789b42937
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/packaging/kernel/build-kernel.sh
View File

@@ -188,8 +188,8 @@ get_kernel_frag_path() {
# when it reports an error or warning condition. We search for them in the # when it reports an error or warning condition. We search for them in the
# output to try and fail when we think something has been misconfigured. # output to try and fail when we think something has been misconfigured.
local not_in_string="not in final" local not_in_string="not in final"
local redefined_string="not in final" local redefined_string="redefined"
local redundant_string="not in final" local redundant_string="redundant"
# Later, if we need to add kernel version specific subdirs in order to # Later, if we need to add kernel version specific subdirs in order to
# handle specific cases, then add the path definition and search/list/cat # handle specific cases, then add the path definition and search/list/cat
@@ -247,7 +247,7 @@ get_kernel_frag_path() {
# might be convenient to allow it, but for now, let's pick up on them. # might be convenient to allow it, but for now, let's pick up on them.
local redundant=$(echo ${results} | grep -v -q "${redundant_string}"; echo $?) local redundant=$(echo ${results} | grep -v -q "${redundant_string}"; echo $?)
if [ ${redundant} -ne 0 ]; then if [ ${redundant} -ne 0 ]; then
info "Some CONFIG elements failed to make the final .config" info "Some CONFIG elements are redundant in fragments:"
info "${results}" info "${results}"
info "Generated config file can be found in ${config_path}" info "Generated config file can be found in ${config_path}"
die "Failed to construct requested .config file" die "Failed to construct requested .config file"