kernel-uki: drop dbus in initrd (#10533)

Signed-off-by: Thien Trung Vuong <[email protected]> Co-authored-by: jozzsi <[email protected]>
microsoft · Oct 1, 2024 · ca8dcfa · ca8dcfa
1 parent 1118da2
commit ca8dcfa
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 12 deletions.
diff --git 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.51.1
-Release:        2%{?dist}
+Release:        3%{?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
+* Tue Sep 24 2024 Jo Zzsi <[email protected]> - 6.6.51.1-3
+- Bump release to match kernel
+
 * Fri Sep 20 2024 Chris Co <[email protected]> - 6.6.51.1-2
 - 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
@@ -6,7 +6,7 @@
 Summary:        Signed Unified Kernel Image for %{buildarch} systems
 Name:           kernel-uki-signed-%{buildarch}
 Version:        6.6.51.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -68,6 +68,9 @@ popd
 /boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
 
 %changelog
+* Tue Sep 24 2024 Jo Zzsi <[email protected]> - 6.6.51.1-3
+- Bump release to match kernel
+
 * Fri Sep 20 2024 Chris Co <[email protected]> - 6.6.51.1-2
 - Bump release to match kernel
 

diff --git 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.51.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -75,6 +75,9 @@ done
 %endif
 
 %changelog
+* Tue Sep 24 2024 Jo Zzsi <[email protected]> - 6.6.51.1-3
+- Bump release to match kernel
+
 * Fri Sep 20 2024 Chris Co <[email protected]> - 6.6.51.1-2
 - Bump release to match kernel
 

diff --git a/SPECS/kernel/kernel-uki-dracut.conf b/SPECS/kernel/kernel-uki-dracut.conf
@@ -6,7 +6,7 @@ compress="xz"
 early_microcode="no"
 
 # modules: basics
-dracutmodules+=" base systemd systemd-initrd dracut-systemd dbus shutdown i18n "
+dracutmodules+=" base systemd systemd-initrd dracut-systemd shutdown i18n "
 
 # modules: storage support
 dracutmodules+=" dm rootfs-block fs-lib "

diff --git a/SPECS/kernel/kernel-uki.signatures.json b/SPECS/kernel/kernel-uki.signatures.json
@@ -1,5 +1,5 @@
 {
   "Signatures": {
-    "kernel-uki-dracut.conf": "57f80f04f138e1d0083aedc4a8b440de97a6ed693ba7014b3580f0d2cdd768b6"
+    "kernel-uki-dracut.conf": "83b8db11c5066b275f8d982bbae69305750f94f7e96ab215104ed050a682de4e"
   }
 }
diff --git a/SPECS/kernel/kernel-uki.spec b/SPECS/kernel/kernel-uki.spec
@@ -18,7 +18,7 @@
 Summary:        Unified Kernel Image
 Name:           kernel-uki
 Version:        6.6.51.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -75,6 +75,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
 /boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
 
 %changelog
+* Tue Sep 24 2024 Jo Zzsi <[email protected]> - 6.6.51.1-3
+- Remove dbus from initrd
+
 * Fri Sep 20 2024 Chris Co <[email protected]> - 6.6.51.1-2
 - Bump release to match kernel
 

diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec
@@ -30,7 +30,7 @@
 Summary:        Linux Kernel
 Name:           kernel
 Version:        6.6.51.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -407,6 +407,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
 %{_sysconfdir}/bash_completion.d/bpftool
 
 %changelog
+* Tue Sep 24 2024 Jo Zzsi <[email protected]> - 6.6.51.1-3
+- UKI: remove dbus from initrd
+
 * Fri Sep 20 2024 Chris Co <[email protected]> - 6.6.51.1-2
 - Enable MLX5 TC offload
 

diff --git 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.51.1-2.azl3.noarch.rpm
+kernel-headers-6.6.51.1-3.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
@@ -1,5 +1,5 @@
 filesystem-1.1-21.azl3.x86_64.rpm
-kernel-headers-6.6.51.1-2.azl3.noarch.rpm
+kernel-headers-6.6.51.1-3.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
@@ -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.51.1-2.azl3.noarch.rpm
+kernel-headers-6.6.51.1-3.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
@@ -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.51.1-2.azl3.noarch.rpm
-kernel-headers-6.6.51.1-2.azl3.noarch.rpm
+kernel-cross-headers-6.6.51.1-3.azl3.noarch.rpm
+kernel-headers-6.6.51.1-3.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