diff --git a/tools/packaging/kernel/build-kernel.sh b/tools/packaging/kernel/build-kernel.sh index 8cb694d94a..b82cc393a7 100755 --- a/tools/packaging/kernel/build-kernel.sh +++ b/tools/packaging/kernel/build-kernel.sh @@ -44,8 +44,6 @@ build_type="" force_setup_generate_config="false" #GPU kernel support gpu_vendor="" -#DPU kernel support -dpu_vendor="" #Confidential guest type conf_guest="" # @@ -101,7 +99,6 @@ Options: -a : Arch target to build the kernel, such as aarch64/ppc64le/riscv64/s390x/x86_64. -b : Enable optional config type. -c : Path to config file to build the kernel. - -D : DPU/SmartNIC vendor, only nvidia. -d : Enable bash debug. -e : Enable experimental kernel. -E : Enable arch-specific experimental kernel, arch info offered by "-a". @@ -239,7 +236,6 @@ get_kernel_frag_path() { local arch_path="$1" local common_path="${arch_path}/../common" local gpu_path="${arch_path}/../gpu" - local dpu_path="${arch_path}/../dpu" local kernel_path="$2" local arch="$3" @@ -300,12 +296,6 @@ get_kernel_frag_path() { all_configs="${all_configs} ${gpu_configs}" fi - if [[ "${dpu_vendor}" != "" ]]; then - info "Add kernel config for DPU/SmartNIC due to '-n ${dpu_vendor}'" - local dpu_configs="${dpu_path}/${dpu_vendor}.conf" - all_configs="${all_configs} ${dpu_configs}" - fi - if [[ "${measured_rootfs}" == "true" ]]; then info "Enabling config for confidential guest trust storage protection" local cryptsetup_configs @@ -649,7 +639,7 @@ install_kata() { } main() { - while getopts "a:b:c:dD:eEfg:hH:k:mp:r:st:u:v:x" opt; do + while getopts "a:b:c:deEfg:hH:k:mp:r:st:u:v:x" opt; do case "${opt}" in a) arch_target="${OPTARG}" @@ -664,10 +654,6 @@ main() { PS4=' Line ${LINENO}: ' set -x ;; - D) - dpu_vendor="${OPTARG}" - [[ "${dpu_vendor}" == "${VENDOR_NVIDIA}" ]] || die "DPU vendor only support nvidia" - ;; e) build_type="experimental" ;; diff --git a/tools/packaging/kernel/configs/fragments/dpu/nvidia.conf b/tools/packaging/kernel/configs/fragments/common/mlx5.conf similarity index 100% rename from tools/packaging/kernel/configs/fragments/dpu/nvidia.conf rename to tools/packaging/kernel/configs/fragments/common/mlx5.conf diff --git a/tools/packaging/kernel/kata_config_version b/tools/packaging/kernel/kata_config_version index 598ed30e89..88b2e78342 100644 --- a/tools/packaging/kernel/kata_config_version +++ b/tools/packaging/kernel/kata_config_version @@ -1 +1 @@ -190 +191