diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index 11c569a0ac9..f8ed91bd0e9 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -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 - 5.15.32.1-2 +- Bump release number to match kernel release + * Fri Apr 08 2022 Neha Agarwal - 5.15.32.1-1 - Update source to 5.15.32.1 @@ -274,7 +277,7 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg * Thu May 20 2021 Nicolas Ontiveros - 5.10.32.1-4 - Recalculate sha512hmac on signed kernel binary -* Tue May 17 2021 Andrew Phelps - 5.10.32.1-3 +* Mon May 17 2021 Andrew Phelps - 5.10.32.1-3 - Update to kernel release 5.10.32.1-3 * Thu May 13 2021 Rachel Menge - 5.10.32.1-2 diff --git a/SPECS/hyperv-daemons/hyperv-daemons.spec b/SPECS/hyperv-daemons/hyperv-daemons.spec index 71474247e2c..97835dd0eb8 100644 --- a/SPECS/hyperv-daemons/hyperv-daemons.spec +++ b/SPECS/hyperv-daemons/hyperv-daemons.spec @@ -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 - 5.15.32.1-2 +- Bump release number to match kernel release + * Fri Apr 08 2022 Neha Agarwal - 5.15.32.1-1 - Update source to 5.15.32.1 diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index 7318f154d5e..eacbc5a1f1b 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -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 - 5.15.32.1-2 +- Bump release number to match kernel release + * Fri Apr 08 2022 Neha Agarwal - 5.15.32.1-1 - Update source to 5.15.32.1 diff --git a/SPECS/kernel-rt/kernel-rt.spec b/SPECS/kernel-rt/kernel-rt.spec index 2ee9f901b2f..bc070617286 100644 --- a/SPECS/kernel-rt/kernel-rt.spec +++ b/SPECS/kernel-rt/kernel-rt.spec @@ -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 @@ -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 @@ -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} @@ -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} @@ -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,11 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Tue Apr 12 2022 Andrew Phelps - 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 - 5.15.32.1-1 - Update source to 5.15.32.1 diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 5bf1b2cd5a6..32010a11545 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -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 @@ -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 @@ -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} @@ -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} @@ -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) @@ -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 @@ -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 - 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 - 5.15.32.1-1 - Update source to 5.15.32.1 - Address CVES: 2022-0516, 2022-26878, 2022-27223, 2022-24958, 2022-0742, diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 53d3fc5acfc..047f1f39bae 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -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 diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 1982a276969..6562ae0cc05 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -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 diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 5944e6216b8..2d84959c778 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -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 diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 597722cc178..f6d4af5263a 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -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