Skip to content

Commit ca8dcfa

Browse files
trungamsjozzsi
andauthored
kernel-uki: drop dbus in initrd (#10533)
Signed-off-by: Thien Trung Vuong <tvuong@microsoft.com> Co-authored-by: jozzsi <jozzsicsataban@gmail.com>
1 parent 1118da2 commit ca8dcfa

11 files changed

Lines changed: 27 additions & 12 deletions

File tree

SPECS-SIGNED/kernel-signed/kernel-signed.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
1212
Version: 6.6.51.1
13-
Release: 2%{?dist}
13+
Release: 3%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
145145
%exclude /module_info.ld
146146

147147
%changelog
148+
* Tue Sep 24 2024 Jo Zzsi <jozzsicsataban@gmail.com> - 6.6.51.1-3
149+
- Bump release to match kernel
150+
148151
* Fri Sep 20 2024 Chris Co <chrco@microsoft.com> - 6.6.51.1-2
149152
- Bump release to match kernel
150153

SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Signed Unified Kernel Image for %{buildarch} systems
77
Name: kernel-uki-signed-%{buildarch}
88
Version: 6.6.51.1
9-
Release: 2%{?dist}
9+
Release: 3%{?dist}
1010
License: GPLv2
1111
Vendor: Microsoft Corporation
1212
Distribution: Azure Linux
@@ -68,6 +68,9 @@ popd
6868
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
6969

7070
%changelog
71+
* Tue Sep 24 2024 Jo Zzsi <jozzsicsataban@gmail.com> - 6.6.51.1-3
72+
- Bump release to match kernel
73+
7174
* Fri Sep 20 2024 Chris Co <chrco@microsoft.com> - 6.6.51.1-2
7275
- Bump release to match kernel
7376

SPECS/kernel-headers/kernel-headers.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Summary: Linux API header files
1515
Name: kernel-headers
1616
Version: 6.6.51.1
17-
Release: 2%{?dist}
17+
Release: 3%{?dist}
1818
License: GPLv2
1919
Vendor: Microsoft Corporation
2020
Distribution: Azure Linux
@@ -75,6 +75,9 @@ done
7575
%endif
7676

7777
%changelog
78+
* Tue Sep 24 2024 Jo Zzsi <jozzsicsataban@gmail.com> - 6.6.51.1-3
79+
- Bump release to match kernel
80+
7881
* Fri Sep 20 2024 Chris Co <chrco@microsoft.com> - 6.6.51.1-2
7982
- Bump release to match kernel
8083

SPECS/kernel/kernel-uki-dracut.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ compress="xz"
66
early_microcode="no"
77

88
# modules: basics
9-
dracutmodules+=" base systemd systemd-initrd dracut-systemd dbus shutdown i18n "
9+
dracutmodules+=" base systemd systemd-initrd dracut-systemd shutdown i18n "
1010

1111
# modules: storage support
1212
dracutmodules+=" dm rootfs-block fs-lib "
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"kernel-uki-dracut.conf": "57f80f04f138e1d0083aedc4a8b440de97a6ed693ba7014b3580f0d2cdd768b6"
3+
"kernel-uki-dracut.conf": "83b8db11c5066b275f8d982bbae69305750f94f7e96ab215104ed050a682de4e"
44
}
55
}

SPECS/kernel/kernel-uki.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
Summary: Unified Kernel Image
1919
Name: kernel-uki
2020
Version: 6.6.51.1
21-
Release: 2%{?dist}
21+
Release: 3%{?dist}
2222
License: GPLv2
2323
Vendor: Microsoft Corporation
2424
Distribution: Azure Linux
@@ -75,6 +75,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
7575
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
7676

7777
%changelog
78+
* Tue Sep 24 2024 Jo Zzsi <jozzsicsataban@gmail.com> - 6.6.51.1-3
79+
- Remove dbus from initrd
80+
7881
* Fri Sep 20 2024 Chris Co <chrco@microsoft.com> - 6.6.51.1-2
7982
- Bump release to match kernel
8083

SPECS/kernel/kernel.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
Summary: Linux Kernel
3131
Name: kernel
3232
Version: 6.6.51.1
33-
Release: 2%{?dist}
33+
Release: 3%{?dist}
3434
License: GPLv2
3535
Vendor: Microsoft Corporation
3636
Distribution: Azure Linux
@@ -407,6 +407,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
407407
%{_sysconfdir}/bash_completion.d/bpftool
408408

409409
%changelog
410+
* Tue Sep 24 2024 Jo Zzsi <jozzsicsataban@gmail.com> - 6.6.51.1-3
411+
- UKI: remove dbus from initrd
412+
410413
* Fri Sep 20 2024 Chris Co <chrco@microsoft.com> - 6.6.51.1-2
411414
- Enable MLX5 TC offload
412415

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filesystem-1.1-21.azl3.aarch64.rpm
2-
kernel-headers-6.6.51.1-2.azl3.noarch.rpm
2+
kernel-headers-6.6.51.1-3.azl3.noarch.rpm
33
glibc-2.38-8.azl3.aarch64.rpm
44
glibc-devel-2.38-8.azl3.aarch64.rpm
55
glibc-i18n-2.38-8.azl3.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filesystem-1.1-21.azl3.x86_64.rpm
2-
kernel-headers-6.6.51.1-2.azl3.noarch.rpm
2+
kernel-headers-6.6.51.1-3.azl3.noarch.rpm
33
glibc-2.38-8.azl3.x86_64.rpm
44
glibc-devel-2.38-8.azl3.x86_64.rpm
55
glibc-i18n-2.38-8.azl3.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ intltool-0.51.0-7.azl3.noarch.rpm
156156
itstool-2.0.7-1.azl3.noarch.rpm
157157
kbd-2.2.0-2.azl3.aarch64.rpm
158158
kbd-debuginfo-2.2.0-2.azl3.aarch64.rpm
159-
kernel-headers-6.6.51.1-2.azl3.noarch.rpm
159+
kernel-headers-6.6.51.1-3.azl3.noarch.rpm
160160
kmod-30-1.azl3.aarch64.rpm
161161
kmod-debuginfo-30-1.azl3.aarch64.rpm
162162
kmod-devel-30-1.azl3.aarch64.rpm

0 commit comments

Comments
 (0)