From 4bdb094b9ed2238dc4e6994bacf98a85bdb047b9 Mon Sep 17 00:00:00 2001 From: Jing Zhang Date: Tue, 23 Apr 2024 10:43:39 +0800 Subject: [PATCH] anolis: Fix the warning message when uninstalling the kernel ANBZ: #8620 Remove modules.builtin.alias.bin after built kernel, the same as commit: 375333772562("anolis: spec: remove modules.builtin.alias.bin after built kernel") Then change the files copied to the /boot/ directory to %ghost to avoid warnings about repeatedly deleting these files when the kernel is uninstalled. Signed-off-by: Jing Zhang --- anolis/rpm/kernel.spec.template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/anolis/rpm/kernel.spec.template b/anolis/rpm/kernel.spec.template index 56a4c7051b6d..2e2a4558dcc9 100644 --- a/anolis/rpm/kernel.spec.template +++ b/anolis/rpm/kernel.spec.template @@ -976,7 +976,7 @@ BuildKernel() { # remove files that will be auto generated by depmod at rpm -i time pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/ - rm -f modules.{alias*,builtin.bin,dep*,*map,symbols*,devname,softdep} + rm -f modules.{alias*,builtin.bin,builtin.alias.bin,dep*,*map,symbols*,devname,softdep} popd # Copy the System.map file for depmod to use, and create a backup of the @@ -1010,7 +1010,7 @@ BuildKernel() { # remove files that will be auto generated by depmod at rpm -i time pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/ - rm -f modules.{alias*,builtin.bin,dep*,*map,symbols*,devname,softdep} + rm -f modules.{alias*,builtin.bin,builtin.alias.bin,dep*,*map,symbols*,devname,softdep} popd # Cleanup @@ -1558,12 +1558,12 @@ fi %ghost /%{image_install_path}/dtb-%{KVERREL}%{?2:+%{2}} \ %endif\ %attr(0600, root, root) /lib/modules/%{KVERREL}%{?2:+%{2}}/System.map\ -%attr(0600, root, root) /boot/System.map-%{KVERREL}%{?2:+%{2}}\ +%ghost %attr(0600, root, root) /boot/System.map-%{KVERREL}%{?2:+%{2}}\ /lib/modules/%{KVERREL}%{?2:+%{2}}/symvers.gz\ /lib/modules/%{KVERREL}%{?2:+%{2}}/config\ -%attr(0600, root, root) /boot/symvers-%{KVERREL}%{?2:+%{2}}.gz\ -%attr(0600, root, root) /boot/initramfs-%{KVERREL}%{?2:+%{2}}.img\ -%attr(0644, root, root) /boot/config-%{KVERREL}%{?2:+%{2}}\ +%ghost %attr(0600, root, root) /boot/symvers-%{KVERREL}%{?2:+%{2}}.gz\ +%ghost %attr(0600, root, root) /boot/initramfs-%{KVERREL}%{?2:+%{2}}.img\ +%ghost %attr(0644, root, root) /boot/config-%{KVERREL}%{?2:+%{2}}\ %dir /lib/modules\ %dir /lib/modules/%{KVERREL}%{?2:+%{2}}\ /lib/modules/%{KVERREL}%{?2:+%{2}}/kernel\ -- Gitee