SPECS: kernel24.spec - reverted EXTRAVERSION change, using postver...

[qboosh]

Author: qboosh                       Date: Wed Dec 20 08:39:48 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- reverted EXTRAVERSION change, using postver in 2.4.x breaks booting
- release 2.1

---- Files affected:
SPECS:
   kernel24.spec (1.785 -> 1.786) 

---- Diffs:

================================================================
Index: SPECS/kernel24.spec
diff -u SPECS/kernel24.spec:1.785 SPECS/kernel24.spec:1.786
--- SPECS/kernel24.spec:1.785	Tue Dec 19 13:40:13 2006
+++ SPECS/kernel24.spec	Wed Dec 20 09:39:42 2006
@@ -27,7 +27,7 @@
 
 %define		basever	2.4.33
 %define		postver	.6
-%define		_rel	0.1
+%define		_rel	2.1
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(es):	Núcleo (Kernel) linux genérico
@@ -36,7 +36,8 @@
 Summary(pl):	Jądro Linuksa
 Summary(pt_BR):	Kernel Linux (a parte central do sistema operacional Linux)
 Name:		kernel24
-Version:	%{basever}%{postver}
+# %{postver} in EXTRAVERSION causes userspace (glibc? modutile?) to freeze
+Version:	%{basever}
 Release:	%{_rel}%{?with_um:um}
 License:	GPL v2
 Group:		Base/Kernel
@@ -50,7 +51,7 @@
 # Source4-md5:	f3b96692f679239488de30f2bd896825
 # 2.4.26 contains jfs with more recent fixes
 #Source7:	http://www10.software.ibm.com/developer/opensource/jfs/project/pub/jfs-2.4-1.1.5.tar.gz
-Source10:	ftp://ftp.kernel.org/pub/linux/kernel/v2.4/patch-%{version}.bz2
+Source10:	ftp://ftp.kernel.org/pub/linux/kernel/v2.4/patch-%{basever}%{postver}.bz2
 # Source10-md5:	61f5cad9ab6bd83f0b86d7fbe62b30e3
 Source20:	%{name}-ia32.config
 Source21:	%{name}-ia32-smp.config
@@ -947,7 +948,8 @@
 echo -e ',s/EXTRA_CFLAGS.*-g//g\n,w' | ed net/ipsec/Makefile
 
 # Fix EXTRAVERSION and CC in main Makefile
-echo -e ',s/EXTRAVERSION =.*/EXTRAVERSION = %{postver}-%{release}/g\n,w' | ed Makefile
+#echo -e ',s/EXTRAVERSION =.*/EXTRAVERSION = %{postver}-%{release}/g\n,w' | ed Makefile
+echo -e ',s/EXTRAVERSION =.*/EXTRAVERSION = -%{release}/g\n,w' | ed Makefile
 %ifarch %{ix86} %{x8664} alpha sparc ppc
 echo -e ',s#CC.*$(CROSS_COMPILE)gcc#CC            = %{__cc}#g\n,w' | ed Makefile
 %endif
@@ -995,7 +997,8 @@
 	[ "$1" = "BOOT" -o "$2" = "BOOT" ] && BOOT=yes
 	[ "$1" = "smp" -o "$2" = "smp" ] && smp=yes
 	# Fix EXTRAVERSION in main Makefile
-	echo -e ",s/EXTRAVERSION =.*/EXTRAVERSION = %{postver}-%{release}$1/g\n,w" | ed Makefile
+#	echo -e ",s/EXTRAVERSION =.*/EXTRAVERSION = %{postver}-%{release}$1/g\n,w" | ed Makefile
+	echo -e ",s/EXTRAVERSION =.*/EXTRAVERSION = -%{release}$1/g\n,w" | ed Makefile
 %if %{with um}
 	if [ "$smp" = "yes" ]; then
 		Config="um-smp"
@@ -1215,7 +1218,8 @@
 done
 ln -sf linux-%{version} $RPM_BUILD_ROOT%{_prefix}/src/linux-2.4
 
-echo -e ',s/EXTRAVERSION =.*/EXTRAVERSION = %{postver}-%{release}/g\n,w' | ed Makefile
+#echo -e ',s/EXTRAVERSION =.*/EXTRAVERSION = %{postver}-%{release}/g\n,w' | ed Makefile
+echo -e ',s/EXTRAVERSION =.*/EXTRAVERSION = -%{release}/g\n,w' | ed Makefile
 %if %{with source}
 cp -a . $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}
 %else
@@ -1720,6 +1724,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.786  2006/12/20 08:39:42  qboosh
+- reverted EXTRAVERSION change, using postver in 2.4.x breaks booting
+- release 2.1
+
 Revision 1.785  2006/12/19 12:40:13  qboosh
 - ugh, up to 2.4.33.6 (fixes CVE-2006-4814)
 - updated grsecurity patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel24.spec?r1=1.785&r2=1.786&f=u