kernel-5.10: remove variant sensitivity

Now that the only in-tree users of the 5.10 kernel are aws variants, merge the aws-specific config into the main config and remove the variant sensitive marker from the package. Signed-off-by: Ben Cressey <[email protected]>
bcressey · Apr 12, 2024 · 63ccf40 · 63ccf40
1 parent ed0f6aa
commit 63ccf40
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 134 deletions.
diff --git a/packages/kernel-5.10/Cargo.toml b/packages/kernel-5.10/Cargo.toml
@@ -6,7 +6,6 @@ publish = false
 build = "../build.rs"
 
 [package.metadata.build-package]
-variant-sensitive = "platform"
 package-name = "kernel-5.10"
 
 [lib]

diff --git a/packages/kernel-5.10/config-bottlerocket b/packages/kernel-5.10/config-bottlerocket
@@ -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
diff --git a/packages/kernel-5.10/config-bottlerocket-aws b/packages/kernel-5.10/config-bottlerocket-aws
diff --git a/packages/kernel-5.10/config-bottlerocket-metal b/packages/kernel-5.10/config-bottlerocket-metal
diff --git a/packages/kernel-5.10/config-bottlerocket-vmware b/packages/kernel-5.10/config-bottlerocket-vmware
diff --git a/packages/kernel-5.10/kernel-5.10.spec b/packages/kernel-5.10/kernel-5.10.spec
@@ -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
@@ -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