X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=6bc940be1779c4fbc0eac46d8b91a6e13b878535;hb=edfdcb579c117cb6d7ef2509d8741cfd5b37f95d;hp=0939301d3e418ec4a7924aa93e7f11bc98e5d5a9;hpb=8b791d5dd33063ee38bdeb7cc3f0afa4b69c0a0e;p=packages%2Fkernel.git diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 0939301..6bc940b 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -5,7 +5,7 @@ %{?debug:%define with_verbose 1} %define _basever 3.2 -%define _postver .44 +%define _postver .52 %define _rel 1 %define _enable_debug_packages 0 @@ -32,8 +32,8 @@ Group: Base/Kernel 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}.xz -# Source1-md5: 39b024f9310bbb42fa062eea82fc0c78 +Source1: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2 +# 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:-no})" = "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