diff --git a/packages/kernel-6.12/1002-Revert-kbuild-hide-tools-build-targets-from-external.patch b/packages/kernel-6.12/1002-Revert-kbuild-hide-tools-build-targets-from-external.patch index 8aa4378d..86d6c628 100644 --- a/packages/kernel-6.12/1002-Revert-kbuild-hide-tools-build-targets-from-external.patch +++ b/packages/kernel-6.12/1002-Revert-kbuild-hide-tools-build-targets-from-external.patch @@ -1,4 +1,4 @@ -From 05a7163507930b56804896818c80e92a2454ef4d Mon Sep 17 00:00:00 2001 +From cfede7055134b412d9c7a293b9064ca89a19f3d1 Mon Sep 17 00:00:00 2001 From: Arnaldo Garcia Rincon Date: Wed, 22 Jun 2022 19:26:43 +0000 Subject: [PATCH] Revert "kbuild: hide tools/ build targets from external @@ -10,44 +10,45 @@ they are required by the kmod kit since the 'tools/*' binaries are not distributed as part of the archive. Signed-off-by: Arnaldo Garcia Rincon +Signed-off-by: Gaurav Sharma --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile -index 340da92..27269cb 100644 +index 35d423fde..9ce64894e 100644 --- a/Makefile +++ b/Makefile -@@ -1357,14 +1357,6 @@ ifneq ($(wildcard $(resolve_btfids_O)),) +@@ -1370,14 +1370,6 @@ ifneq ($(wildcard $(resolve_btfids_O)),) $(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(resolve_btfids_O) clean endif - + -tools/: FORCE - $(Q)mkdir -p $(objtree)/tools -- $(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ +- $(Q)$(MAKE) O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ - -tools/%: FORCE - $(Q)mkdir -p $(objtree)/tools -- $(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $* +- $(Q)$(MAKE) O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $* - # --------------------------------------------------------------------------- # Kernel selftest - -@@ -2054,6 +2046,14 @@ kernelversion: + +@@ -2080,6 +2072,14 @@ kernelversion: image_name: @echo $(KBUILD_IMAGE) - + +tools/: FORCE + $(Q)mkdir -p $(objtree)/tools -+ $(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ ++ $(Q)$(MAKE) O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ + +tools/%: FORCE + $(Q)mkdir -p $(objtree)/tools -+ $(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $* ++ $(Q)$(MAKE) O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $* + PHONY += run-command run-command: $(Q)$(KBUILD_RUN_COMMAND) --- -2.47.1 +-- +2.50.1 diff --git a/packages/kernel-6.12/Cargo.toml b/packages/kernel-6.12/Cargo.toml index 74599f58..ff13a674 100644 --- a/packages/kernel-6.12/Cargo.toml +++ b/packages/kernel-6.12/Cargo.toml @@ -13,8 +13,8 @@ path = "../packages.rs" [[package.metadata.build-package.external-files]] # Use latest-kernel-srpm-url.sh to get this. -url = "https://cdn.amazonlinux.com/al2023/blobstore/1f9a0e4340695bd79eeda126295b4e9e75844ce4af246f88b514a084d7826f72/kernel6.12-6.12.55-74.119.amzn2023.src.rpm" -sha512 = "a7b7558da84e61427e2d372fc0a8ed096a11d6efa04b57a4920087a13098e2985c8533a99cb34c045c14ea2894698df9ee1056dab3b12229b76ae69ba0cd8343" +url = "https://cdn.amazonlinux.com/al2023/blobstore/3e9759eca702bf9a4902cd326d929e749b574aea10e392b8429284bb9723a2e8/kernel6.12-6.12.58-82.121.amzn2023.src.rpm" +sha512 = "c1938f2427b2e7050cb43780ccd2587650df310d3d8744fafe64adc5c115d57c893163227cf5fd481d82c441fc40eab2bf88fb42b5aa7eaaa3b5cea3c2be60eb" force-upstream = true [[package.metadata.build-package.external-files]] diff --git a/packages/kernel-6.12/config-full-bottlerocket-aarch64 b/packages/kernel-6.12/config-full-bottlerocket-aarch64 index bf437477..370a6327 100644 --- a/packages/kernel-6.12/config-full-bottlerocket-aarch64 +++ b/packages/kernel-6.12/config-full-bottlerocket-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.12.55 Kernel Configuration +# Linux/arm64 6.12.58 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2024.11.1) 13.3.0" CONFIG_CC_IS_GCC=y @@ -680,7 +680,7 @@ CONFIG_ACPI_NUMA=y CONFIG_HAVE_ACPI_APEI=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y -# CONFIG_ACPI_APEI_PCIEAER is not set +CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_SEA=y CONFIG_ACPI_APEI_MEMORY_FAILURE=y # CONFIG_ACPI_APEI_EINJ is not set @@ -2339,6 +2339,7 @@ CONFIG_NSM=m # CONFIG_MISC_RTSX_USB is not set # CONFIG_UACCE is not set # CONFIG_PVPANIC is not set +# CONFIG_GP_PCI1XXXX is not set # CONFIG_KEBA_CP500 is not set # end of Misc devices @@ -2579,6 +2580,8 @@ CONFIG_NET_VENDOR_HISILICON=y # CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_I825XX is not set CONFIG_NET_VENDOR_INTEL=y +CONFIG_LIBETH=m +CONFIG_LIBIE=m # CONFIG_E100 is not set CONFIG_E1000=m CONFIG_E1000E=m @@ -2591,7 +2594,8 @@ CONFIG_IXGBE_HWMON=y CONFIG_IXGBE_IPSEC=y CONFIG_IXGBEVF=m CONFIG_IXGBEVF_IPSEC=y -# CONFIG_I40E is not set +CONFIG_I40E=m +# CONFIG_I40E_DCB is not set # CONFIG_I40EVF is not set # CONFIG_ICE is not set # CONFIG_FM10K is not set @@ -5104,8 +5108,22 @@ CONFIG_RAS=y # CONFIG_LIBNVDIMM is not set CONFIG_DAX=y -# CONFIG_DEV_DAX is not set -# CONFIG_NVMEM is not set +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_KMEM=m +CONFIG_NVMEM=y +CONFIG_NVMEM_SYSFS=y +CONFIG_NVMEM_LAYOUTS=y + +# +# Layout Types +# +# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set +# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set +# CONFIG_NVMEM_LAYOUT_U_BOOT_ENV is not set +# end of Layout Types + +# CONFIG_NVMEM_RMEM is not set +# CONFIG_NVMEM_U_BOOT_ENV is not set # # HW tracing support @@ -5130,7 +5148,7 @@ CONFIG_PM_OPP=y CONFIG_AMAZON_DRIVER_UPDATES=y CONFIG_AMAZON_ENA_ETHERNET=m CONFIG_AMAZON_EFA_INFINIBAND=m -# CONFIG_AMAZON_IGB_UIO is not set +CONFIG_AMAZON_IGB_UIO=m CONFIG_V4L2_LOOPBACK=m # end of Device Drivers @@ -5173,7 +5191,8 @@ CONFIG_XFS_POSIX_ACL=y # CONFIG_F2FS_FS is not set # CONFIG_BCACHEFS_FS is not set # CONFIG_ZONEFS_FS is not set -# CONFIG_FS_DAX is not set +CONFIG_FS_DAX=y +CONFIG_FS_DAX_PMD=y CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y # CONFIG_EXPORTFS_BLOCK_OPS is not set @@ -5198,6 +5217,7 @@ CONFIG_AUTOFS_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_VIRTIO_FS=m +CONFIG_FUSE_DAX=y CONFIG_FUSE_PASSTHROUGH=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set diff --git a/packages/kernel-6.12/config-full-bottlerocket-x86_64 b/packages/kernel-6.12/config-full-bottlerocket-x86_64 index ef49ebbc..386a1c12 100644 --- a/packages/kernel-6.12/config-full-bottlerocket-x86_64 +++ b/packages/kernel-6.12/config-full-bottlerocket-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.12.55 Kernel Configuration +# Linux/x86 6.12.58 Kernel Configuration # CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2024.11.1) 13.3.0" CONFIG_CC_IS_GCC=y @@ -625,7 +625,7 @@ CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_MEMORY=y CONFIG_ACPI_HOTPLUG_IOAPIC=y # CONFIG_ACPI_SBS is not set -# CONFIG_ACPI_HED is not set +CONFIG_ACPI_HED=y # CONFIG_ACPI_BGRT is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set # CONFIG_ACPI_NFIT is not set @@ -633,7 +633,12 @@ CONFIG_ACPI_NUMA=y # CONFIG_ACPI_HMAT is not set CONFIG_HAVE_ACPI_APEI=y CONFIG_HAVE_ACPI_APEI_NMI=y -# CONFIG_ACPI_APEI is not set +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y +# CONFIG_ACPI_APEI_EINJ is not set +# CONFIG_ACPI_APEI_ERST_DEBUG is not set # CONFIG_ACPI_DPTF is not set CONFIG_ACPI_EXTLOG=m CONFIG_ACPI_ADXL=y @@ -1901,13 +1906,16 @@ CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=y -# CONFIG_PCIEAER is not set +CONFIG_PCIEAER=y +# CONFIG_PCIEAER_INJECT is not set +# CONFIG_PCIE_ECRC is not set CONFIG_PCIEASPM=y CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y +# CONFIG_PCIE_DPC is not set # CONFIG_PCIE_PTM is not set CONFIG_PCI_MSI=y CONFIG_PCI_QUIRKS=y @@ -2456,6 +2464,8 @@ CONFIG_NET_VENDOR_GOOGLE=y # CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_I825XX is not set CONFIG_NET_VENDOR_INTEL=y +CONFIG_LIBETH=m +CONFIG_LIBIE=m # CONFIG_E100 is not set CONFIG_E1000=m CONFIG_E1000E=m @@ -2471,7 +2481,8 @@ CONFIG_IXGBE_DCA=y CONFIG_IXGBE_IPSEC=y CONFIG_IXGBEVF=m CONFIG_IXGBEVF_IPSEC=y -# CONFIG_I40E is not set +CONFIG_I40E=m +# CONFIG_I40E_DCB is not set # CONFIG_I40EVF is not set # CONFIG_ICE is not set # CONFIG_FM10K is not set @@ -2896,6 +2907,7 @@ CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_CHARDEV is not set # CONFIG_I2C_MUX is not set CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m # @@ -2911,10 +2923,10 @@ CONFIG_I2C_ALGOBIT=m # CONFIG_I2C_AMD756 is not set # CONFIG_I2C_AMD8111 is not set # CONFIG_I2C_AMD_MP2 is not set -# CONFIG_I2C_I801 is not set +CONFIG_I2C_I801=m # CONFIG_I2C_ISCH is not set # CONFIG_I2C_ISMT is not set -# CONFIG_I2C_PIIX4 is not set +CONFIG_I2C_PIIX4=m # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_NVIDIA_GPU is not set # CONFIG_I2C_SIS5595 is not set @@ -4140,6 +4152,7 @@ CONFIG_EDAC=y # CONFIG_EDAC_LEGACY_SYSFS is not set # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DECODE_MCE=y +# CONFIG_EDAC_GHES is not set CONFIG_EDAC_AMD64=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I82975X=m @@ -4666,6 +4679,7 @@ CONFIG_RAS=y # CONFIG_RAS_CEC is not set CONFIG_AMD_ATL=m CONFIG_AMD_ATL_PRM=y +CONFIG_RAS_FMPM=m # CONFIG_USB4 is not set # @@ -4676,8 +4690,12 @@ CONFIG_AMD_ATL_PRM=y # CONFIG_LIBNVDIMM is not set CONFIG_DAX=y -# CONFIG_DEV_DAX is not set -# CONFIG_NVMEM is not set +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_KMEM=m +CONFIG_NVMEM=y +CONFIG_NVMEM_SYSFS=y +# CONFIG_NVMEM_LAYOUTS is not set +# CONFIG_NVMEM_RMEM is not set # # HW tracing support @@ -4698,7 +4716,7 @@ CONFIG_DAX=y CONFIG_AMAZON_DRIVER_UPDATES=y CONFIG_AMAZON_ENA_ETHERNET=m CONFIG_AMAZON_EFA_INFINIBAND=m -# CONFIG_AMAZON_IGB_UIO is not set +CONFIG_AMAZON_IGB_UIO=m CONFIG_V4L2_LOOPBACK=m # end of Device Drivers @@ -4741,7 +4759,8 @@ CONFIG_XFS_POSIX_ACL=y # CONFIG_F2FS_FS is not set # CONFIG_BCACHEFS_FS is not set # CONFIG_ZONEFS_FS is not set -# CONFIG_FS_DAX is not set +CONFIG_FS_DAX=y +CONFIG_FS_DAX_PMD=y CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y # CONFIG_EXPORTFS_BLOCK_OPS is not set @@ -4766,6 +4785,7 @@ CONFIG_AUTOFS_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_VIRTIO_FS=m +CONFIG_FUSE_DAX=y CONFIG_FUSE_PASSTHROUGH=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set @@ -5481,6 +5501,7 @@ CONFIG_DMA_COHERENT_POOL=y # CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=y CONFIG_IOMMU_HELPER=y +CONFIG_CHECK_SIGNATURE=y CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPU_RMAP=y CONFIG_DQL=y diff --git a/packages/kernel-6.12/kernel-6.12.spec b/packages/kernel-6.12/kernel-6.12.spec index 70d11fa2..8c2a3a06 100644 --- a/packages/kernel-6.12/kernel-6.12.spec +++ b/packages/kernel-6.12/kernel-6.12.spec @@ -4,13 +4,13 @@ %global kmajor 6.12 Name: %{_cross_os}kernel-%{kmajor} -Version: 6.12.55 +Version: 6.12.58 Release: 1%{?dist} Summary: The Linux kernel License: GPL-2.0 WITH Linux-syscall-note URL: https://www.kernel.org/ # Use latest-kernel-srpm-url.sh to get this. -Source0: https://cdn.amazonlinux.com/al2023/blobstore/1f9a0e4340695bd79eeda126295b4e9e75844ce4af246f88b514a084d7826f72/kernel6.12-6.12.55-74.119.amzn2023.src.rpm +Source0: https://cdn.amazonlinux.com/al2023/blobstore/1f9a0e4340695bd79eeda126295b4e9e75844ce4af246f88b514a084d7826f72/kernel6.12-6.12.58-82.121.amzn2023.src.rpm Source1: gpgkey-B21C50FA44A99720EAA72F7FE951904AD832C631.asc # Use latest-2.21-neuron-srpm-url.sh to get this. Source2: https://yum.repos.neuron.amazonaws.com/aws-neuronx-dkms-2.21.37.0.noarch.rpm @@ -631,6 +631,7 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf %endif %{_cross_kmoddir}/kernel/drivers/amazon/media/v4l2-loopback/v4l2loopback.%{_ko} %{_cross_kmoddir}/kernel/drivers/amazon/net/ena/ena.%{_ko} +%{_cross_kmoddir}/kernel/drivers/amazon/net/igb_uio/igb_uio.%{_ko} %{_cross_kmoddir}/kernel/drivers/block/brd.%{_ko} %{_cross_kmoddir}/kernel/drivers/block/drbd/drbd.%{_ko} %{_cross_kmoddir}/kernel/drivers/block/loop.%{_ko} @@ -663,6 +664,8 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf %{_cross_kmoddir}/kernel/drivers/cpufreq/cpufreq_ondemand.%{_ko} %{_cross_kmoddir}/kernel/drivers/cpufreq/cpufreq_powersave.%{_ko} %{_cross_kmoddir}/kernel/drivers/cpufreq/cpufreq_userspace.%{_ko} +%{_cross_kmoddir}/kernel/drivers/dax/device_dax.%{_ko} +%{_cross_kmoddir}/kernel/drivers/dax/kmem.%{_ko} %if "%{_cross_arch}" == "x86_64" %{_cross_kmoddir}/kernel/drivers/cpufreq/acpi-cpufreq.%{_ko} %{_cross_kmoddir}/kernel/drivers/cpufreq/pcc-cpufreq.%{_ko} @@ -717,6 +720,11 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf %{_cross_kmoddir}/kernel/drivers/hwmon/acpi_power_meter.%{_ko} %{_cross_kmoddir}/kernel/drivers/hwmon/hwmon.%{_ko} %{_cross_kmoddir}/kernel/drivers/i2c/algos/i2c-algo-bit.%{_ko} +%if "%{_cross_arch}" == "x86_64" +%{_cross_kmoddir}/kernel/drivers/i2c/busses/i2c-i801.%{_ko} +%{_cross_kmoddir}/kernel/drivers/i2c/busses/i2c-piix4.%{_ko} +%{_cross_kmoddir}/kernel/drivers/i2c/i2c-smbus.%{_ko} +%endif %if "%{_cross_arch}" == "aarch64" %{_cross_kmoddir}/kernel/drivers/i2c/busses/i2c-tegra-bpmp.%{_ko} %endif @@ -793,6 +801,7 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf %{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/e1000/e1000.%{_ko} %{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/e1000e/e1000e.%{_ko} +%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/i40e/i40e.%{_ko} %{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/igb/igb.%{_ko} %{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/igc/igc.%{_ko} %{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/ixgbevf/ixgbevf.%{_ko} @@ -804,6 +813,8 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf %{_cross_kmoddir}/kernel/drivers/net/hyperv/hv_netvsc.%{_ko} %endif %{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.%{_ko} +%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/libeth/libeth.%{_ko} +%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/libie/libie.%{_ko} %{_cross_kmoddir}/kernel/drivers/net/ifb.%{_ko} %{_cross_kmoddir}/kernel/drivers/net/ipvlan/ipvlan.%{_ko} %{_cross_kmoddir}/kernel/drivers/net/ipvlan/ipvtap.%{_ko} @@ -854,6 +865,7 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf %{_cross_kmoddir}/kernel/drivers/ptp/ptp_kvm.%{_ko} %if "%{_cross_arch}" == "x86_64" %{_cross_kmoddir}/kernel/drivers/ras/amd/atl/amd_atl.%{_ko} +%{_cross_kmoddir}/kernel/drivers/ras/amd/fmpm.%{_ko} %endif %{_cross_kmoddir}/kernel/drivers/scsi/raid_class.%{_ko} %{_cross_kmoddir}/kernel/drivers/scsi/scsi_common.%{_ko}