folkslinux
/
CBL-Mariner
mirror of https://github.com/microsoft/CBL-Mariner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add libperf-jvmti.so to tools package (#2075) 

As a result of the new install method for msopenjdk (from 40d19ce9b9),
the libperf-jvmti.so is now available and can be added to the tools
package
This commit is contained in:
rlmenge 2022-02-02 16:00:21 -08:00 committed by GitHub
parent fc815fb6c4
commit 3398b7ccd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SPECS-SIGNED/kernel-signed/kernel-signed.spec
View File

@ -10,7 +10,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 5.15.2.1
Release: 3%{?dist}
Release: 4%{?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
* Wed Feb 02 2022 Rachel Menge <rachelmenge@microsoft.com> - 5.15.2.1-4
- Bump release number to match kernel release
* Thu Jan 27 2022 Daniel Mihai <dmihai@microsoft.com> - 5.15.2.1-3
- Bump release number to match kernel release

5
SPECS/kernel-headers/kernel-headers.spec
View File

@ -1,7 +1,7 @@
Summary: Linux API header files
Name: kernel-headers
Version: 5.15.2.1
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -39,6 +39,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir}
%{_includedir}/*
%changelog
* Wed Feb 02 2022 Rachel Menge <rachelmenge@microsoft.com> - 5.15.2.1-4
- Bump release number to match kernel release
* Thu Jan 27 2022 Daniel Mihai <dmihai@microsoft.com> - 5.15.2.1-3
- Bump release number to match kernel release

6
SPECS/kernel-hyperv/kernel-hyperv.spec
View File

@ -4,7 +4,7 @@
Summary: Linux Kernel optimized for Hyper-V
Name: kernel-hyperv
Version: 5.15.2.1
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -245,6 +245,7 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%defattr(-,root,root)
%{_libexecdir}
%{_lib64dir}/traceevent
%{_lib64dir}/libperf-jvmti.so
%{_bindir}
%{_sysconfdir}/bash_completion.d/*
%{_datadir}/perf-core/strace/groups/file
@ -255,6 +256,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_includedir}/perf/perf_dlfilter.h
%changelog
* Wed Feb 02 2022 Rachel Menge <rachelmenge@microsoft.com> - 5.15.2.1-4
- Add libperf-jvmti.so to tools package
* Thu Jan 27 2022 Dan Mihai <dmihai@microsoft.com> - 5.15.2.1-3
- Bump release number to match kernel release

7
SPECS/kernel/kernel.spec
View File

@ -7,7 +7,7 @@
Summary: Linux Kernel
Name: kernel
Version: 5.15.2.1
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -347,9 +347,11 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_libexecdir}
%ifarch x86_64
%{_lib64dir}/traceevent
%{_lib64dir}/libperf-jvmti.so
%endif
%ifarch aarch64
%{_libdir}/traceevent
%{_libdir}/libperf-jvmti.so
%endif
%{_bindir}
%{_sysconfdir}/bash_completion.d/*
@ -373,6 +375,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool
%changelog
* Wed Feb 02 2022 Rachel Menge <rachelmenge@microsoft.com> - 5.15.2.1-4
- Add libperf-jvmti.so to tools package
* Thu Jan 27 2022 Daniel Mihai <dmihai@microsoft.com> - 5.15.2.1-3
- Enable kdb frontend for kgdb

2
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View File

@ -1,5 +1,5 @@
filesystem-1.1-8.cm2.aarch64.rpm
kernel-headers-5.15.2.1-3.cm2.noarch.rpm
kernel-headers-5.15.2.1-4.cm2.noarch.rpm
glibc-2.34-2.cm2.aarch64.rpm
glibc-devel-2.34-2.cm2.aarch64.rpm
glibc-i18n-2.34-2.cm2.aarch64.rpm

2
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View File

@ -1,5 +1,5 @@
filesystem-1.1-8.cm2.x86_64.rpm
kernel-headers-5.15.2.1-3.cm2.noarch.rpm
kernel-headers-5.15.2.1-4.cm2.noarch.rpm
glibc-2.34-2.cm2.x86_64.rpm
glibc-devel-2.34-2.cm2.x86_64.rpm
glibc-i18n-2.34-2.cm2.x86_64.rpm

2
toolkit/resources/manifests/package/toolchain_aarch64.txt
View File

@ -131,7 +131,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.2.1-3.cm2.noarch.rpm
kernel-headers-5.15.2.1-4.cm2.noarch.rpm
kmod-29-1.cm2.aarch64.rpm
kmod-debuginfo-29-1.cm2.aarch64.rpm
kmod-devel-29-1.cm2.aarch64.rpm

2
toolkit/resources/manifests/package/toolchain_x86_64.txt
View File

@ -131,7 +131,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.2.1-3.cm2.noarch.rpm
kernel-headers-5.15.2.1-4.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