Skip to content
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

Jump to bottom

remove variant sensitivity from 5.10 kernel #3897

Merged
merged 1 commit into from
Apr 22, 2024
Merged

remove variant sensitivity from 5.10 kernel #3897

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: 0 additions & 1 deletion packages/kernel-5.10/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ publish = false
build = "../build.rs"

[package.metadata.build-package]
variant-sensitive = "platform"
package-name = "kernel-5.10"

[lib]
Expand Down
13 changes: 13 additions & 0 deletions packages/kernel-5.10/config-bottlerocket
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,3 +177,16 @@ CONFIG_SCSI_SMARTPQI=m
# Disable AL port of BBR2 congestion algorithm
# CONFIG_TCP_CONG_BBR2 is not set

# Support boot from IDE disks
CONFIG_ATA=y
CONFIG_ATA_PIIX=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y

# Mellanox network support
CONFIG_NET_SWITCHDEV=y
CONFIG_NET_VENDOR_MELLANOX=y
CONFIG_MLX5_CORE=m
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLXFW=m
13 changes: 0 additions & 13 deletions packages/kernel-5.10/config-bottlerocket-aws
View file
Open in desktop

This file was deleted.

115 changes: 0 additions & 115 deletions packages/kernel-5.10/config-bottlerocket-metal
View file
Open in desktop

This file was deleted.

Empty file removed packages/kernel-5.10/config-bottlerocket-vmware
View file
Open in desktop
Empty file.
6 changes: 1 addition & 5 deletions packages/kernel-5.10/kernel-5.10.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ URL: https://www.kernel.org/
# Use latest-srpm-url.sh to get this.
Source0: https://cdn.amazonlinux.com/blobstore/f2f4a85aff9b0efec71d75bc29454ce8ab73974486a2a8ba541343cee1c7a622/kernel-5.10.213-201.855.amzn2.src.rpm
Source100: config-bottlerocket
Source101: config-bottlerocket-aws
Source102: config-bottlerocket-metal
Source103: config-bottlerocket-vmware

# Help out-of-tree module builds run `make prepare` automatically.
Patch1001: 1001-Makefile-add-prepare-target-for-external-modules.patch
Expand Down Expand Up @@ -103,8 +100,7 @@ scripts/kconfig/merge_config.sh \
%if "%{_cross_arch}" == "x86_64"
../config-microcode \
%endif
%{SOURCE100} \
%{_sourcedir}/config-bottlerocket-%{_cross_variant_platform}
%{SOURCE100}

rm -f ../config-* ../*.patch

Expand Down