Skip to content

Commit 9d82069

Browse files
dmcilvaneydmcilvaney
committed
feat(kernel): add hand-curated changelog entry
rpmautospec can't generate changelog entries for the kernel package since its too complex. Until we can find a solution to this issue we will maintain a manual changelog entry for each lock-fingerprint change.
1 parent 3c2a74a commit 9d82069

4 files changed

Lines changed: 133 additions & 3 deletions

File tree

‎base/comps/kernel/kernel.comp.toml‎

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ without = [
1414

1515
[components.kernel.build.defines]
1616
# RPM release number for the Azure Linux kernel package
17-
azl_pkgrelease = "3"
17+
azl_pkgrelease = "4"
1818
# 4th version component from the AZL kernel source (6.18.31.1). Included in specrelease so it appears
1919
# in the RPM Release tag, uname -r, and /lib/modules/ path (e.g. 6.18.31-1.1.azl4.aarch64).
2020
kextraversion = "1"
@@ -164,3 +164,79 @@ lines = [
164164
"cd ../..",
165165
"%endif",
166166
]
167+
168+
# Prepend AZL changelog entries to the top of %changelog. The kernel uses
169+
# `release.calculation = "manual"` (no rpmautospec), so changelog entries are
170+
# hand-curated here rather than derived from `git log`. Convention: one entry
171+
# per lock-fingerprint change, mirroring what synthetic distgit / rpmautospec
172+
# emit. When the lock fingerprint changes (edit to comp.toml, overlays, etc.),
173+
# prepend a new entry here with the next release number.
174+
#
175+
# We intentionally do not use rpmautospec for changelog generation here since
176+
# the kernel spec file is so complicated the tool struggles to parse it (it can
177+
# take on the order of hours to run). Until we have a more robust solution for
178+
# this a manual process will be used.
179+
#
180+
# NOTE: This changelog is best-effort, as upstream changes are integrated into
181+
# the spec the logical ordering will deteriorate, the azl specific entries
182+
# will always be at the top, resulting in a jumbled history.
183+
[[components.kernel.overlays]]
184+
description = "Prepend AZL changelog entries (one per lock-fingerprint change) above the inherited Fedora history. Release is manual, so rpmautospec does not generate these; convention mirrors synthetic distgit output."
185+
type = "spec-prepend-lines"
186+
section = "%changelog"
187+
lines = [
188+
"* Wed May 27 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.31-1.4",
189+
"- feat(kernel): add hand-curated changelog entry",
190+
"",
191+
"* Mon May 18 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.31-1.3",
192+
"- feat(kernel): disable CONFIG_AF_RXRPC and CONFIG_AFS_FS",
193+
"",
194+
"* Mon May 18 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.31-1.2",
195+
"- feat(kernel): disable CONFIG_INET_ESPINTCP, CONFIG_INET6_ESPINTCP, CONFIG_XFRM_ESPINTCP",
196+
"",
197+
"* Mon May 18 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.31-1.1",
198+
"- feat(kernel): update kernel and kernel-headers to 6.18.31.1",
199+
"",
200+
"* Thu May 14 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.29-1.2",
201+
"- chore(kernel): remove unused azurelinux_version macro",
202+
"",
203+
"* Wed May 13 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.29-1.1",
204+
"- feat(kernel): update source to 6.18.29.1 (rolling-lts/azl4)",
205+
"",
206+
"* Wed May 13 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.13-1.12",
207+
"- chore(locks): update kernel locks to work with azldev 9696597 (allow file replacement)",
208+
"",
209+
"* Mon May 11 2026 Tobias Brick <tobiasb@microsoft.com> - 6.18.13-1.11",
210+
"- kernel: Add bpf and ipe to CONFIG_LSM",
211+
"",
212+
"* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.10",
213+
"- fix(kernel): enable CONFIG_MITIGATION_GDS",
214+
"",
215+
"* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.9",
216+
"- fix(kernel): enable CONFIG_IO_STRICT_DEVMEM",
217+
"",
218+
"* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.8",
219+
"- fix(kernel): drop CONFIG_MODIFY_LDT_SYSCALL",
220+
"",
221+
"* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.7",
222+
"- fix(kernel): disable CONFIG_LDISC_AUTOLOAD",
223+
"",
224+
"* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.6",
225+
"- security(kernel): harden memory mapping and IOMMU defaults",
226+
"",
227+
"* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.5",
228+
"- security(kernel): enable CET/IBT and remove legacy vsyscall on x86_64",
229+
"",
230+
"* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.4",
231+
"- security(kernel): disable slab cache merging to prevent cross-cache attacks",
232+
"",
233+
"* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.3",
234+
"- security(kernel): restore data structure integrity hardening",
235+
"",
236+
"* Tue May 05 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.2",
237+
"- fix(kernel): skip selftests package build",
238+
"",
239+
"* Thu Apr 30 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.13-1.1",
240+
"- feat: introduce deterministic commit resolution via Azure Linux lock file",
241+
"",
242+
]

‎locks/kernel.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
version = 1
33
import-commit = '5271a1b047ef402ddee40242e02eda23fc273044'
44
upstream-commit = '5271a1b047ef402ddee40242e02eda23fc273044'
5-
input-fingerprint = 'sha256:3712f583962a018083cfb0e5582c296fbed51633b1bbe0e92a940e5dd3653549'
5+
input-fingerprint = 'sha256:0a5a8c853aaaf53ff679a66c6da274118df7fd83704a1945d231b226de77d722'
66
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'

‎specs/k/kernel/kernel.azl.macros‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# Do not edit manually; changes will be overwritten.
33
%_without_debug 1
44
%_without_selftests 1
5-
%azl_pkgrelease 3
5+
%azl_pkgrelease 4
66
%kextraversion 1

‎specs/k/kernel/kernel.spec‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4539,6 +4539,60 @@ fi\
45394539
#
45404540
#
45414541
%changelog
4542+
* Wed May 27 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.31-1.4
4543+
- feat(kernel): add hand-curated changelog entry
4544+
4545+
* Mon May 18 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.31-1.3
4546+
- feat(kernel): disable CONFIG_AF_RXRPC and CONFIG_AFS_FS
4547+
4548+
* Mon May 18 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.31-1.2
4549+
- feat(kernel): disable CONFIG_INET_ESPINTCP, CONFIG_INET6_ESPINTCP, CONFIG_XFRM_ESPINTCP
4550+
4551+
* Mon May 18 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.31-1.1
4552+
- feat(kernel): update kernel and kernel-headers to 6.18.31.1
4553+
4554+
* Thu May 14 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.29-1.2
4555+
- chore(kernel): remove unused azurelinux_version macro
4556+
4557+
* Wed May 13 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.29-1.1
4558+
- feat(kernel): update source to 6.18.29.1 (rolling-lts/azl4)
4559+
4560+
* Wed May 13 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.13-1.12
4561+
- chore(locks): update kernel locks to work with azldev 9696597 (allow file replacement)
4562+
4563+
* Mon May 11 2026 Tobias Brick <tobiasb@microsoft.com> - 6.18.13-1.11
4564+
- kernel: Add bpf and ipe to CONFIG_LSM
4565+
4566+
* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.10
4567+
- fix(kernel): enable CONFIG_MITIGATION_GDS
4568+
4569+
* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.9
4570+
- fix(kernel): enable CONFIG_IO_STRICT_DEVMEM
4571+
4572+
* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.8
4573+
- fix(kernel): drop CONFIG_MODIFY_LDT_SYSCALL
4574+
4575+
* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.7
4576+
- fix(kernel): disable CONFIG_LDISC_AUTOLOAD
4577+
4578+
* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.6
4579+
- security(kernel): harden memory mapping and IOMMU defaults
4580+
4581+
* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.5
4582+
- security(kernel): enable CET/IBT and remove legacy vsyscall on x86_64
4583+
4584+
* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.4
4585+
- security(kernel): disable slab cache merging to prevent cross-cache attacks
4586+
4587+
* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.3
4588+
- security(kernel): restore data structure integrity hardening
4589+
4590+
* Tue May 05 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.2
4591+
- fix(kernel): skip selftests package build
4592+
4593+
* Thu Apr 30 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.13-1.1
4594+
- feat: introduce deterministic commit resolution via Azure Linux lock file
4595+
45424596
* Thu Feb 19 2026 Augusto Caringi <acaringi@redhat.com> [6.18.13-0]
45434597
- Linux v6.18.13
45444598

0 commit comments

Comments
 (0)