-
Notifications
You must be signed in to change notification settings - Fork 602
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.
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
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
bac734c
fix kernel debug symbol issue
anphel31 553f201
update kernel-headers
anphel31 3300bf3
update hyperv-daemons and kernel-rt
anphel31 798021e
fix typo in specs
anphel31 d391c2d
remove xerces-c-devel BR from kernel
anphel31 4e2a679
Merge branch 'main' into anphel/fix-kernel-debug
anphel31 948f30d
exclude debug folder from main kernel package. fix bogus date in chan…
anphel31 4947d67
Merge branch 'anphel/fix-kernel-debug' of github.com:microsoft/CBL-Ma…
anphel31 f0db16a
remove aarch64 exclude workaround. use /usr/lib/debug
anphel31 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -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 | ||
|
|
||
|
|
||
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 |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -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 | ||
|
|
||
|
|
||
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,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 | ||
|
|
@@ -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 | ||
|
|
||
|
|
||
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 |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -260,6 +260,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 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} | ||
|
|
@@ -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 | ||
|
|
@@ -349,6 +353,10 @@ 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 tools subpackage. | ||
|
|
||
| * Fri Apr 08 2022 Neha Agarwal <[email protected]> - 5.15.32.1-1 | ||
| - Update source to 5.15.32.1 | ||
|
|
||
|
|
||
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 |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -313,6 +313,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 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} | ||
|
|
@@ -385,6 +388,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 | ||
|
|
@@ -415,6 +419,10 @@ 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 tools subpackage. | ||
|
|
||
| * 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, | ||
|
|
||
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
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.