SPECS (Titanium): kernel-vanilla.spec, kernel-bare-grsecurity.spec, kernel-...

hawk hawk at pld-linux.org
Mon Jun 9 21:27:27 CEST 2008


Author: hawk                         Date: Mon Jun  9 19:27:27 2008 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- use proper kernel config, release 3

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.43.2.11.2.50 -> 1.43.2.11.2.51) , kernel-bare-grsecurity.spec (1.1.2.39 -> 1.1.2.40) , kernel-bare-vserver.spec (1.1.2.42 -> 1.1.2.43) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.43.2.11.2.50 SPECS/kernel-vanilla.spec:1.43.2.11.2.51
--- SPECS/kernel-vanilla.spec:1.43.2.11.2.50	Mon Jun  9 19:15:36 2008
+++ SPECS/kernel-vanilla.spec	Mon Jun  9 21:27:21 2008
@@ -15,7 +15,7 @@
 
 %define		_basever		2.6.25
 %define		_postver		.5
-%define		_rel			2
+%define		_rel			3
 
 %define		_enable_debug_packages			0
 
@@ -109,6 +109,12 @@
 %define		target_arch_dir		%{_target_base_arch}
 %endif
 
+%ifarch %{ix86}
+%define		kernel_config		x86
+%else
+%define		kernel_config		%{_target_base_arch}
+%endif
+
 %define		defconfig	arch/%{target_arch_dir}/defconfig
 
 # No ELF objects there to strip (skips processing 27k files)
@@ -428,7 +434,7 @@
 BuildConfig() {
 	%{?debug:set -x}
 	# is this a special kernel we want to build?
-	Config="%{target_arch_dir}"
+	Config="%{kernel_config}"
 	KernelVer=%{kernel_release}
 	echo "Building config file using $Config.conf..."
 	cat $RPM_SOURCE_DIR/kernel-vanilla-$Config.config > %{defconfig}
@@ -460,7 +466,7 @@
 }
 
 PreInstallKernel() {
-	Config="%{target_arch_dir}"
+	Config="%{kernel_config}"
 	KernelVer=%{kernel_release}
 
 	mkdir -p $KERNEL_INSTALL_DIR/boot
@@ -846,6 +852,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43.2.11.2.51  2008-06-09 19:27:21  hawk
+- use proper kernel config, release 3
+
 Revision 1.43.2.11.2.50  2008-06-09 17:15:36  hawk
 - seems to work, release 2
 

================================================================
Index: SPECS/kernel-bare-grsecurity.spec
diff -u SPECS/kernel-bare-grsecurity.spec:1.1.2.39 SPECS/kernel-bare-grsecurity.spec:1.1.2.40
--- SPECS/kernel-bare-grsecurity.spec:1.1.2.39	Mon Jun  9 19:42:38 2008
+++ SPECS/kernel-bare-grsecurity.spec	Mon Jun  9 21:27:21 2008
@@ -16,7 +16,7 @@
 
 %define		_basever		2.6.25
 %define		_postver		.5
-%define		_rel			2
+%define		_rel			3
 
 %define		_enable_debug_packages			0
 
@@ -116,6 +116,12 @@
 %define		target_arch_dir		%{_target_base_arch}
 %endif
 
+%ifarch %{ix86}
+%define		kernel_config		x86
+%else
+%define		kernel_config		%{_target_base_arch}
+%endif
+
 %define		defconfig	arch/%{target_arch_dir}/defconfig
 
 # No ELF objects there to strip (skips processing 27k files)
@@ -449,7 +455,7 @@
 BuildConfig() {
 	%{?debug:set -x}
 	# is this a special kernel we want to build?
-	Config="%{target_arch_dir}"
+	Config="%{kernel_config}"
 	KernelVer=%{kernel_release}
 	echo "Building config file using $Config.conf..."
 	cat $RPM_SOURCE_DIR/kernel-bare-grsecurity-$Config.config > %{defconfig}
@@ -486,7 +492,7 @@
 }
 
 PreInstallKernel() {
-	Config="%{target_arch_dir}"
+	Config="%{kernel_config}"
 	KernelVer=%{kernel_release}
 
 	mkdir -p $KERNEL_INSTALL_DIR/boot
@@ -873,6 +879,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.40  2008-06-09 19:27:21  hawk
+- use proper kernel config, release 3
+
 Revision 1.1.2.39  2008-06-09 17:42:38  hawk
 - reworked from current kernel.spec:LINUX_2_6
 

================================================================
Index: SPECS/kernel-bare-vserver.spec
diff -u SPECS/kernel-bare-vserver.spec:1.1.2.42 SPECS/kernel-bare-vserver.spec:1.1.2.43
--- SPECS/kernel-bare-vserver.spec:1.1.2.42	Mon Jun  9 19:27:56 2008
+++ SPECS/kernel-bare-vserver.spec	Mon Jun  9 21:27:21 2008
@@ -15,7 +15,7 @@
 
 %define		_basever		2.6.25
 %define		_postver		.5
-%define		_rel			2
+%define		_rel			3
 
 %define		_enable_debug_packages			0
 
@@ -116,6 +116,12 @@
 %define		target_arch_dir		%{_target_base_arch}
 %endif
 
+%ifarch %{ix86}
+%define		kernel_config		x86
+%else
+%define		kernel_config		%{_target_base_arch}
+%endif
+
 %define		defconfig	arch/%{target_arch_dir}/defconfig
 
 # No ELF objects there to strip (skips processing 27k files)
@@ -439,7 +445,7 @@
 BuildConfig() {
 	%{?debug:set -x}
 	# is this a special kernel we want to build?
-	Config="%{target_arch_dir}"
+	Config="%{kernel_config}"
 	KernelVer=%{kernel_release}
 	echo "Building config file using $Config.conf..."
 	cat $RPM_SOURCE_DIR/kernel-bare-vserver-$Config.config > %{defconfig}
@@ -471,7 +477,7 @@
 }
 
 PreInstallKernel() {
-	Config="%{target_arch_dir}"
+	Config="%{kernel_config}"
 	KernelVer=%{kernel_release}
 
 	mkdir -p $KERNEL_INSTALL_DIR/boot
@@ -858,6 +864,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.43  2008-06-09 19:27:21  hawk
+- use proper kernel config, release 3
+
 Revision 1.1.2.42  2008-06-09 17:27:56  hawk
 - reworked from current kernel.spec:LINUX_2_6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.43.2.11.2.50&r2=1.43.2.11.2.51&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-bare-grsecurity.spec?r1=1.1.2.39&r2=1.1.2.40&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-bare-vserver.spec?r1=1.1.2.42&r2=1.1.2.43&f=u



More information about the pld-cvs-commit mailing list