X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=1e0b79d8b7789e153c95c080887d7ebd6226c0fa;hb=eebba37d3ad36ed87b85c51cac27e2ef8509c225;hp=5214d3fa4bf68fd11208f2d3667e44dac5d0acc6;hpb=ee8cccbb6fb4e855e16d5a4e585a1e1d71084dd1;p=packages%2Fkernel.git

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 5214d3f..1e0b79d 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -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)
@@ -361,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
@@ -383,12 +383,11 @@ 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}
 
 ln -sf %{defconfig} .config
 cd -