From 66c133572b8c90bfae0e9ab9a2baac92dfadcbc8 Mon Sep 17 00:00:00 2001 From: Rachel Menge Date: Mon, 23 Dec 2024 22:46:03 +0000 Subject: [PATCH 1/2] Enable Intel VPU --- SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec | 5 ++++- SPECS-SIGNED/kernel-signed/kernel-signed.spec | 5 ++++- SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec | 5 ++++- SPECS/kernel-64k/kernel-64k.spec | 5 ++++- SPECS/kernel-headers/kernel-headers.spec | 5 ++++- SPECS/kernel/config | 4 +++- SPECS/kernel/kernel-uki.spec | 5 ++++- SPECS/kernel/kernel.signatures.json | 2 +- SPECS/kernel/kernel.spec | 5 ++++- toolkit/resources/manifests/package/pkggen_core_aarch64.txt | 2 +- toolkit/resources/manifests/package/pkggen_core_x86_64.txt | 2 +- toolkit/resources/manifests/package/toolchain_aarch64.txt | 2 +- toolkit/resources/manifests/package/toolchain_x86_64.txt | 4 ++-- 13 files changed, 37 insertions(+), 14 deletions(-) diff --git a/SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec b/SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec index a560480a455..1ee2e809d70 100644 --- a/SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec +++ b/SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec @@ -7,7 +7,7 @@ Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-64k-signed-%{buildarch} Version: 6.6.64.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -105,6 +105,9 @@ echo "initrd of kernel %{uname_r} removed" >&2 %exclude /module_info.ld %changelog +* Fri Jan 10 2025 Rachel Menge - 6.6.64.2-2 +- Bump release to match kernel-64k + * Thu Jan 09 2025 CBL-Mariner Servicing Account - 6.6.64.2-1 - Auto-upgrade to 6.6.64.2 diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index 8d7bf37732a..a2d667bd3da 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.64.2 -Release: 1%{?dist} +Release: 2%{?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 +* Fri Jan 10 2025 Rachel Menge - 6.6.64.2-2 +- Bump release to match kernel + * Thu Jan 09 2025 CBL-Mariner Servicing Account - 6.6.64.2-1 - Auto-upgrade to 6.6.64.2 diff --git a/SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec b/SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec index 82111d2f806..9437c910796 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.64.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -68,6 +68,9 @@ popd /boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi %changelog +* Fri Jan 10 2025 Rachel Menge - 6.6.64.2-2 +- Bump release to match kernel + * Thu Jan 09 2025 CBL-Mariner Servicing Account - 6.6.64.2-1 - Auto-upgrade to 6.6.64.2 diff --git a/SPECS/kernel-64k/kernel-64k.spec b/SPECS/kernel-64k/kernel-64k.spec index cb04cb8a8ae..e7859e230b0 100644 --- a/SPECS/kernel-64k/kernel-64k.spec +++ b/SPECS/kernel-64k/kernel-64k.spec @@ -25,7 +25,7 @@ Summary: Linux Kernel Name: kernel-64k Version: 6.6.64.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -370,6 +370,9 @@ echo "initrd of kernel %{uname_r} removed" >&2 %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Fri Jan 10 2025 Rachel Menge - 6.6.64.2-2 +- Bump release to match kernel + * Thu Jan 09 2025 CBL-Mariner Servicing Account - 6.6.64.2-1 - Auto-upgrade to 6.6.64.2 diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index a66cbf22bff..d8b359eab81 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.64.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -75,6 +75,9 @@ done %endif %changelog +* Fri Jan 10 2025 Rachel Menge - 6.6.64.2-2 +- Bump release to match kernel + * Thu Jan 09 2025 CBL-Mariner Servicing Account - 6.6.64.2-1 - Auto-upgrade to 6.6.64.2 diff --git a/SPECS/kernel/config b/SPECS/kernel/config index 66cc9df8407..9f5982c502e 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/config @@ -5018,7 +5018,9 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_LOGO is not set # end of Graphics support -# CONFIG_DRM_ACCEL is not set +CONFIG_DRM_ACCEL=y +# CONFIG_DRM_ACCEL_HABANALABS is not set +CONFIG_DRM_ACCEL_IVPU=m CONFIG_SOUND=m CONFIG_SND=m CONFIG_SND_TIMER=m diff --git a/SPECS/kernel/kernel-uki.spec b/SPECS/kernel/kernel-uki.spec index 55050cb5664..0f049b5286c 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.64.2 -Release: 1%{?dist} +Release: 2%{?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 +* Fri Jan 10 2025 Rachel Menge - 6.6.64.2-2 +- Bump release to match kernel + * Thu Jan 09 2025 CBL-Mariner Servicing Account - 6.6.64.2-1 - Auto-upgrade to 6.6.64.2 diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index bcc30fe9a76..017a1ba229d 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b", - "config": "fc926acd06b82abc2a9f0618947072eba2e6913c5cbbf11d64aaf56e3f0996cc", + "config": "d4cc7bd42d9791716b0065a61b50ac9319172fe10a71e2aec5307fe7f7382dca", "config_aarch64": "27a07a9652c8dcfff7edb3134372dd0f53a9a6c8ab9c3dc5bf580ee08410bd27", "cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985", "cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98", diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 783b97961c8..bcb09b9c122 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -30,7 +30,7 @@ Summary: Linux Kernel Name: kernel Version: 6.6.64.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -424,6 +424,9 @@ echo "initrd of kernel %{uname_r} removed" >&2 %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Fri Jan 10 2025 Rachel Menge - 6.6.64.2-2 +- Enable Intel VPU + * Thu Jan 09 2025 CBL-Mariner Servicing Account - 6.6.64.2-1 - Auto-upgrade to 6.6.64.2 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 3289a276433..c4349ca77a9 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.64.2-1.azl3.noarch.rpm +kernel-headers-6.6.64.2-2.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 aa83488dcb5..3cff0662fab 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.64.2-1.azl3.noarch.rpm +kernel-headers-6.6.64.2-2.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 4ba96951db9..eeb45d62e22 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.64.2-1.azl3.noarch.rpm +kernel-headers-6.6.64.2-2.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 a8dc3741122..4c76101782d 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -163,8 +163,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.64.2-1.azl3.noarch.rpm -kernel-headers-6.6.64.2-1.azl3.noarch.rpm +kernel-cross-headers-6.6.64.2-2.azl3.noarch.rpm +kernel-headers-6.6.64.2-2.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 From 9bf8ba0faacddeefa6783472ca88fcffcaa59fb3 Mon Sep 17 00:00:00 2001 From: Rachel Menge Date: Wed, 1 Jan 2025 00:47:53 +0000 Subject: [PATCH 2/2] Package intel_vpu and accel drivers in gpu subpackage --- SPECS/kernel/kernel.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index bcb09b9c122..334ebec10e3 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -359,6 +359,7 @@ echo "initrd of kernel %{uname_r} removed" >&2 %exclude /lib/modules/%{uname_r}/build %exclude /lib/modules/%{uname_r}/kernel/drivers/accessibility %exclude /lib/modules/%{uname_r}/kernel/drivers/gpu +%exclude /lib/modules/%{uname_r}/kernel/drivers/accel %exclude /lib/modules/%{uname_r}/kernel/sound %files docs @@ -377,6 +378,9 @@ echo "initrd of kernel %{uname_r} removed" >&2 %files drivers-gpu %defattr(-,root,root) /lib/modules/%{uname_r}/kernel/drivers/gpu +%ifarch x86_64 +/lib/modules/%{uname_r}/kernel/drivers/accel +%endif %exclude /lib/modules/%{uname_r}/kernel/drivers/gpu/drm/amd %files drivers-intree-amdgpu