Author: qboosh Date: Mon Oct 20 17:59:18 2008 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- no pre/rc versions from this branch - so drop such macros and be more
distfiles-friendly
- dropped excessive _underscores
---- Files affected:
SPECS:
kernel.spec (1.441.2.1983 -> 1.441.2.1984)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1983 SPECS/kernel.spec:1.441.2.1984
--- SPECS/kernel.spec:1.441.2.1983 Mon Oct 20 15:55:17 2008
+++ SPECS/kernel.spec Mon Oct 20 19:59:10 2008
@@ -100,12 +100,9 @@
%define have_oss 0
%endif
-%define _basever 2.6.27
-%define _postver .2
-%define _prepatch %{nil}
-%define _pre_rc %{nil}
-%define _rc %{nil}
-%define _rel 0.1
+%define basever 2.6.27
+%define postver .2
+%define rel 0.1
%define _enable_debug_packages 0
@@ -118,9 +115,9 @@
# 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}
+# localversion is just that without version for "> localversion"
+%define localversion %{rel}
+%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)
@@ -128,26 +125,14 @@
Summary(fr.UTF-8): Le Kernel-Linux (La partie centrale du systeme)
Summary(pl.UTF-8): Jądro Linuksa
Name: kernel%{_alt_kernel}
-
-%if "%{_prepatch}" == "%{nil}"
-Version: %{_basever}%{_postver}
-Release: %{_rel}
-%else
-Version: %{_prepatch}
-Release: 0.%{_pre_rc}.%{_rel}
-%endif
-
+Version: %{basever}%{postver}
+Release: %{rel}
Epoch: 3
License: GPL v2
Group: Base/Kernel
-#Source0:
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-%{version}%{_rc}.tar.bz2
-Source0:
http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}%{_rc}.tar.bz2
+Source0:
http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
# Source0-md5: b3e78977aa79d3754cb7f8143d7ddabd
-%if "%{_prepatch}" != "%{nil}"
-Source90:
http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-%{_prepatch}-%{_pre_rc}.bz2
-# Source90-md5: b78873f8a3aff5bdc719fc7fb4c66a9b
-%endif
-%if "%{_postver}" != "%{nil}"
+%if "%{postver}" != "%{nil}"
Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
# Source1-md5: 9d4c3a044f04c4a35be09a6501b0ef30
%endif
@@ -707,7 +692,7 @@
/usr/src/linux/Documentation.
%prep
-%setup -q -n linux-%{_basever}%{_rc}
+%setup -q -n linux-%{basever}
# hack against warning in pax/grsec
%ifarch alpha
@@ -718,13 +703,7 @@
install %{SOURCE5} Makefile.ppclibs
%endif
-# sources 1 and 90 should be mutually exclusive btw.
-
-%if "%{_prepatch}" != "%{nil}"
-%{__bzip2} -dc %{SOURCE90} | patch -p1 -s
-%endif
-
-%if "%{_postver}" != "%{nil}"
+%if "%{postver}" != "%{nil}"
%{__bzip2} -dc %{SOURCE1} | patch -p1 -s
%endif
@@ -917,7 +896,7 @@
%patch2001 -p1
# Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION =.*#EXTRAVERSION =
%{_postver}%{?_alt_kernel:%{_alt_kernel}}#g' Makefile
+sed -i 's#EXTRAVERSION =.*#EXTRAVERSION =
%{postver}%{?_alt_kernel:%{_alt_kernel}}#g' Makefile
# on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build
sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
@@ -1226,7 +1205,7 @@
}
KERNEL_BUILD_DIR=`pwd`
-echo "-%{_localversion}" > localversion
+echo "-%{localversion}" > localversion
KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel"
rm -rf $KERNEL_INSTALL_DIR
@@ -1653,6 +1632,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1984 2008/10/20 17:59:10 qboosh
+- no pre/rc versions from this branch - so drop such macros and be more
distfiles-friendly
+- dropped excessive _underscores
+
Revision 1.441.2.1983 2008/10/20 13:55:17 pluto
- reenable esfq patch for testing.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1983&r2=1.441.2.1984&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
