X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=1c6f04b98139fcae30b71c5ec8c2a9b35e507a5a;hb=77badeaa52a7e50e2d7791f016f5509dca0dd8ce;hp=f9184be8b8868c43300921f3c222c52fec2ac27f;hpb=5a25f3eaeda799b15dcf2733b70e2a9dafdc1361;p=packages%2Fkernel.git

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index f9184be..1c6f04b 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -4,7 +4,7 @@
 %bcond_with	verbose		# verbose build (V=1)
 
 %define		basever		3.10
-%define		postver		10
+%define		postver		30
 %define		rel		1
 
 %define		alt_kernel	3.10-vanilla
@@ -29,8 +29,8 @@ Group:		Base/Kernel
 Source0:	http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5:	4f25cd5bec5f8d5a7d935b3f2ccb8481
 %if "%{postver}" != "0"
-Source1:	http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Source1-md5:	ddd333aefb490bfff4c86941c9409657
+Source1:	http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
+# Source1-md5:	92d1c88be148a9b3683b28902ffd055b
 %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}}"