X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=02cc1d52c0e1f145e8421344d95bc9cbff87009a;hb=f244df513043b8fd18c49ab53de9a08980e5d453;hp=50d62a91be21edc4e9869e03a3d6392ab9717eb7;hpb=6759ba3fd8f9258e808736ecc2323d64b9cab635;p=packages%2Fkernel.git

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 50d62a9..02cc1d5 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -3,11 +3,11 @@
 %bcond_without	doc		# don't build kernel-doc package
 %bcond_with	verbose		# verbose build (V=1)
 
-%define		basever		3.9
-%define		postver		6
+%define		basever		3.10
+%define		postver		18
 %define		rel		1
 
-%define		alt_kernel	3.9-vanilla
+%define		alt_kernel	3.10-vanilla
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -27,10 +27,10 @@ Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
-# Source0-md5:	4348c9b6b2eb3144d601e87c19d5d909
+# Source0-md5:	4f25cd5bec5f8d5a7d935b3f2ccb8481
 %if "%{postver}" != "0"
 Source1:	http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Source1-md5:	798662354c06bec2a872076da53375c3
+# Source1-md5:	f92a506c0c93813b4b79f79fa6a61e74
 %endif
 
 Source2:	kernel.sysconfig
@@ -526,8 +526,8 @@ fi
 
 %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 --initrdfs=initramfs %{initrd_dir}/initrd-%{kernel_release}.img %{kernel_release}
 fi
 
@@ -537,9 +537,10 @@ if [[ "$USE_DRACUT" != [Nn][Oo] ]] && [ -x /sbin/dracut ]; then
 fi
 
 # update boot loaders
-[ -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: %{alt_kernel}}"
@@ -778,6 +779,7 @@ fi
 %{_kernelsrcdir}/arch/x86/ia32/[!M]*
 %{_kernelsrcdir}/arch/arm/kvm
 %{_kernelsrcdir}/arch/ia64/kvm
+%{_kernelsrcdir}/arch/mips/kvm
 %{_kernelsrcdir}/arch/powerpc/kvm
 %{_kernelsrcdir}/arch/s390/kvm
 %{_kernelsrcdir}/arch/x86/kvm