diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index 478fd8df5ac..556aaaafa03 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -10,7 +10,7 @@ Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} Version: 6.6.57.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2 %exclude /module_info.ld %changelog +* Wed Nov 06 2024 Suresh Babu Chalamalasetty - 6.6.57.1-4 +- Bump release to match kernel + * Tue Nov 05 2024 Chris Co - 6.6.57.1-3 - Bump release to match kernel diff --git a/SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec b/SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec index d61a7498a41..f252fffd5f4 100644 --- a/SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec +++ b/SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec @@ -6,7 +6,7 @@ Summary: Signed Unified Kernel Image for %{buildarch} systems Name: kernel-uki-signed-%{buildarch} Version: 6.6.57.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -68,6 +68,9 @@ popd /boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi %changelog +* Wed Nov 06 2024 Suresh Babu Chalamalasetty - 6.6.57.1-4 +- Bump release to match kernel + * Tue Nov 05 2024 Chris Co - 6.6.57.1-3 - Bump release to match kernel diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index 49887b2d0c9..1c6b1622f60 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -14,7 +14,7 @@ Summary: Linux API header files Name: kernel-headers Version: 6.6.57.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -75,6 +75,9 @@ done %endif %changelog +* Wed Nov 06 2024 Suresh Babu Chalamalasetty - 6.6.57.1-4 +- Bump release to match kernel + * Tue Nov 05 2024 Chris Co - 6.6.57.1-3 - Bump release to match kernel diff --git a/SPECS/kernel/config b/SPECS/kernel/config index 47e02319e2e..2cf8c466bd5 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/config @@ -4751,10 +4751,9 @@ CONFIG_AGP_INTEL=m # CONFIG_AGP_VIA is not set CONFIG_INTEL_GTT=m # CONFIG_VGA_SWITCHEROO is not set -CONFIG_DRM=y +CONFIG_DRM=m CONFIG_DRM_MIPI_DSI=y -# CONFIG_DRM_DEBUG_MM is not set -CONFIG_DRM_KMS_HELPER=y +CONFIG_DRM_KMS_HELPER=m # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set CONFIG_DRM_FBDEV_EMULATION=y @@ -4767,10 +4766,10 @@ CONFIG_DRM_DISPLAY_HDCP_HELPER=y CONFIG_DRM_DISPLAY_HDMI_HELPER=y # CONFIG_DRM_DP_AUX_CHARDEV is not set # CONFIG_DRM_DP_CEC is not set -CONFIG_DRM_TTM=y +CONFIG_DRM_TTM=m CONFIG_DRM_EXEC=m CONFIG_DRM_BUDDY=m -CONFIG_DRM_TTM_HELPER=y +CONFIG_DRM_TTM_HELPER=m CONFIG_DRM_GEM_SHMEM_HELPER=m CONFIG_DRM_SUBALLOC_HELPER=m CONFIG_DRM_SCHED=m @@ -4857,7 +4856,7 @@ CONFIG_DRM_I915_TIMESLICE_DURATION=1 CONFIG_DRM_VGEM=m # CONFIG_DRM_VKMS is not set -CONFIG_DRM_VMWGFX=y +CONFIG_DRM_VMWGFX=m # CONFIG_DRM_VMWGFX_MKSSTATS is not set # CONFIG_DRM_GMA500 is not set # CONFIG_DRM_UDL is not set diff --git a/SPECS/kernel/config_aarch64 b/SPECS/kernel/config_aarch64 index af0065ce796..150bf5b367c 100644 --- a/SPECS/kernel/config_aarch64 +++ b/SPECS/kernel/config_aarch64 @@ -6509,11 +6509,10 @@ CONFIG_VIDEO_CMDLINE=y CONFIG_VIDEO_NOMODESET=y # CONFIG_AUXDISPLAY is not set # CONFIG_TEGRA_HOST1X is not set -CONFIG_DRM=y +CONFIG_DRM=m CONFIG_DRM_MIPI_DBI=m CONFIG_DRM_MIPI_DSI=y -# CONFIG_DRM_DEBUG_MM is not set -CONFIG_DRM_KMS_HELPER=y +CONFIG_DRM_KMS_HELPER=m # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set CONFIG_DRM_FBDEV_EMULATION=y diff --git a/SPECS/kernel/kernel-uki.spec b/SPECS/kernel/kernel-uki.spec index a70782a7a72..aeb0b2f8e7a 100644 --- a/SPECS/kernel/kernel-uki.spec +++ b/SPECS/kernel/kernel-uki.spec @@ -13,7 +13,7 @@ Summary: Unified Kernel Image Name: kernel-uki Version: 6.6.57.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -70,6 +70,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu /boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi %changelog +* Wed Nov 06 2024 Suresh Babu Chalamalasetty - 6.6.57.1-4 +- Bump release to match kernel + * Tue Nov 05 2024 Chris Co - 6.6.57.1-3 - Bump release to match kernel diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index f79c2b59222..3f2826ca2a0 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,8 +1,8 @@ { "Signatures": { "azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b", - "config": "00c9071da520dd42e8465fd8d9f36945a4f6127798c16a45f5200cfd7256ed1e", - "config_aarch64": "e0d92980c9388de35b7dde65a385865ef3207f4c50b0e9988f90394e8d627c77", + "config": "969663961b389c2825274191c3d69229077582b79af9ab49f049c4cf7d7824ee", + "config_aarch64": "628339e74f30f920fded66390563391f9f9bdfc7b7a11d14cb541ff10822ba0b", "cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985", "cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 9f0ea161920..fcaee62b381 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -30,7 +30,7 @@ Summary: Linux Kernel Name: kernel Version: 6.6.57.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -121,6 +121,15 @@ Requires: %{name} = %{version}-%{release} %description drivers-gpu This package contains the Linux kernel gpu support +%package drivers-intree-amdgpu +Summary: Kernel amdgpu modules +Group: System Environment/Kernel +Requires: %{name} = %{version}-%{release} +Requires: %{name}-drivers-gpu = %{version}-%{release} + +%description drivers-intree-amdgpu +This package contains the Linux kernel in-tree AMD gpu support + %package drivers-sound Summary: Kernel Sound modules Group: System Environment/Kernel @@ -327,6 +336,9 @@ echo "initrd of kernel %{uname_r} removed" >&2 %post drivers-gpu /sbin/depmod -a %{uname_r} +%post drivers-intree-amdgpu +/sbin/depmod -a %{uname_r} + %post drivers-sound /sbin/depmod -a %{uname_r} @@ -365,6 +377,11 @@ echo "initrd of kernel %{uname_r} removed" >&2 %files drivers-gpu %defattr(-,root,root) /lib/modules/%{uname_r}/kernel/drivers/gpu +%exclude /lib/modules/%{uname_r}/kernel/drivers/gpu/drm/amd + +%files drivers-intree-amdgpu +%defattr(-,root,root) +/lib/modules/%{uname_r}/kernel/drivers/gpu/drm/amd %files drivers-sound %defattr(-,root,root) @@ -407,6 +424,10 @@ echo "initrd of kernel %{uname_r} removed" >&2 %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Wed Nov 06 2024 Suresh Babu Chalamalasetty - 6.6.57.1-4 +- Make CONFIG_DRM and its dependency KConfigs as loadable modules +- Create sub-package for AMD GPU in-tree modules to avoid conflicts with out-of-tree modules + * Tue Nov 05 2024 Chris Co - 6.6.57.1-3 - Enable kexec signature verification - Introduce new azurelinux-ca-20230216.pem diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 5c0074b9139..834db6a6137 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,5 +1,5 @@ filesystem-1.1-21.azl3.aarch64.rpm -kernel-headers-6.6.57.1-3.azl3.noarch.rpm +kernel-headers-6.6.57.1-4.azl3.noarch.rpm glibc-2.38-8.azl3.aarch64.rpm glibc-devel-2.38-8.azl3.aarch64.rpm glibc-i18n-2.38-8.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 36c5862faf3..e2da1e67cfe 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,5 +1,5 @@ filesystem-1.1-21.azl3.x86_64.rpm -kernel-headers-6.6.57.1-3.azl3.noarch.rpm +kernel-headers-6.6.57.1-4.azl3.noarch.rpm glibc-2.38-8.azl3.x86_64.rpm glibc-devel-2.38-8.azl3.x86_64.rpm glibc-i18n-2.38-8.azl3.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index a1f7d9d6613..6160102d641 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -156,7 +156,7 @@ intltool-0.51.0-7.azl3.noarch.rpm itstool-2.0.7-1.azl3.noarch.rpm kbd-2.2.0-2.azl3.aarch64.rpm kbd-debuginfo-2.2.0-2.azl3.aarch64.rpm -kernel-headers-6.6.57.1-3.azl3.noarch.rpm +kernel-headers-6.6.57.1-4.azl3.noarch.rpm kmod-30-1.azl3.aarch64.rpm kmod-debuginfo-30-1.azl3.aarch64.rpm kmod-devel-30-1.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 89d20cc86ba..4b5f3d5611e 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -161,8 +161,8 @@ intltool-0.51.0-7.azl3.noarch.rpm itstool-2.0.7-1.azl3.noarch.rpm kbd-2.2.0-2.azl3.x86_64.rpm kbd-debuginfo-2.2.0-2.azl3.x86_64.rpm -kernel-cross-headers-6.6.57.1-3.azl3.noarch.rpm -kernel-headers-6.6.57.1-3.azl3.noarch.rpm +kernel-cross-headers-6.6.57.1-4.azl3.noarch.rpm +kernel-headers-6.6.57.1-4.azl3.noarch.rpm kmod-30-1.azl3.x86_64.rpm kmod-debuginfo-30-1.azl3.x86_64.rpm kmod-devel-30-1.azl3.x86_64.rpm