Author: glen Date: Fri Feb 15 16:35:27 2008 GMT
Module: SPECS Tag: LINUX_2_6_16
---- Log message:
- unify: add alt kernel (subname) with underscore; rel 7
---- Files affected:
SPECS:
kernel.spec (1.441.2.1558.2.139 -> 1.441.2.1558.2.140)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.139
SPECS/kernel.spec:1.441.2.1558.2.140
--- SPECS/kernel.spec:1.441.2.1558.2.139 Thu Feb 14 09:25:40 2008
+++ SPECS/kernel.spec Fri Feb 15 17:35:21 2008
@@ -126,6 +126,8 @@
%define xen_version 3.0.2
+%define alt_kernel
%{?with_pax:pax}%{?with_grsec_full:grsecurity}%{?with_xen0:xen0}%{?with_xenU:xenU}
+
# Our Kernel ABI, increase this when you want the out of source modules being
rebuilt
# Usually same as %{_rel}
%define KABI 6
@@ -134,18 +136,17 @@
# modules will be looked from /lib/modules/%{kernel_release}%{?smp}
# _localversion is just that without version for "> localversion"
%define _localversion %{KABI}%{xen}
-%define kernel_release %{version}%{subname}-%{_localversion}
+%define kernel_release
%{version}%{?alt_kernel:_%{alt_kernel}}-%{_localversion}
%define _basever 2.6.16
%define _postver .60
-%define _rel 6
-%define subname
%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
+%define _rel 7
Summary: The Linux kernel (the core of the Linux operating system)
Summary(de.UTF-8): Der Linux-Kernel (Kern des Linux-Betriebssystems)
Summary(et.UTF-8): Linuxi kernel (ehk operatsioonisüsteemi tuum)
Summary(fr.UTF-8): Le Kernel-Linux (La partie centrale du systeme)
Summary(pl.UTF-8): Jądro Linuksa
-Name: kernel%{subname}
+Name: kernel%{_alt_kernel}
Version: %{_basever}%{_postver}
Release: %{_rel}%{?with_ext2compiled:ext2}
Epoch: 3
@@ -400,7 +401,7 @@
%define initrd_dir /boot
%endif
-%define _kernelsrcdir /usr/src/linux%{subname}-%{version}
+%define _kernelsrcdir /usr/src/linux%{_alt_kernel}-%{version}
%if "%{_target_base_arch}" != "%{_arch}"
%define CrossOpts ARCH=%{_target_base_arch}
CROSS_COMPILE=%{_target_cpu}-pld-linux-
@@ -974,7 +975,7 @@
%endif
# Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}%{subname}#g' Makefile
+sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}%{_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
@@ -1490,13 +1491,13 @@
%depmod %{kernel_release}smp
%post headers
-ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{subname}
+ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{_alt_kernel}
%postun headers
if [ "$1" = "0" ]; then
- if [ -L %{_prefix}/src/linux%{subname} ]; then
- if [ "$(readlink %{_prefix}/src/linux%{subname})" =
"linux%{subname}-%{version}" ]; then
- rm -f %{_prefix}/src/linux%{subname}
+ if [ -L %{_prefix}/src/linux%{_alt_kernel} ]; then
+ if [ "$(readlink %{_prefix}/src/linux%{_alt_kernel})" =
"linux%{_alt_kernel}-%{version}" ]; then
+ rm -f %{_prefix}/src/linux%{_alt_kernel}
fi
fi
fi
@@ -1837,6 +1838,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1558.2.140 2008-02-15 16:35:21 glen
+- unify: add alt kernel (subname) with underscore; rel 7
+
Revision 1.441.2.1558.2.139 2008-02-14 08:25:40 undefine
- fix build sparc64 on sparc arch. binutils are _native_ not, cross-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1558.2.139&r2=1.441.2.1558.2.140&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
