Skip to content

Commit b71c2c7

Browse files
dmcilvaneychristopherco
dmcilvaney
authored and
christopherco
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 8a8bc20 commit b71c2c7

4 files changed

Lines changed: 139 additions & 3 deletions

File tree

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

Lines changed: 80 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 = "4"
17+
azl_pkgrelease = "5"
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"
@@ -339,3 +339,82 @@ replacement = """# AZL: kmod subpackage file lists and scriptlets (nvidia-open)
339339
%include %{_sourcedir}/kmod-nvidia-open.inc
340340
341341
# AZL-KMOD-FILES-ANCHOR"""
342+
343+
# Prepend AZL changelog entries to the top of %changelog. The kernel uses
344+
# `release.calculation = "manual"` (no rpmautospec), so changelog entries are
345+
# hand-curated here rather than derived from `git log`. Convention: one entry
346+
# per lock-fingerprint change, mirroring what synthetic distgit / rpmautospec
347+
# emit. When the lock fingerprint changes (edit to comp.toml, overlays, etc.),
348+
# prepend a new entry here with the next release number.
349+
#
350+
# We intentionally do not use rpmautospec for changelog generation here since
351+
# the kernel spec file is so complicated the tool struggles to parse it (it can
352+
# take on the order of hours to run). Until we have a more robust solution for
353+
# this a manual process will be used.
354+
#
355+
# NOTE: This changelog is best-effort, as upstream changes are integrated into
356+
# the spec the logical ordering will deteriorate, the azl specific entries
357+
# will always be at the top, resulting in a jumbled history.
358+
[[components.kernel.overlays]]
359+
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."
360+
type = "spec-prepend-lines"
361+
section = "%changelog"
362+
lines = [
363+
"* Wed May 27 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.31-1.5",
364+
"- feat(kernel): add hand-curated changelog entry",
365+
"",
366+
"* Wed May 27 2026 Elaheh Dehghani <edehghani@microsoft.com> - 6.18.31-1.4",
367+
"- feat(kernel): add kmod-nvidia-open subpackage framework",
368+
"",
369+
"* Mon May 18 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.31-1.3",
370+
"- feat(kernel): disable CONFIG_AF_RXRPC and CONFIG_AFS_FS",
371+
"",
372+
"* Mon May 18 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.31-1.2",
373+
"- feat(kernel): disable CONFIG_INET_ESPINTCP, CONFIG_INET6_ESPINTCP, CONFIG_XFRM_ESPINTCP",
374+
"",
375+
"* Mon May 18 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.31-1.1",
376+
"- feat(kernel): update kernel and kernel-headers to 6.18.31.1",
377+
"",
378+
"* Thu May 14 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.29-1.2",
379+
"- chore(kernel): remove unused azurelinux_version macro",
380+
"",
381+
"* Wed May 13 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.29-1.1",
382+
"- feat(kernel): update source to 6.18.29.1 (rolling-lts/azl4)",
383+
"",
384+
"* Wed May 13 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.13-1.12",
385+
"- chore(locks): update kernel locks to work with azldev 9696597 (allow file replacement)",
386+
"",
387+
"* Mon May 11 2026 Tobias Brick <tobiasb@microsoft.com> - 6.18.13-1.11",
388+
"- kernel: Add bpf and ipe to CONFIG_LSM",
389+
"",
390+
"* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.10",
391+
"- fix(kernel): enable CONFIG_MITIGATION_GDS",
392+
"",
393+
"* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.9",
394+
"- fix(kernel): enable CONFIG_IO_STRICT_DEVMEM",
395+
"",
396+
"* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.8",
397+
"- fix(kernel): drop CONFIG_MODIFY_LDT_SYSCALL",
398+
"",
399+
"* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.7",
400+
"- fix(kernel): disable CONFIG_LDISC_AUTOLOAD",
401+
"",
402+
"* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.6",
403+
"- security(kernel): harden memory mapping and IOMMU defaults",
404+
"",
405+
"* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.5",
406+
"- security(kernel): enable CET/IBT and remove legacy vsyscall on x86_64",
407+
"",
408+
"* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.4",
409+
"- security(kernel): disable slab cache merging to prevent cross-cache attacks",
410+
"",
411+
"* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.3",
412+
"- security(kernel): restore data structure integrity hardening",
413+
"",
414+
"* Tue May 05 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.2",
415+
"- fix(kernel): skip selftests package build",
416+
"",
417+
"* Thu Apr 30 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.13-1.1",
418+
"- feat: introduce deterministic commit resolution via Azure Linux lock file",
419+
"",
420+
]

‎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:bc03956c16315556bb81a4b7557cf78a94a8f6b352bdb0de97af7227ca2bd0b5'
5+
input-fingerprint = 'sha256:35fd40d8d7ed26e4e80c412fbe33499ead22ceac032a92c1be2f3c2f729f7df3'
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,6 +2,6 @@
22
# Do not edit manually; changes will be overwritten.
33
%_without_debug 1
44
%_without_selftests 1
5-
%azl_pkgrelease 4
5+
%azl_pkgrelease 5
66
%kextraversion 1
77
%nvidia_open_version 595.58.03

‎specs/k/kernel/kernel.spec‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4578,6 +4578,63 @@ fi\
45784578

45794579
# AZL-KMOD-FILES-ANCHOR — do not remove (kmod overlays chain here)
45804580
%changelog
4581+
* Wed May 27 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.31-1.5
4582+
- feat(kernel): add hand-curated changelog entry
4583+
4584+
* Wed May 27 2026 Elaheh Dehghani <edehghani@microsoft.com> - 6.18.31-1.4
4585+
- feat(kernel): add kmod-nvidia-open subpackage framework
4586+
4587+
* Mon May 18 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.31-1.3
4588+
- feat(kernel): disable CONFIG_AF_RXRPC and CONFIG_AFS_FS
4589+
4590+
* Mon May 18 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.31-1.2
4591+
- feat(kernel): disable CONFIG_INET_ESPINTCP, CONFIG_INET6_ESPINTCP, CONFIG_XFRM_ESPINTCP
4592+
4593+
* Mon May 18 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.31-1.1
4594+
- feat(kernel): update kernel and kernel-headers to 6.18.31.1
4595+
4596+
* Thu May 14 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.29-1.2
4597+
- chore(kernel): remove unused azurelinux_version macro
4598+
4599+
* Wed May 13 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.29-1.1
4600+
- feat(kernel): update source to 6.18.29.1 (rolling-lts/azl4)
4601+
4602+
* Wed May 13 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.13-1.12
4603+
- chore(locks): update kernel locks to work with azldev 9696597 (allow file replacement)
4604+
4605+
* Mon May 11 2026 Tobias Brick <tobiasb@microsoft.com> - 6.18.13-1.11
4606+
- kernel: Add bpf and ipe to CONFIG_LSM
4607+
4608+
* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.10
4609+
- fix(kernel): enable CONFIG_MITIGATION_GDS
4610+
4611+
* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.9
4612+
- fix(kernel): enable CONFIG_IO_STRICT_DEVMEM
4613+
4614+
* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.8
4615+
- fix(kernel): drop CONFIG_MODIFY_LDT_SYSCALL
4616+
4617+
* Mon May 11 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.7
4618+
- fix(kernel): disable CONFIG_LDISC_AUTOLOAD
4619+
4620+
* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.6
4621+
- security(kernel): harden memory mapping and IOMMU defaults
4622+
4623+
* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.5
4624+
- security(kernel): enable CET/IBT and remove legacy vsyscall on x86_64
4625+
4626+
* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.4
4627+
- security(kernel): disable slab cache merging to prevent cross-cache attacks
4628+
4629+
* Fri May 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.3
4630+
- security(kernel): restore data structure integrity hardening
4631+
4632+
* Tue May 05 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.13-1.2
4633+
- fix(kernel): skip selftests package build
4634+
4635+
* Thu Apr 30 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.13-1.1
4636+
- feat: introduce deterministic commit resolution via Azure Linux lock file
4637+
45814638
* Thu Feb 19 2026 Augusto Caringi <acaringi@redhat.com> [6.18.13-0]
45824639
- Linux v6.18.13
45834640

0 commit comments

Comments
 (0)