feat(kernel, kernel-headers): bump to 6.18.39.1 and enable TCP BBR3 #18536
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,23 @@ | ||
| [components.kernel-headers] | ||
| # Azure Linux maintains kernel-headers as a local spec (migrated away from the | ||
| # azldev TOML-overlay-on-Fedora-upstream approach) so it can track the local | ||
| # kernel spec, share its version/release scheme, and generate headers directly | ||
| # from the AZL kernel source (Fedora's spec expects a pre-built headers | ||
| # tarball). Edit kernel-headers.spec directly; AZL-specific changes are marked | ||
| # with "AZL:" comments. | ||
| spec = { type = "local", path = "kernel-headers.spec" } | ||
|
|
||
| # The spec uses %{specrelease} (kextraversion.azl_pkgrelease.dist) which the | ||
| # auto-calculator cannot parse. Release is managed manually: bump azl_pkgrelease | ||
| # in kernel-headers.spec when rebuilding without a version change. The | ||
| # %changelog is hand-curated inline in the spec (matches base/comps/kernel). | ||
| release = { calculation = "manual" } | ||
|
|
||
| # Azure Linux kernel source tarball (rolling-lts/azl4). Same tarball as | ||
| # base/comps/kernel; kept as a separate declaration so kernel-headers builds | ||
| # stand-alone. | ||
| [[components.kernel-headers.source-files]] | ||
| filename = "kernel-6.18.39.1.tar.gz" | ||
| hash = "cd70c68662ae5fca906a45d2feae1e4cdaed63b0427856f46cbfa6398f2e4b32b6a233f05ea49b359abf9119b0644177637b9638ec773b1d26e8725db042e0c5" | ||
| hash-type = "SHA512" | ||
| origin = { type = "download", uri = "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/azl4/6.18.39.1.tar.gz" } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| # Azure Linux local kernel-headers spec. | ||
| # | ||
| # This is a maintained local spec (migrated from the previous azldev TOML | ||
| # overlay approach). Edit this file directly. Azure Linux customizations are | ||
| # marked with "AZL:" comments throughout. | ||
| # | ||
| # The build tracks kernel.spec: same source tarball, same version scheme | ||
| # (%{specversion}.%{kextraversion}), same manual release bump discipline. | ||
| # When rebuilding without a version change, bump azl_pkgrelease. | ||
|
|
||
| # For a stable, released kernel, released_kernel should be 1. For rawhide | ||
| # and/or a kernel built from an rc or git snapshot, released_kernel should | ||
| # be 0. | ||
| %global released_kernel 1 | ||
|
|
||
| # AZL: RPM release counter. Bump for rebuilds without a version change. | ||
| %define azl_pkgrelease 1 | ||
|
There was a problem hiding this comment. suggestion(non-blocking): To clarify this (and in the kernel spec), can you add a sentence to this macro's comment saying something like "This corresponds to upstream's %{pkgrelease} macro, and we use it in the %{specrelease} macro instead of a hardcoded value". also, another minor suggestion, i feel like the ordering of this macro and %kextraversion macro should be swapped, because %kextraversion is the "more significant" digit in the %specrelease macro. What do you think about moving the %azl_pkgrelease define to below the %kextraversion define? |
||
| # AZL: 4th version component from the AZL kernel source (6.18.39.1). Flows | ||
| # into Version:, Release:, and the extracted source tree name. | ||
| %define kextraversion 1 | ||
|
There was a problem hiding this comment. suggestion(non-blocking): Our kernel source comes to us with a non-standard 4-digit version number (e.g. A.B.C.D), so we remove the 4th number (e.g. D) and use the standard 3-digit version (e.g. A.B.C), and place the 4th number into the leading (dot-separated) position of our release value, in the %specrelease macro below. For example, if kernel source is version "A.B.C.D", our rpm (and uname -r) V-R would start with "A.B.C-D." plus the remaining release macro/arch values. |
||
|
|
||
| # define buildid .local | ||
|
There was a problem hiding this comment. suggestion(non-blocking): |
||
| %define specversion 6.18.39 | ||
| %define tarfile_release 6.18.39 | ||
| # This is needed to do merge window version magic | ||
| # This allows pkg_release to have configurable %%{?dist} tag | ||
| %define specrelease %{kextraversion}.%{azl_pkgrelease}%{?dist} | ||
|
|
||
| # This package doesn't contain any binary, thus no debuginfo package is needed | ||
| %global debug_package %{nil} | ||
|
|
||
| Name: kernel-headers | ||
| Summary: Header files for the Linux kernel for use by glibc | ||
| License: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-2-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR CDDL-1.0) AND ((GPL-2.0-only WITH Linux-syscall-note) OR Linux-OpenIB) AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR MIT) AND BSD-3-Clause AND (GPL-1.0-or-later WITH Linux-syscall-note) AND GPL-2.0-only AND (GPL-2.0-only WITH Linux-syscall-note) AND (GPL-2.0-or-later WITH Linux-syscall-note) AND (LGPL-2.0-or-later WITH Linux-syscall-note) AND (LGPL-2.1-only WITH Linux-syscall-note) AND (LGPL-2.1-or-later WITH Linux-syscall-note) AND MIT | ||
| URL: http://www.kernel.org/ | ||
| Version: %{specversion} | ||
| Release: %{specrelease} | ||
| # AZL: Source0 points at the Azure Linux kernel tarball | ||
| # (rolling-lts/azl4/%{specversion}.%{kextraversion}); upstream Fedora ships a | ||
| # pre-built headers tarball, we generate headers from source instead (%build | ||
| # below). | ||
| Source0: kernel-%{specversion}.%{kextraversion}.tar.gz | ||
| Obsoletes: glibc-kernheaders < 3.0-46 | ||
| Provides: glibc-kernheaders = 3.0-46 | ||
| %if "0%{?variant}" | ||
| Obsoletes: kernel-headers < %{specversion}-%{specrelease} | ||
| Provides: kernel-headers = %{specversion}-%{specrelease} | ||
| %endif | ||
|
|
||
| # AZL: `make headers_install` is invoked directly, so a small build toolchain | ||
| # (make/gcc/perl/rsync) is enough — no full kernel build deps. | ||
| BuildRequires: make | ||
| BuildRequires: gcc | ||
| BuildRequires: perl | ||
| BuildRequires: rsync | ||
| %description | ||
| Kernel-headers includes the C header files that specify the interface | ||
| between the Linux kernel and userspace libraries and programs. The | ||
| header files define structures and constants that are needed for | ||
| building most standard programs and are also needed for rebuilding the | ||
| glibc package. | ||
|
|
||
| %package -n kernel-cross-headers | ||
| Summary: Header files for the Linux kernel for use by cross-glibc | ||
|
|
||
| %description -n kernel-cross-headers | ||
| Kernel-cross-headers includes the C header files that specify the interface | ||
| between the Linux kernel and userspace libraries and programs. The | ||
| header files define structures and constants that are needed for | ||
| building most standard programs and are also needed for rebuilding the | ||
| cross-glibc package. | ||
|
|
||
| %prep | ||
| %setup -q -n CBL-Mariner-Linux-Kernel-rolling-lts-azl4-%{specversion}.%{kextraversion} | ||
|
|
||
| # AZL: generate headers from the kernel source tree for both native and the | ||
| # opposite architecture (for kernel-cross-headers). Upstream Fedora consumes a | ||
| # pre-built headers tarball; we build them here instead. | ||
| %build | ||
|
|
||
| make mrproper | ||
| make headers_install INSTALL_HDR_PATH=headers-native | ||
|
|
||
| # Determine native kernel arch and cross-compile for the other | ||
| native_karch=$(uname -m | sed 's/x86_64/x86/;s/aarch64/arm64/') | ||
| for cross_arch in arm64 x86; do | ||
| [ "$cross_arch" = "$native_karch" ] && continue | ||
| make ARCH=$cross_arch headers_install INSTALL_HDR_PATH=headers-$cross_arch | ||
| done | ||
|
|
||
| # AZL: install natively-generated headers under %{_includedir}; cross-arch | ||
| # headers land under %{_prefix}/<arch>-linux-gnu/include for the | ||
| # kernel-cross-headers subpackage. | ||
| %install | ||
| native_karch=$(uname -m | sed 's/x86_64/x86/;s/aarch64/arm64/') | ||
|
|
||
| mkdir -p $RPM_BUILD_ROOT%{_includedir} | ||
| cp -rv headers-native/include/* $RPM_BUILD_ROOT%{_includedir} | ||
|
|
||
| for cross_arch in arm64 x86; do | ||
| [ "$cross_arch" = "$native_karch" ] && continue | ||
| cross_arch_includedir=$RPM_BUILD_ROOT%{_prefix}/${cross_arch}-linux-gnu/include | ||
| mkdir -p $cross_arch_includedir | ||
| cp -rv headers-$cross_arch/include/* $cross_arch_includedir | ||
| done | ||
|
|
||
| %files | ||
| %defattr(-,root,root) | ||
| %{_includedir}/* | ||
|
|
||
| %files -n kernel-cross-headers | ||
| %defattr(-,root,root) | ||
| %{_prefix}/*-linux-gnu/* | ||
|
|
||
| %changelog | ||
| * Wed Aug 19 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.39-1.1 | ||
| - feat(kernel): update kernel and kernel-headers to 6.18.39.1 | ||
|
|
||
| * Mon May 18 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.31-1.1 | ||
| - feat(kernel): update kernel and kernel-headers to 6.18.31.1 | ||
|
|
||
| * Thu May 14 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.3-4 | ||
| - feat(kernel-headers): update source to 6.18.29.1 | ||
|
|
||
| * Wed May 13 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.3-3 | ||
| - chore(locks): update kernel locks to work with azldev 9696597 (allow file replacement) | ||
|
|
||
| * Thu Apr 30 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.3-2 | ||
| - feat: introduce deterministic commit resolution via Azure Linux lock file | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| SHA512 (linux-6.18.13.tar.xz) = a1d1b27391ed55ae2b17dd25841037d3399e4d87900eb098af45b5b6bcedc095626971d069ff7a9daf46b6379705f3b88076206ecac68600bd04a35e7872440b | ||
| SHA512 (kernel-abi-stablelists-6.18.13.tar.xz) = 69bbcdd86ae7999b19de306c29bc5cef442e309a8b033900c10a206a97d61b8b4e6d7c6baf6d356daf14e85766bd6a31120b54cfd1eb1c773450e44bae5d2d9b | ||
| SHA512 (kernel-kabi-dw-6.18.13.tar.xz) = 6473ea636d813e602a59d7332255c4b4597032501a2ed0507985800500451065618a0b6909663e3dc8db2b75c6f4ba10d498dbc41a3b42758cae38f30ca13115 | ||
| SHA512 (kernel-6.18.39.1.tar.gz) = cd70c68662ae5fca906a45d2feae1e4cdaed63b0427856f46cbfa6398f2e4b32b6a233f05ea49b359abf9119b0644177637b9638ec773b1d26e8725db042e0c5 | ||
| SHA512 (open-gpu-kernel-modules-595.58.03.tar.gz) = a422b6935209d590f57fa6766f59bb207d9130f8a6777af9245c4ff8cd0f4c4ccef4602a0b26d543e1e8efba24241180992fdb749ea4e5d2aa5218a584b85101 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.