Skip to content

Prevent stripping of BTF data from kernel modules #13813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 13, 2025
Merged

Prevent stripping of BTF data from kernel modules #13813

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0d502b
Prevent find_debuginfo.sh from removing the BTF section from modules
rlmenge May 16, 2025
c4a6674
Update kernel-ipe and kernel-64k
rlmenge May 16, 2025
222a2ba
Update changelog date
rlmenge Jun 9, 2025
6fbf226
Update changelog errors in kernel-signed
rlmenge Jun 9, 2025
5aaceb7
chore: Update related specs
rlmenge Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion SPECS-EXTENDED/kernel-ipe/kernel-ipe.spec
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,8 @@
%undefine _unique_debug_names
%global _missing_build_ids_terminate_build 1
%global _no_recompute_build_ids 1
# Prevent find_debuginfo.sh from removing the BTF section from modules
%define _find_debuginfo_opts --keep-section '.BTF'

%ifarch x86_64
%define arch x86_64
@@ -31,7 +33,7 @@
Summary: Linux Kernel
Name: kernel-ipe
Version: 6.6.92.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
@@ -451,6 +453,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Mon Jun 09 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.92.2-2
- Prevent debuginfo from stripping BTF data

* Fri May 30 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.92.2-1
- Auto-upgrade to 6.6.92.2

5 changes: 4 additions & 1 deletion SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-64k-signed-%{buildarch}
Version: 6.6.92.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
@@ -105,6 +105,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%exclude /module_info.ld

%changelog
* Mon Jun 09 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.92.2-2
- Bump release to match kernel

* Fri May 30 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.92.2-1
- Auto-upgrade to 6.6.92.2

9 changes: 6 additions & 3 deletions SPECS-SIGNED/kernel-signed/kernel-signed.spec
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 6.6.92.2
Release: 1%{?dist}
Release: 2%{?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
* Mon Jun 09 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.92.2-2
- Bump release to match kernel

* Fri May 30 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.92.2-1
- Auto-upgrade to 6.6.92.2

@@ -376,7 +379,7 @@ echo "initrd of kernel %{uname_r} removed" >&2
* Fri Feb 23 2024 Chris Gunn <chrisgun@microsoft.com> - 6.6.14.1-3
- Rename initrd.img-<kver> to initramfs-<kver>.img

* Tue Jan 30 2024 Cameron Baird <cameronbaird@microsoft.com> - 6.6.14.1-2
* Tue Feb 20 2024 Cameron Baird <cameronbaird@microsoft.com> - 6.6.14.1-2
- Remove legacy /boot/mariner.cfg
- Introduce /etc/default/grub.d/10_kernel.cfg

@@ -419,7 +422,7 @@ echo "initrd of kernel %{uname_r} removed" >&2
* Tue Sep 26 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.133.1-1
- Auto-upgrade to 5.15.133.1

* Tue Sep 22 2023 Cameron Baird <cameronbaird@microsoft.com> - 5.15.131.1-3
* Thu Sep 21 2023 Cameron Baird <cameronbaird@microsoft.com> - 5.15.131.1-3
- Bump release to match kernel

* Wed Sep 20 2023 Jon Slobodzian <joslobo@microsoft.com> - 5.15.131.1-2
5 changes: 4 additions & 1 deletion SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
Summary: Signed Unified Kernel Image for %{buildarch} systems
Name: kernel-uki-signed-%{buildarch}
Version: 6.6.92.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
@@ -68,6 +68,9 @@ popd
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi

%changelog
* Mon Jun 09 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.92.2-2
- Bump release to match kernel

* Fri May 30 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.92.2-1
- Auto-upgrade to 6.6.92.2

7 changes: 6 additions & 1 deletion SPECS/kernel-64k/kernel-64k.spec
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,8 @@
%undefine _unique_debug_names
%global _missing_build_ids_terminate_build 1
%global _no_recompute_build_ids 1
# Prevent find_debuginfo.sh from removing the BTF section from modules
%define _find_debuginfo_opts --keep-section '.BTF'

%ifarch aarch64
%global __provides_exclude_from %{_libdir}/debug/.build-id/
@@ -25,7 +27,7 @@
Summary: Linux Kernel
Name: kernel-64k
Version: 6.6.92.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
@@ -371,6 +373,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Mon Jun 09 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.92.2-2
- Prevent debuginfo from stripping BTF data

* Fri May 30 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.92.2-1
- Auto-upgrade to 6.6.92.2

5 changes: 4 additions & 1 deletion SPECS/kernel-headers/kernel-headers.spec
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
Summary: Linux API header files
Name: kernel-headers
Version: 6.6.92.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
@@ -75,6 +75,9 @@ done
%endif

%changelog
* Mon Jun 09 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.92.2-2
- Bump release to match kernel

* Fri May 30 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.92.2-1
- Auto-upgrade to 6.6.92.2

5 changes: 4 additions & 1 deletion SPECS/kernel/kernel-uki.spec
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
Summary: Unified Kernel Image
Name: kernel-uki
Version: 6.6.92.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
@@ -70,6 +70,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi

%changelog
* Mon Jun 09 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.92.2-2
- Bump release to match kernel

* Fri May 30 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.92.2-1
- Auto-upgrade to 6.6.92.2

7 changes: 6 additions & 1 deletion SPECS/kernel/kernel.spec
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@
%undefine _unique_debug_names
%global _missing_build_ids_terminate_build 1
%global _no_recompute_build_ids 1
# Prevent find_debuginfo.sh from removing the BTF section from modules
%define _find_debuginfo_opts --keep-section '.BTF'

%ifarch x86_64
%define arch x86_64
@@ -30,7 +32,7 @@
Summary: Linux Kernel
Name: kernel
Version: 6.6.92.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
@@ -428,6 +430,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Mon Jun 09 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.92.2-2
- Prevent debuginfo from stripping BTF data

* Fri May 30 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.92.2-1
- Auto-upgrade to 6.6.92.2

2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-21.azl3.aarch64.rpm
kernel-headers-6.6.92.2-1.azl3.noarch.rpm
kernel-headers-6.6.92.2-2.azl3.noarch.rpm
glibc-2.38-10.azl3.aarch64.rpm
glibc-devel-2.38-10.azl3.aarch64.rpm
glibc-i18n-2.38-10.azl3.aarch64.rpm
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-21.azl3.x86_64.rpm
kernel-headers-6.6.92.2-1.azl3.noarch.rpm
kernel-headers-6.6.92.2-2.azl3.noarch.rpm
glibc-2.38-10.azl3.x86_64.rpm
glibc-devel-2.38-10.azl3.x86_64.rpm
glibc-i18n-2.38-10.azl3.x86_64.rpm
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/toolchain_aarch64.txt
View file
Original file line number Diff line number Diff line change
@@ -158,7 +158,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.92.2-1.azl3.noarch.rpm
kernel-headers-6.6.92.2-2.azl3.noarch.rpm
kmod-30-1.azl3.aarch64.rpm
kmod-debuginfo-30-1.azl3.aarch64.rpm
kmod-devel-30-1.azl3.aarch64.rpm
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
View file
Original file line number Diff line number Diff line change
@@ -165,8 +165,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.92.2-1.azl3.noarch.rpm
kernel-headers-6.6.92.2-1.azl3.noarch.rpm
kernel-cross-headers-6.6.92.2-2.azl3.noarch.rpm
kernel-headers-6.6.92.2-2.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
Loading
Oops, something went wrong.