kernel: remove unnecessary 10_kernel.cfg grub config file

This commit is contained in:
Dan Streetman 2024-03-19 13:44:44 -04:00
Родитель f006a95a5b
Коммит 60aeb34e4f
8 изменённых файлов: 17 добавлений и 15 удалений

Просмотреть файл

@ -10,7 +10,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 6.6.14.1
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
@ -136,7 +136,6 @@ echo "initrd of kernel %{uname_r} removed" >&2
/boot/config-%{uname_r}
/boot/vmlinuz-%{uname_r}
/boot/.vmlinuz-%{uname_r}.hmac
%config(noreplace) %{_sysconfdir}/default/grub.d/10_kernel.cfg
%defattr(0644,root,root)
/lib/modules/%{uname_r}/*
/lib/modules/%{uname_r}/.vmlinuz.hmac
@ -146,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%exclude /module_info.ld
%changelog
* Tue Mar 19 2024 Dan Streetman <ddstreet@microsoft.com> - 6.6.14.1-5
- remove unnecessary 10_kernel.cfg grub config file
* Wed Mar 06 2024 Chris Gunn <chrisgun@microsoft.com> - 6.6.7.1-4
- Remove /var/lib/initramfs/kernel files.

Просмотреть файл

@ -14,7 +14,7 @@
Summary: Linux API header files
Name: kernel-headers
Version: 6.6.14.1
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
@ -75,6 +75,9 @@ done
%endif
%changelog
* Tue Mar 19 2024 Dan Streetman <ddstreet@microsoft.com> - 6.6.14.1-5
- remove unnecessary 10_kernel.cfg grub config file
* Wed Mar 06 2024 Chris Gunn <chrisgun@microsoft.com> - 6.6.14.1-4
- Bump release to match kernel

Просмотреть файл

@ -1 +0,0 @@
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX init=/lib/systemd/systemd ro"

Просмотреть файл

@ -29,7 +29,7 @@
Summary: Linux Kernel
Name: kernel
Version: 6.6.14.1
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
@ -42,7 +42,6 @@ Source3: sha512hmac-openssl.sh
Source4: cbl-mariner-ca-20211013.pem
Source5: cpupower
Source6: cpupower.service
Source7: 10_kernel.cfg
BuildRequires: audit-devel
BuildRequires: bash
BuildRequires: bc
@ -248,9 +247,6 @@ install -vm 744 vmlinux %{buildroot}%{_libdir}/debug/lib/modules/%{uname_r}/vmli
# `perf test vmlinux` needs it
ln -s vmlinux-%{uname_r} %{buildroot}%{_libdir}/debug/lib/modules/%{uname_r}/vmlinux
# Add kernel boot configurations to /etc/default/grub.d
install -Dm 755 %{SOURCE7} %{buildroot}%{_sysconfdir}/default/grub.d/10_kernel.cfg
# hmac sign the kernel for FIPS
%{sha512hmac} %{buildroot}/boot/vmlinuz-%{uname_r} | sed -e "s,$RPM_BUILD_ROOT,," > %{buildroot}/boot/.vmlinuz-%{uname_r}.hmac
cp %{buildroot}/boot/.vmlinuz-%{uname_r}.hmac %{buildroot}/lib/modules/%{uname_r}/.vmlinuz.hmac
@ -342,7 +338,6 @@ echo "initrd of kernel %{uname_r} removed" >&2
/boot/config-%{uname_r}
/boot/vmlinuz-%{uname_r}
/boot/.vmlinuz-%{uname_r}.hmac
%config(noreplace) %{_sysconfdir}/default/grub.d/10_kernel.cfg
%defattr(0644,root,root)
/lib/modules/%{uname_r}/*
/lib/modules/%{uname_r}/.vmlinuz.hmac
@ -409,6 +404,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%{_sysconfdir}/bash_completion.d/bpftool
%changelog
* Tue Mar 19 2024 Dan Streetman <ddstreet@microsoft.com> - 6.6.14.1-5
- remove unnecessary 10_kernel.cfg grub config file
* Wed Mar 06 2024 Chris Gunn <chrisgun@microsoft.com> - 6.6.14.1-4
- Remove /var/lib/initramfs/kernel files.

Просмотреть файл

@ -1,5 +1,5 @@
filesystem-1.1-20.azl3.aarch64.rpm
kernel-headers-6.6.14.1-4.azl3.noarch.rpm
kernel-headers-6.6.14.1-5.azl3.noarch.rpm
glibc-2.38-3.azl3.aarch64.rpm
glibc-devel-2.38-3.azl3.aarch64.rpm
glibc-i18n-2.38-3.azl3.aarch64.rpm

Просмотреть файл

@ -1,5 +1,5 @@
filesystem-1.1-20.azl3.x86_64.rpm
kernel-headers-6.6.14.1-4.azl3.noarch.rpm
kernel-headers-6.6.14.1-5.azl3.noarch.rpm
glibc-2.38-3.azl3.x86_64.rpm
glibc-devel-2.38-3.azl3.x86_64.rpm
glibc-i18n-2.38-3.azl3.x86_64.rpm

Просмотреть файл

@ -151,7 +151,7 @@ intltool-0.51.0-7.azl3.noarch.rpm
itstool-2.0.7-1.azl3.noarch.rpm
kbd-2.2.0-2.azl3.aarch64.rpm
kbd-debuginfo-2.2.0-2.azl3.aarch64.rpm
kernel-headers-6.6.14.1-4.azl3.noarch.rpm
kernel-headers-6.6.14.1-5.azl3.noarch.rpm
kmod-30-1.azl3.aarch64.rpm
kmod-debuginfo-30-1.azl3.aarch64.rpm
kmod-devel-30-1.azl3.aarch64.rpm

Просмотреть файл

@ -156,8 +156,8 @@ intltool-0.51.0-7.azl3.noarch.rpm
itstool-2.0.7-1.azl3.noarch.rpm
kbd-2.2.0-2.azl3.x86_64.rpm
kbd-debuginfo-2.2.0-2.azl3.x86_64.rpm
kernel-cross-headers-6.6.14.1-4.azl3.noarch.rpm
kernel-headers-6.6.14.1-4.azl3.noarch.rpm
kernel-cross-headers-6.6.14.1-5.azl3.noarch.rpm
kernel-headers-6.6.14.1-5.azl3.noarch.rpm
kmod-30-1.azl3.x86_64.rpm
kmod-debuginfo-30-1.azl3.x86_64.rpm
kmod-devel-30-1.azl3.x86_64.rpm