diff --git a/packages/kernel-5.10/Cargo.toml b/packages/kernel-5.10/Cargo.toml index a19773c62b0..700364ed2d4 100644 --- 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 index 48a9d61ae52..b7b4baa0510 100644 --- 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 deleted file mode 100644 index 6b4ed40452e..00000000000 --- a/packages/kernel-5.10/config-bottlerocket-aws +++ /dev/null @@ -1,13 +0,0 @@ -# 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-metal b/packages/kernel-5.10/config-bottlerocket-metal deleted file mode 100644 index f6a0a5a11ad..00000000000 --- a/packages/kernel-5.10/config-bottlerocket-metal +++ /dev/null @@ -1,115 +0,0 @@ -# This file holds all the settings that are specific to hardware enablement -# we do for the metal variants. - -# SATA support -CONFIG_BLK_DEV_SD=y -CONFIG_SATA_AHCI=y -CONFIG_ATA=y -CONFIG_ATA_PIIX=y - -# AMD network support -CONFIG_NET_VENDOR_AMD=y -CONFIG_AMD_XGBE=m -# CONFIG_AMD_XGBE_DCB is not set - -# Broadcom network support -CONFIG_NET_VENDOR_BROADCOM=y -CONFIG_TIGON3_HWMON=y -CONFIG_TIGON3=m -CONFIG_BNX2X=m -CONFIG_BNX2X_SRIOV=y -CONFIG_BNXT=m - -# Chelsio network support -CONFIG_NET_VENDOR_CHELSIO=y -CONFIG_CHELSIO_T4=m -CONFIG_CHELSIO_T4VF=m -# CONFIG_CHELSIO_T4_DCB is not set -# CONFIG_CHELSIO_INLINE_CRYPTO is not set -# CONFIG_INFINIBAND_CXGB4 is not set -# CONFIG_ISCSI_TARGET_CXGB4 is not set - -# Cisco UCS network support -CONFIG_NET_VENDOR_CISCO=y -CONFIG_ENIC=m -CONFIG_INFINIBAND_USNIC=m - -# Emulex network support -CONFIG_NET_VENDOR_EMULEX=y -CONFIG_BE2NET=m -CONFIG_BE2NET_BE2=y -CONFIG_BE2NET_BE3=y -CONFIG_BE2NET_HWMON=y -CONFIG_BE2NET_LANCER=y -CONFIG_BE2NET_SKYHAWK=y - -# Huawei network support -CONFIG_NET_VENDOR_HUAWEI=y -CONFIG_HINIC=m - -# Intel network support -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000=m -CONFIG_E1000E=m -CONFIG_E1000E_HWTS=y -CONFIG_IGB=m -CONFIG_IGB_HWMON=y -CONFIG_IGBVF=m - -# Intel 10G network support -CONFIG_I40E=m -# CONFIG_I40E_DCB is not set -# CONFIG_INFINIBAND_I40IW is not set -CONFIG_ICE=m -CONFIG_PLDMFW=y -CONFIG_IXGB=m -CONFIG_IXGBE=m -CONFIG_IXGBE_HWMON=y -CONFIG_IXGBE_DCB=y -CONFIG_IXGBEVF=m -CONFIG_FM10K=m - -# Mellanox network support -CONFIG_MLXFW=m -CONFIG_MLX5_CORE=m -CONFIG_MLX5_INFINIBAND=m -CONFIG_NET_VENDOR_MELLANOX=y -CONFIG_MLX5_CORE_EN=y -CONFIG_NET_SWITCHDEV=y - -# Myricom network support -CONFIG_NET_VENDOR_MYRI=y -CONFIG_MYRI10GE=m -CONFIG_MYRI10GE_DCA=y - -# Pensando network support -CONFIG_NET_VENDOR_PENSANDO=y -CONFIG_IONIC=m - -# Solarflare network support -CONFIG_NET_VENDOR_SOLARFLARE=y -CONFIG_SFC=m -CONFIG_SFC_SRIOV=y -# CONFIG_SFC_MCDI_LOGGING is not set -CONFIG_SFC_MCDI_MON=y -CONFIG_SFC_FALCON=m - -# Cisco UCS HBA support -CONFIG_FCOE_FNIC=m -CONFIG_SCSI_SNIC=m - -# LSI Logic's SAS based RAID controllers -CONFIG_MEGARAID_SAS=y - -# Microsemi PQI controllers -CONFIG_SCSI_SMARTPQI=y - -# Support for virtio scsi boot devices for other cloud providers -CONFIG_SCSI_VIRTIO=y - -# Intel Volume Management Device driver, to support boot disks in a separate -# PCI domain. -CONFIG_VMD=y - -# Support handling of compressed firmware -CONFIG_FW_LOADER_COMPRESS=y diff --git a/packages/kernel-5.10/config-bottlerocket-vmware b/packages/kernel-5.10/config-bottlerocket-vmware deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/packages/kernel-5.10/kernel-5.10.spec b/packages/kernel-5.10/kernel-5.10.spec index d616a5997cd..ec405edb438 100644 --- 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