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

kernel: Update Requires for kernel subpackages

This commit is contained in:
Chris Co 2020-08-19 19:55:22 +00:00
parent 9409d8ee9b
commit d0e924ae02
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SPECS-SIGNED/kernel-signed-aarch64/kernel-signed-aarch64.spec
View File

@ -2,7 +2,7 @@
Summary: Signed Linux Kernel for aarch64 systems Summary: Signed Linux Kernel for aarch64 systems
Name: kernel-signed-aarch64 Name: kernel-signed-aarch64
Version: 5.4.42 Version: 5.4.42
Release: 11%{?dist} Release: 12%{?dist}
License: GPLv2 License: GPLv2
URL: https://github.com/microsoft/WSL2-Linux-Kernel URL: https://github.com/microsoft/WSL2-Linux-Kernel
Group: System Environment/Kernel Group: System Environment/Kernel
@ -80,5 +80,7 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%config %{_localstatedir}/lib/initramfs/kernel/%{uname_r} %config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}
%changelog %changelog
* Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.42-12
- Update release number
* Tue Aug 18 2020 Chris Co <chrco@microsoft.com> 5.4.42-11 * Tue Aug 18 2020 Chris Co <chrco@microsoft.com> 5.4.42-11
- Original version - Original version

4
SPECS-SIGNED/kernel-signed-x64/kernel-signed-x64.spec
View File

@ -2,7 +2,7 @@
Summary: Signed Linux Kernel for x86_64 systems Summary: Signed Linux Kernel for x86_64 systems
Name: kernel-signed-x64 Name: kernel-signed-x64
Version: 5.4.42 Version: 5.4.42
Release: 11%{?dist} Release: 12%{?dist}
License: GPLv2 License: GPLv2
URL: https://github.com/microsoft/WSL2-Linux-Kernel URL: https://github.com/microsoft/WSL2-Linux-Kernel
Group: System Environment/Kernel Group: System Environment/Kernel
@ -80,5 +80,7 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%config %{_localstatedir}/lib/initramfs/kernel/%{uname_r} %config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}
%changelog %changelog
* Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.42-12
- Update release number
* Tue Aug 18 2020 Chris Co <chrco@microsoft.com> 5.4.42-11 * Tue Aug 18 2020 Chris Co <chrco@microsoft.com> 5.4.42-11
- Original version - Original version

12
SPECS/kernel/kernel.spec
View File

@ -2,7 +2,7 @@
Summary: Linux Kernel Summary: Linux Kernel
Name: kernel Name: kernel
Version: 5.4.42 Version: 5.4.42
Release: 11%{?dist} Release: 12%{?dist}
License: GPLv2 License: GPLv2
URL: https://github.com/microsoft/WSL2-Linux-Kernel URL: https://github.com/microsoft/WSL2-Linux-Kernel
Group: System Environment/Kernel Group: System Environment/Kernel
@ -41,7 +41,7 @@ The kernel package contains the Linux kernel.
Summary: Kernel Dev Summary: Kernel Dev
Group: System Environment/Kernel Group: System Environment/Kernel
Obsoletes: linux-dev Obsoletes: linux-dev
Requires: (%{name} = %{version}-%{release} or kernel-signed-x64 = %{version}-%{release} or kernel-signed-aarch64 = %{version}-%{release}) Requires: %{name} = %{version}-%{release}
Requires: python3 gawk Requires: python3 gawk
%description devel %description devel
This package contains the Linux kernel dev files This package contains the Linux kernel dev files
@ -49,7 +49,7 @@ This package contains the Linux kernel dev files
%package drivers-sound %package drivers-sound
Summary: Kernel Sound modules Summary: Kernel Sound modules
Group: System Environment/Kernel Group: System Environment/Kernel
Requires: (%{name} = %{version}-%{release} or kernel-signed-x64 = %{version}-%{release} or kernel-signed-aarch64 = %{version}-%{release}) Requires: %{name} = %{version}-%{release}
%description drivers-sound %description drivers-sound
This package contains the Linux kernel sound support This package contains the Linux kernel sound support
@ -64,7 +64,7 @@ This package contains the Linux kernel doc files
%package oprofile %package oprofile
Summary: Kernel driver for oprofile, a statistical profiler for Linux systems Summary: Kernel driver for oprofile, a statistical profiler for Linux systems
Group: System Environment/Kernel Group: System Environment/Kernel
Requires: (%{name} = %{version}-%{release} or kernel-signed-x64 = %{version}-%{release} or kernel-signed-aarch64 = %{version}-%{release}) Requires: %{name} = %{version}-%{release}
%description oprofile %description oprofile
Kernel driver for oprofile, a statistical profiler for Linux systems Kernel driver for oprofile, a statistical profiler for Linux systems
%endif %endif
@ -72,7 +72,7 @@ Kernel driver for oprofile, a statistical profiler for Linux systems
%package tools %package tools
Summary: This package contains the 'perf' performance analysis tools for Linux kernel Summary: This package contains the 'perf' performance analysis tools for Linux kernel
Group: System/Tools Group: System/Tools
Requires: (%{name} = %{version}-%{release} or kernel-signed-x64 = %{version}-%{release} or kernel-signed-aarch64 = %{version}-%{release}) Requires: %{name} = %{version}-%{release}
Requires: audit Requires: audit
%description tools %description tools
This package contains the 'perf' performance analysis tools for Linux kernel. This package contains the 'perf' performance analysis tools for Linux kernel.
@ -282,6 +282,8 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_libdir}/perf/include/bpf/* %{_libdir}/perf/include/bpf/*
%changelog %changelog
* Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.42-12
- Remove the signed package depends
* Tue Aug 18 2020 Chris Co <chrco@microsoft.com> 5.4.42-11 * Tue Aug 18 2020 Chris Co <chrco@microsoft.com> 5.4.42-11
- Remove signed subpackage - Remove signed subpackage
* Mon Aug 17 2020 Chris Co <chrco@microsoft.com> 5.4.42-10 * Mon Aug 17 2020 Chris Co <chrco@microsoft.com> 5.4.42-10