Skip to content

Fix kernel debug build hang #2720

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 9 commits into from
Apr 16, 2022
Merged

Fix kernel debug build hang #2720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bac734c
fix kernel debug symbol issue
anphel31 Apr 13, 2022
553f201
update kernel-headers
anphel31 Apr 13, 2022
3300bf3
update hyperv-daemons and kernel-rt
anphel31 Apr 13, 2022
798021e
fix typo in specs
anphel31 Apr 13, 2022
d391c2d
remove xerces-c-devel BR from kernel
anphel31 Apr 15, 2022
4e2a679
Merge branch 'main' into anphel/fix-kernel-debug
anphel31 Apr 15, 2022
948f30d
exclude debug folder from main kernel package. fix bogus date in chan…
anphel31 Apr 15, 2022
4947d67
Merge branch 'anphel/fix-kernel-debug' of github.com:microsoft/CBL-Ma…
anphel31 Apr 15, 2022
f0db16a
remove aarch64 exclude workaround. use /usr/lib/debug
anphel31 Apr 16, 2022
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: 5 additions & 2 deletions SPECS-SIGNED/kernel-signed/kernel-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 5.15.32.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /module_info.ld

%changelog
* Tue Apr 12 2022 Andrew Phelps <[email protected]> - 5.15.32.1-2
- Bump release number to match kernel release

* Fri Apr 08 2022 Neha Agarwal <[email protected]> - 5.15.32.1-1
- Update source to 5.15.32.1

Expand Down Expand Up @@ -274,7 +277,7 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
* Thu May 20 2021 Nicolas Ontiveros <[email protected]> - 5.10.32.1-4
- Recalculate sha512hmac on signed kernel binary

* Tue May 17 2021 Andrew Phelps <[email protected]> - 5.10.32.1-3
* Mon May 17 2021 Andrew Phelps <[email protected]> - 5.10.32.1-3
- Update to kernel release 5.10.32.1-3

* Thu May 13 2021 Rachel Menge <[email protected]> - 5.10.32.1-2
Expand Down
5 changes: 4 additions & 1 deletion SPECS/hyperv-daemons/hyperv-daemons.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Summary: Hyper-V daemons suite
Name: hyperv-daemons
Version: 5.15.32.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -219,6 +219,9 @@ fi
%{_sbindir}/lsvmbus

%changelog
* Tue Apr 12 2022 Andrew Phelps <[email protected]> - 5.15.32.1-2
- Bump release number to match kernel release

* Fri Apr 08 2022 Neha Agarwal <[email protected]> - 5.15.32.1-1
- Update source to 5.15.32.1

Expand Down
5 changes: 4 additions & 1 deletion SPECS/kernel-headers/kernel-headers.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Linux API header files
Name: kernel-headers
Version: 5.15.32.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -37,6 +37,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir}
%{_includedir}/*

%changelog
* Tue Apr 12 2022 Andrew Phelps <[email protected]> - 5.15.32.1-2
- Bump release number to match kernel release

* Fri Apr 08 2022 Neha Agarwal <[email protected]> - 5.15.32.1-1
- Update source to 5.15.32.1

Expand Down
13 changes: 11 additions & 2 deletions SPECS/kernel-rt/kernel-rt.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Summary: Realtime Linux Kernel
Name: kernel-rt
Version: 5.15.32.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -44,7 +44,6 @@ BuildRequires: pam-devel
BuildRequires: procps-ng-devel
BuildRequires: python3-devel
BuildRequires: sed
BuildRequires: xerces-c-devel
Requires: filesystem
Requires: kmod
Requires(post): coreutils
Expand Down Expand Up @@ -260,6 +259,9 @@ make -C tools/perf DESTDIR=%{buildroot} prefix=%{_prefix} install-python_ext
# Install bpftool
make -C tools/bpf/bpftool DESTDIR=%{buildroot} prefix=%{_prefix} bash_compdir=%{_sysconfdir}/bash_completion.d/ mandir=%{_mandir} install

# Remove trace (symlink to perf). This file creates duplicate identical debug symbols
rm -vf %{buildroot}%{_bindir}/trace

%triggerin -- initramfs
mkdir -p %{_localstatedir}/lib/rpm-state/initramfs/pending
touch %{_localstatedir}/lib/rpm-state/initramfs/pending/%{uname_r}
Expand Down Expand Up @@ -294,6 +296,7 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%files
%defattr(-,root,root)
%license COPYING
%exclude %dir /usr/lib/debug
/boot/System.map-%{uname_r}
/boot/config-%{uname_r}
/boot/vmlinuz-%{uname_r}
Expand Down Expand Up @@ -328,6 +331,7 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%files tools
%defattr(-,root,root)
%{_libexecdir}
%exclude %dir %{_libdir}/debug
%ifarch x86_64
%{_lib64dir}/traceevent
%{_lib64dir}/libperf-jvmti.so
Expand All @@ -349,6 +353,11 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Tue Apr 12 2022 Andrew Phelps <[email protected]> - 5.15.32.1-2
- Remove trace symlink from _bindir
- Exclude files and directories under the debug folder from kernel and kernel-tools packages
- Remove BR for xerces-c-devel

* Fri Apr 08 2022 Neha Agarwal <[email protected]> - 5.15.32.1-1
- Update source to 5.15.32.1

Expand Down
17 changes: 11 additions & 6 deletions SPECS/kernel/kernel.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Summary: Linux Kernel
Name: kernel
Version: 5.15.32.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -84,7 +84,6 @@ BuildRequires: pam-devel
BuildRequires: procps-ng-devel
BuildRequires: python3-devel
BuildRequires: sed
BuildRequires: xerces-c-devel
Requires: filesystem
Requires: kmod
Requires(post): coreutils
Expand Down Expand Up @@ -313,6 +312,9 @@ make -C tools/perf DESTDIR=%{buildroot} prefix=%{_prefix} install-python_ext
# Install bpftool
make -C tools/bpf/bpftool DESTDIR=%{buildroot} prefix=%{_prefix} bash_compdir=%{_sysconfdir}/bash_completion.d/ mandir=%{_mandir} install

# Remove trace (symlink to perf). This file causes duplicate identical debug symbols
rm -vf %{buildroot}%{_bindir}/trace

%triggerin -- initramfs
mkdir -p %{_localstatedir}/lib/rpm-state/initramfs/pending
touch %{_localstatedir}/lib/rpm-state/initramfs/pending/%{uname_r}
Expand Down Expand Up @@ -347,6 +349,7 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%files
%defattr(-,root,root)
%license COPYING
%exclude %dir /usr/lib/debug
/boot/System.map-%{uname_r}
/boot/config-%{uname_r}
/boot/vmlinuz-%{uname_r}
Expand All @@ -360,10 +363,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /lib/modules/%{uname_r}/kernel/drivers/accessibility
%exclude /lib/modules/%{uname_r}/kernel/drivers/gpu
%exclude /lib/modules/%{uname_r}/kernel/sound
%ifarch aarch64
%exclude /usr/lib/debug/lib/modules/%{uname_r}/vmlinux-%{uname_r}
%exclude /usr/lib/debug/lib/modules/%{uname_r}/vmlinux
%endif

%files docs
%defattr(-,root,root)
Expand All @@ -385,6 +384,7 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%files tools
%defattr(-,root,root)
%{_libexecdir}
%exclude %dir %{_libdir}/debug
%ifarch x86_64
%{_lib64dir}/traceevent
%{_lib64dir}/libperf-jvmti.so
Expand Down Expand Up @@ -415,6 +415,11 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Tue Apr 12 2022 Andrew Phelps <[email protected]> - 5.15.32.1-2
- Remove trace symlink from _bindir
- Exclude files and directories under the debug folder from kernel and kernel-tools packages
- Remove BR for xerces-c-devel

* Fri Apr 08 2022 Neha Agarwal <[email protected]> - 5.15.32.1-1
- Update source to 5.15.32.1
- Address CVES: 2022-0516, 2022-26878, 2022-27223, 2022-24958, 2022-0742,
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-8.cm2.aarch64.rpm
kernel-headers-5.15.32.1-1.cm2.noarch.rpm
kernel-headers-5.15.32.1-2.cm2.noarch.rpm
glibc-2.35-1.cm2.aarch64.rpm
glibc-devel-2.35-1.cm2.aarch64.rpm
glibc-i18n-2.35-1.cm2.aarch64.rpm
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-8.cm2.x86_64.rpm
kernel-headers-5.15.32.1-1.cm2.noarch.rpm
kernel-headers-5.15.32.1-2.cm2.noarch.rpm
glibc-2.35-1.cm2.x86_64.rpm
glibc-devel-2.35-1.cm2.x86_64.rpm
glibc-i18n-2.35-1.cm2.x86_64.rpm
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/toolchain_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
itstool-2.0.6-4.cm2.noarch.rpm
kbd-2.2.0-1.cm2.aarch64.rpm
kbd-debuginfo-2.2.0-1.cm2.aarch64.rpm
kernel-headers-5.15.32.1-1.cm2.noarch.rpm
kernel-headers-5.15.32.1-2.cm2.noarch.rpm
kmod-29-1.cm2.aarch64.rpm
kmod-debuginfo-29-1.cm2.aarch64.rpm
kmod-devel-29-1.cm2.aarch64.rpm
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/toolchain_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
itstool-2.0.6-4.cm2.noarch.rpm
kbd-2.2.0-1.cm2.x86_64.rpm
kbd-debuginfo-2.2.0-1.cm2.x86_64.rpm
kernel-headers-5.15.32.1-1.cm2.noarch.rpm
kernel-headers-5.15.32.1-2.cm2.noarch.rpm
kmod-29-1.cm2.x86_64.rpm
kmod-debuginfo-29-1.cm2.x86_64.rpm
kmod-devel-29-1.cm2.x86_64.rpm
Expand Down