X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=8929dcfb151bd513aaf368c966c8f929c064f878;hb=af3a81fcf3f987dcfdc7fbedae5e28616e8e33a0;hp=f1381261229fe70dbe7d54fa96c9444d8319bb3b;hpb=83b0c42601d2152fd99bcb172b2f4ed111d41b77;p=packages%2Fkernel.git

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index f138126..8929dcf 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -3,17 +3,17 @@
 %bcond_without	doc		# don't build kernel-doc package
 %bcond_with	verbose		# verbose build (V=1)
 
-%define		basever		3.8
-%define		postver		.8
+%define		basever		3.9
+%define		postver		0
 %define		rel		1
 
-%define		alt_kernel	3.8-vanilla
+%define		alt_kernel	3.9-vanilla
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
 # localversion is just that without version for "> localversion"
 %define		localversion	%{rel}
-%define		kernel_release	%{version}%{?alt_kernel:.%{alt_kernel}}-%{localversion}
+%define		kernel_release	%{version}%{?alt_kernel:-%{alt_kernel}}-%{localversion}
 
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -21,22 +21,25 @@ Summary(et.UTF-8):	Linuxi kernel (ehk operatsioonisüsteemi tuum)
 Summary(fr.UTF-8):	Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl.UTF-8):	Jądro Linuksa
 Name:		kernel%{_alt_kernel}
-Version:	%{basever}%{postver}
+Version:	%{basever}.%{postver}
 Release:	%{rel}
 Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
-# Source0-md5:	1c738edfc54e7c65faeb90c436104e2f
-%if "%{_postver}" != "%{nil}"
+# Source0-md5:	4348c9b6b2eb3144d601e87c19d5d909
+%if "%{postver}" != "0"
 Source1:	http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Source1-md5:	95224572ecb1f4c7089683c1f06ef2b4
+# Source1-md5:	435773d254894e5be7ed79b8060261a9
 %endif
 
 Source2:	kernel.sysconfig
 Source3:	kernel-module-build.pl
 Source4:	kernel.make
 
+Source10:	kernel-vanilla-x86.config
+Source11:	kernel-vanilla-x86_64.config
+
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 3:2.18
 BuildRequires:	/sbin/depmod
@@ -353,12 +356,12 @@ ln -s %{SOURCE3} kernel-module-build.pl
 ln -s %{SOURCE4} Makefile
 cd linux-%{basever}
 
-%if "%{_postver}" != "%{nil}"
+%if "%{postver}" != "0"
 %{__bzip2} -dc %{SOURCE1} | patch -p1 -s
 %endif
 
 # Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{?alt_kernel:.%{alt_kernel}}#g' Makefile
+sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{?alt_kernel:-%{alt_kernel}}#g' Makefile
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -380,12 +383,12 @@ EOF
 cd %{objdir}
 install -d arch/%{target_arch_dir}
 %ifarch i686
-%define         kernel_config           kernel-%{alt_kernel}-x86.config
-%else
-%define         kernel_config           kernel-%{alt_kernel}-%{_target_base_arch}.config
+	cat %{SOURCE10} > %{defconfig}
+%endif
+%ifarch x86_64
+	cat %{SOURCE11} > %{defconfig}
 %endif
-echo "Building config file using %{kernel_config}..."
-cat $RPM_SOURCE_DIR/%{kernel_config} > %{defconfig}
+sed -i "s:CONFIG_LOCALVERSION=\"\":CONFIG_LOCALVERSION=\"-%{localversion}\":" %{defconfig}
 
 ln -sf %{defconfig} .config
 cd -
@@ -773,6 +776,7 @@ fi
 %{_kernelsrcdir}/arch/m68k/install.sh
 %{_kernelsrcdir}/arch/parisc/install.sh
 %{_kernelsrcdir}/arch/x86/ia32/[!M]*
+%{_kernelsrcdir}/arch/arm/kvm
 %{_kernelsrcdir}/arch/ia64/kvm
 %{_kernelsrcdir}/arch/powerpc/kvm
 %{_kernelsrcdir}/arch/s390/kvm