diff --git a/packages/kernel-5.15/Cargo.toml b/packages/kernel-5.15/Cargo.toml index a4ef8ad38e5..bf0d1d9e17e 100644 --- a/packages/kernel-5.15/Cargo.toml +++ b/packages/kernel-5.15/Cargo.toml @@ -6,7 +6,6 @@ publish = false build = "../build.rs" [package.metadata.build-package] -variant-sensitive = "platform" package-name = "kernel-5.15" [lib] diff --git a/packages/kernel-5.15/config-bottlerocket b/packages/kernel-5.15/config-bottlerocket index 17c211587e6..1d36e8ee661 100644 --- a/packages/kernel-5.15/config-bottlerocket +++ b/packages/kernel-5.15/config-bottlerocket @@ -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 diff --git a/packages/kernel-5.15/config-bottlerocket-aws b/packages/kernel-5.15/config-bottlerocket-aws deleted file mode 100644 index 1bfa27e14be..00000000000 --- a/packages/kernel-5.15/config-bottlerocket-aws +++ /dev/null @@ -1,17 +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 -# 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 diff --git a/packages/kernel-5.15/config-bottlerocket-metal b/packages/kernel-5.15/config-bottlerocket-metal deleted file mode 100644 index 6e38510c080..00000000000 --- a/packages/kernel-5.15/config-bottlerocket-metal +++ /dev/null @@ -1,152 +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_LANCER=y -CONFIG_BE2NET_SKYHAWK=y -CONFIG_BE2NET_HWMON=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_ICE=m -# CONFIG_INFINIBAND_IRDMA is not set -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 -# 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 - -# 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 - -# QLogic network support -CONFIG_NET_VENDOR_QLOGIC=y -CONFIG_QED=m -CONFIG_QED_SRIOV=y -CONFIG_QEDE=m -# CONFIG_INFINIBAND_QEDR is not set -# CONFIG_QEDF is not set -# CONFIG_QEDI is not set -# CONFIG_QLA3XXX is not set -CONFIG_QLCNIC=m -CONFIG_QLCNIC_SRIOV=y -# CONFIG_QLCNIC_DCB is not set -# CONFIG_QLCNIC_HWMON is not set -# CONFIG_NETXEN_NIC is not set - -# Cisco UCS HBA support -CONFIG_FCOE_FNIC=m -CONFIG_SCSI_SNIC=m - -# LSI Logic's SAS based RAID controllers -CONFIG_SCSI_MPT3SAS=y -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 - -# Load i8042 controller, keyboard, and mouse as modules, to avoid waiting for -# them before mounting the root device. -CONFIG_SERIO_I8042=m -CONFIG_KEYBOARD_ATKBD=m -CONFIG_MOUSE_PS2=m -# CONFIG_MOUSE_PS2_ALPS is not set -# CONFIG_MOUSE_PS2_BYD is not set -# CONFIG_MOUSE_PS2_LOGIPS2PP is not set -# CONFIG_MOUSE_PS2_SYNAPTICS is not set -# CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS is not set -# CONFIG_MOUSE_PS2_CYPRESS is not set -# CONFIG_MOUSE_PS2_TRACKPOINT is not set -# CONFIG_MOUSE_PS2_ELANTECH is not set -# CONFIG_MOUSE_PS2_SENTELIC is not set -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -# CONFIG_MOUSE_PS2_FOCALTECH is not set - -# 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.15/config-bottlerocket-vmware b/packages/kernel-5.15/config-bottlerocket-vmware deleted file mode 100644 index ec1cc1a5418..00000000000 --- a/packages/kernel-5.15/config-bottlerocket-vmware +++ /dev/null @@ -1,16 +0,0 @@ -# Load i8042 controller, keyboard, and mouse as modules, to avoid waiting for -# them before mounting the root device. -CONFIG_SERIO_I8042=m -CONFIG_KEYBOARD_ATKBD=m -CONFIG_MOUSE_PS2=m -# CONFIG_MOUSE_PS2_ALPS is not set -# CONFIG_MOUSE_PS2_BYD is not set -# CONFIG_MOUSE_PS2_LOGIPS2PP is not set -# CONFIG_MOUSE_PS2_SYNAPTICS is not set -# CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS is not set -# CONFIG_MOUSE_PS2_CYPRESS is not set -# CONFIG_MOUSE_PS2_TRACKPOINT is not set -# CONFIG_MOUSE_PS2_ELANTECH is not set -# CONFIG_MOUSE_PS2_SENTELIC is not set -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -# CONFIG_MOUSE_PS2_FOCALTECH is not set diff --git a/packages/kernel-5.15/kernel-5.15.spec b/packages/kernel-5.15/kernel-5.15.spec index 26dad62ea2b..0a9ca083fd0 100644 --- a/packages/kernel-5.15/kernel-5.15.spec +++ b/packages/kernel-5.15/kernel-5.15.spec @@ -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 @@ -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 diff --git a/variants/Cargo.lock b/variants/Cargo.lock index 2331fdcec78..3dafe73e3ef 100644 --- a/variants/Cargo.lock +++ b/variants/Cargo.lock @@ -1004,7 +1004,7 @@ dependencies = [ "aws-iam-authenticator", "cni", "cni-plugins", - "kernel-5_15", + "kernel-6_1", "kubernetes-1_26", "linux-firmware", "release", @@ -1017,7 +1017,7 @@ dependencies = [ "aws-iam-authenticator", "cni", "cni-plugins", - "kernel-5_15", + "kernel-6_1", "kubernetes-1_27", "linux-firmware", "release", @@ -1243,7 +1243,7 @@ version = "0.1.0" dependencies = [ "cni", "cni-plugins", - "kernel-5_15", + "kernel-6_1", "kubernetes-1_26", "open-vm-tools", "release", @@ -1255,7 +1255,7 @@ version = "0.1.0" dependencies = [ "cni", "cni-plugins", - "kernel-5_15", + "kernel-6_1", "kubernetes-1_27", "open-vm-tools", "release", diff --git a/variants/metal-k8s-1.26/Cargo.toml b/variants/metal-k8s-1.26/Cargo.toml index 7bb5402a953..bd0dbe73062 100644 --- a/variants/metal-k8s-1.26/Cargo.toml +++ b/variants/metal-k8s-1.26/Cargo.toml @@ -28,7 +28,7 @@ included-packages = [ "aws-iam-authenticator", "cni", "cni-plugins", - "kernel-5.15", + "kernel-6.1", "linux-firmware", "kubelet-1.26", "release", @@ -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" } diff --git a/variants/metal-k8s-1.27/Cargo.toml b/variants/metal-k8s-1.27/Cargo.toml index aadc1fe333a..8dc5db6c317 100644 --- a/variants/metal-k8s-1.27/Cargo.toml +++ b/variants/metal-k8s-1.27/Cargo.toml @@ -28,7 +28,7 @@ included-packages = [ "aws-iam-authenticator", "cni", "cni-plugins", - "kernel-5.15", + "kernel-6.1", "linux-firmware", "kubelet-1.27", "release", @@ -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" } diff --git a/variants/vmware-k8s-1.26/Cargo.toml b/variants/vmware-k8s-1.26/Cargo.toml index 0ba194b0f33..12e825e93c4 100644 --- a/variants/vmware-k8s-1.26/Cargo.toml +++ b/variants/vmware-k8s-1.26/Cargo.toml @@ -30,7 +30,7 @@ kernel-parameters = [ included-packages = [ "cni", "cni-plugins", - "kernel-5.15", + "kernel-6.1", "kubelet-1.26", "open-vm-tools", "release", @@ -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" } diff --git a/variants/vmware-k8s-1.27/Cargo.toml b/variants/vmware-k8s-1.27/Cargo.toml index 422ec9ddbdf..df957f6dade 100644 --- a/variants/vmware-k8s-1.27/Cargo.toml +++ b/variants/vmware-k8s-1.27/Cargo.toml @@ -30,7 +30,7 @@ kernel-parameters = [ included-packages = [ "cni", "cni-plugins", - "kernel-5.15", + "kernel-6.1", "kubelet-1.27", "open-vm-tools", "release", @@ -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" }