X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=dbb29acf556ebd6c6f8f0abe74008e39d3b174a0;hb=42287055e0a4c0fdd1fc70b6145102a39b7e3ed1;hp=bb7733174b34d91633d48414a58d6892680b60fa;hpb=225b1997b3468fa4cff390e017aabdd6a29edabd;p=packages%2Fkernel.git

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index bb77331..dbb29ac 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.11
-%define		postver		2
+%define		basever		3.15
+%define		postver		8
 %define		rel		1
 
-%define		alt_kernel	3.11-vanilla
+%define		alt_kernel	3.15-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:	fea363551ff45fbe4cb88497b863b261
+# Source0-md5:	97ca1625bb40368dc41b9a7971549071
 %if "%{postver}" != "0"
-Source1:	http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Source1-md5:	b45886c68a577fe1b7f43f2e897c0afa
+Source1:	http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
+# Source1-md5:	f1d3ed3137ecbb37ec520748bd65dac0
 %endif
 
 Source2:	kernel.sysconfig
@@ -49,7 +49,7 @@ AutoReqProv:	no
 BuildRequires:	hostname
 BuildRequires:	kmod
 BuildRequires:	perl-base
-BuildRequires:	rpm-build >= 4.5-24
+BuildRequires:	rpm >= 4.5-74
 BuildRequires:	rpmbuild(macros) >= 1.652
 Requires(post):	coreutils
 Requires(post):	geninitrd >= 12639-1
@@ -357,7 +357,7 @@ ln -s %{SOURCE4} Makefile
 cd linux-%{basever}
 
 %if "%{postver}" != "0"
-%{__bzip2} -dc %{SOURCE1} | patch -p1 -s
+%{__xz} -dc %{SOURCE1} | patch -p1 -s
 %endif
 
 # Fix EXTRAVERSION in main Makefile
@@ -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:-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: %{alt_kernel}}"