[packages/kernel] - better readability/simplify alt_kernel macro forest in post scriptlets

baggins baggins at pld-linux.org
Wed Apr 10 08:32:27 CEST 2013


commit b400362c283118633cf754dfc8e4f0de963687fd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Apr 10 08:31:39 2013 +0200

    - better readability/simplify alt_kernel macro forest in post scriptlets

 kernel.spec | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 42eaf8f..a9eb3a5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1016,18 +1016,22 @@ fi
 %post
 %ifarch ia64
 mv -f /boot/efi/vmlinuz{,.old} 2> /dev/null
-%{?alt_kernel:mv -f /boot/efi/vmlinuz%{_alt_kernel}{,.old} 2> /dev/null}
 ln -sf vmlinuz-%{kernel_release} /boot/efi/vmlinuz
-%{?alt_kernel:ln -sf vmlinuz-%{kernel_release} /boot/efi/vmlinuz%{_alt_kernel}}
+%if 0%{?alt_kernel:1}
+mv -f /boot/efi/vmlinuz%{_alt_kernel}{,.old} 2> /dev/null
+ln -sf vmlinuz-%{kernel_release} /boot/efi/vmlinuz%{_alt_kernel}
+%endif
 %endif
 mv -f /boot/vmlinuz{,.old} 2> /dev/null
-%{?alt_kernel:mv -f /boot/vmlinuz%{_alt_kernel}{,.old} 2> /dev/null}
 mv -f /boot/System.map{,.old} 2> /dev/null
-%{?alt_kernel:mv -f /boot/System%{_alt_kernel}.map{,.old} 2> /dev/null}
 ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz
-%{?alt_kernel:ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz%{_alt_kernel}}
 ln -sf System.map-%{kernel_release} /boot/System.map
-%{?alt_kernel:ln -sf System.map-%{kernel_release} /boot/System.map%{_alt_kernel}}
+%if 0%{?alt_kernel:1}
+mv -f /boot/vmlinuz%{_alt_kernel}{,.old} 2> /dev/null
+mv -f /boot/System%{_alt_kernel}.map{,.old} 2> /dev/null
+ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz%{_alt_kernel}
+ln -sf System.map-%{kernel_release} /boot/System.map%{_alt_kernel}
+%endif
 
 %depmod %{kernel_release}
 
@@ -1035,9 +1039,11 @@ ln -sf System.map-%{kernel_release} /boot/System.map
 # generate initrd after all dependant modules are installed
 /sbin/geninitrd -f --initrdfs=initramfs %{initrd_dir}/initrd-%{kernel_release}.gz %{kernel_release}
 mv -f %{initrd_dir}/initrd{,.old} 2> /dev/null
-%{?alt_kernel:mv -f %{initrd_dir}/initrd%{_alt_kernel}{,.old} 2> /dev/null}
 ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd
-%{?alt_kernel:ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd%{_alt_kernel}}
+%if 0%{?alt_kernel:1}
+mv -f %{initrd_dir}/initrd%{_alt_kernel}{,.old} 2> /dev/null
+ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd%{_alt_kernel}
+%endif
 
 # if dracut is present then generate full-featured initramfs
 if [ -x /sbin/dracut ]; then
@@ -1059,9 +1065,11 @@ fi
 
 %post vmlinux
 mv -f /boot/vmlinux{,.old} 2> /dev/null
-%{?alt_kernel:mv -f /boot/vmlinux-%{alt_kernel}{,.old} 2> /dev/null}
 ln -sf vmlinux-%{kernel_release} /boot/vmlinux
-%{?alt_kernel:ln -sf vmlinux-%{kernel_release} /boot/vmlinux-%{alt_kernel}}
+%if 0%{?alt_kernel:1}
+mv -f /boot/vmlinux-%{alt_kernel}{,.old} 2> /dev/null
+ln -sf vmlinux-%{kernel_release} /boot/vmlinux-%{alt_kernel}
+%endif
 
 %post drm
 %depmod %{kernel_release}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/b400362c283118633cf754dfc8e4f0de963687fd



More information about the pld-cvs-commit mailing list