X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=f9f08368669634fd5758f82c7bcb963e1fd980ec;hb=8acdb24821c16f6ad38862fe2d7b8ea53b54bcc6;hp=0060772e56ba9229565e2b2198d346c6dd7dcece;hpb=1ceb87961a5e928ad4cc54af982bfef5bf48f7ab;p=packages%2Fkernel.git diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 0060772..f9f0836 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -5,8 +5,8 @@ %{?debug:%define with_verbose 1} %define _basever 3.4 -%define _postver .41 -%define _rel 2 +%define _postver .68 +%define _rel 1 %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: 967f72983655e2479f951195953e8480 %if "%{_postver}" != "%{nil}" Source1: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2 -# Source1-md5: 48af478d8be7351ad4c2f362fecf7a0e +# Source1-md5: 18e6716ed0f8c80c1177bc04705544ab %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 @@ -703,8 +704,15 @@ fi %{_kernelsrcdir}/localversion %{_kernelsrcdir}/arch/*/kernel/asm-offsets* %{_kernelsrcdir}/arch/*/kernel/sigframe*.h +%{_kernelsrcdir}/arch/x86/syscalls/*.tbl +%{_kernelsrcdir}/arch/x86/syscalls/*.sh +%{_kernelsrcdir}/arch/x86/tools/relocs.c %{_kernelsrcdir}/drivers/lguest/lg.h %{_kernelsrcdir}/kernel/bounds.c +%dir %{_kernelsrcdir}/tools +%dir %{_kernelsrcdir}/tools/include +%dir %{_kernelsrcdir}/tools/include/tools +%{_kernelsrcdir}/tools/include/tools/*.h %dir %{_kernelsrcdir}/scripts %dir %{_kernelsrcdir}/scripts/kconfig %{_kernelsrcdir}/scripts/Kbuild.include @@ -769,7 +777,7 @@ fi %exclude %{_kernelsrcdir}/scripts/*.sh %{_kernelsrcdir}/sound %{_kernelsrcdir}/security -%{_kernelsrcdir}/tools +%{_kernelsrcdir}/tools/* %{_kernelsrcdir}/usr %{_kernelsrcdir}/virt %{_kernelsrcdir}/COPYING