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.15 kernel #3905

Merged
merged 2 commits into from
Apr 22, 2024
Merged

remove variant sensitivity from 5.15 kernel #3905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a61c7a
vmware-k8s, metal-k8s: switch to 6.1 kernel
bcressey Apr 22, 2024
9ae7f1a
kernel-5.15: remove variant sensitivity
bcressey Apr 22, 2024
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.15/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.15"

[lib]
Expand Down
18 changes: 18 additions & 0 deletions packages/kernel-5.15/config-bottlerocket
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,21 @@ CONFIG_ISCSI_TARGET=m

# Disable edac driver for intel 10nm memory controllers
# CONFIG_EDAC_I10NM 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
# CONFIG_MLX5_FPGA is not set
# CONFIG_MLX5_IPSEC is not set
# CONFIG_MLX5_CORE_IPOIB is not set
# CONFIG_MLX5_SF is not set
17 changes: 0 additions & 17 deletions packages/kernel-5.15/config-bottlerocket-aws
View file
Open in desktop

This file was deleted.

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

This file was deleted.

16 changes: 0 additions & 16 deletions packages/kernel-5.15/config-bottlerocket-vmware
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions packages/kernel-5.15/kernel-5.15.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/29a1d43caffcebd032ece82a974ba5db68b1354f508a35f6df62d8e1f6106ee8/kernel-5.15.152-100.162.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 @@ -98,8 +95,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
8 changes: 4 additions & 4 deletions variants/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions variants/metal-k8s-1.26/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ included-packages = [
"aws-iam-authenticator",
"cni",
"cni-plugins",
"kernel-5.15",
"kernel-6.1",
"linux-firmware",
"kubelet-1.26",
"release",
Expand All @@ -41,7 +41,7 @@ path = "../variants.rs"
aws-iam-authenticator = { path = "../../packages/aws-iam-authenticator" }
cni = { path = "../../packages/cni" }
cni-plugins = { path = "../../packages/cni-plugins" }
kernel-5_15 = { path = "../../packages/kernel-5.15" }
kernel-6_1 = { path = "../../packages/kernel-6.1" }
linux-firmware = { path = "../../packages/linux-firmware" }
kubernetes-1_26 = { path = "../../packages/kubernetes-1.26" }
release = { path = "../../packages/release" }
4 changes: 2 additions & 2 deletions variants/metal-k8s-1.27/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ included-packages = [
"aws-iam-authenticator",
"cni",
"cni-plugins",
"kernel-5.15",
"kernel-6.1",
"linux-firmware",
"kubelet-1.27",
"release",
Expand All @@ -41,7 +41,7 @@ path = "../variants.rs"
aws-iam-authenticator = { path = "../../packages/aws-iam-authenticator" }
cni = { path = "../../packages/cni" }
cni-plugins = { path = "../../packages/cni-plugins" }
kernel-5_15 = { path = "../../packages/kernel-5.15" }
kernel-6_1 = { path = "../../packages/kernel-6.1" }
linux-firmware = { path = "../../packages/linux-firmware" }
kubernetes-1_27 = { path = "../../packages/kubernetes-1.27" }
release = { path = "../../packages/release" }
4 changes: 2 additions & 2 deletions variants/vmware-k8s-1.26/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ kernel-parameters = [
included-packages = [
"cni",
"cni-plugins",
"kernel-5.15",
"kernel-6.1",
"kubelet-1.26",
"open-vm-tools",
"release",
Expand All @@ -42,7 +42,7 @@ path = "../variants.rs"
[build-dependencies]
cni = { path = "../../packages/cni" }
cni-plugins = { path = "../../packages/cni-plugins" }
kernel-5_15 = { path = "../../packages/kernel-5.15" }
kernel-6_1 = { path = "../../packages/kernel-6.1" }
kubernetes-1_26 = { path = "../../packages/kubernetes-1.26" }
open-vm-tools = { path = "../../packages/open-vm-tools" }
release = { path = "../../packages/release" }
4 changes: 2 additions & 2 deletions variants/vmware-k8s-1.27/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ kernel-parameters = [
included-packages = [
"cni",
"cni-plugins",
"kernel-5.15",
"kernel-6.1",
"kubelet-1.27",
"open-vm-tools",
"release",
Expand All @@ -42,7 +42,7 @@ path = "../variants.rs"
[build-dependencies]
cni = { path = "../../packages/cni" }
cni-plugins = { path = "../../packages/cni-plugins" }
kernel-5_15 = { path = "../../packages/kernel-5.15" }
kernel-6_1 = { path = "../../packages/kernel-6.1" }
kubernetes-1_27 = { path = "../../packages/kubernetes-1.27" }
open-vm-tools = { path = "../../packages/open-vm-tools" }
release = { path = "../../packages/release" }