X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=d0911884e514bc5169318a88f16ed4888a3008ff;hb=7158297ed3acc50c1d66e1a5416ec37fb18fef39;hp=6718a62edc3c081a83463a860891a04519cc48e9;hpb=1d22bfac457158773771542dd84e01f8e4ab93c5;p=packages%2Fkernel.git

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 6718a62..d091188 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -3,9 +3,9 @@
 %bcond_without	doc		# don't build kernel-doc package
 %bcond_with	verbose		# verbose build (V=1)
 
-%define		rel		1
 %define		basever		3.8
 %define		postver		.8
+%define		rel		1
 
 %define		alt_kernel	3.8-vanilla
 
@@ -13,7 +13,7 @@
 # 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)
@@ -37,6 +37,9 @@ 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
@@ -358,7 +361,7 @@ cd linux-%{basever}
 %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 -