X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=b31a40a09a3f26fc33300e35b256c5dd3f10b2d1;hb=ec0e00b24dc7015b424fdcd5cfce59a97b208820;hp=512a0864ff3080fee6afaf26149587adf559f139;hpb=f7c3ffe32d06fb542da8995139fd19c26aba374c;p=packages%2Fkernel.git diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 512a086..b31a40a 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -5,8 +5,8 @@ %{?debug:%define with_verbose 1} %define _basever 3.2 -%define _postver .44 -%define _rel 1 +%define _postver .52 +%define _rel 2 %define _enable_debug_packages 0 @@ -33,7 +33,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{_basever}.tar.xz # Source0-md5: 364066fa18767ec0ae5f4e4abcf9dc51 %if "%{_postver}" != "%{nil}" Source1: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2 -# Source1-md5: 1f0449a3358ddb9c59fe9ddd6876f522 +# Source1-md5: 12ff4fd955b5e4f5fb9b864c007cc619 %endif Source2: kernel-vanilla-autoconf.h @@ -511,9 +511,10 @@ fi %post %depmod %{kernel_release} +%posttrans [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel +# generate simple initramfs/initrd image if [[ "$USE_GENINITRD" != [Nn][Oo] ]]; then - # generate initrd after all dependant modules are installed /sbin/geninitrd -f %{initrd_dir}/initrd-%{kernel_release}.img %{kernel_release} fi @@ -523,11 +524,11 @@ if [[ "$USE_DRACUT" != [Nn][Oo] ]] && [ -x /sbin/dracut ]; then fi # update boot loader -[ -x /sbin/update-grub -a -f /etc/sysconfig/grub ] && . /etc/sysconfig/grub -if [[ "$UPDATE_GRUB" != [Nn][Oo] ]]; then - /sbin/update-grub +if [ -x /sbin/update-grub -a -f /etc/sysconfig/grub ]; then + if [ "$(. /etc/sysconfig/grub; echo ${UPDATE_GRUB:-yes})" = "yes" ]; then + /sbin/update-grub >/dev/null + fi fi - if [ -x /sbin/new-kernel-pkg ]; then /sbin/new-kernel-pkg --initrdfile=%{initrd_dir}/initrd-%{kernel_release}.img --install %{kernel_release} --banner "TLD Linux %{alt_kernel}" fi @@ -601,6 +602,10 @@ fi /lib/modules/%{kernel_release}/kernel/kernel /lib/modules/%{kernel_release}/kernel/lib +%ifarch x86_64 +/lib/modules/%{kernel_release}/kernel/mm +%endif + /lib/modules/%{kernel_release}/kernel/net %dir /lib/modules/%{kernel_release}/kernel/sound