Author: glen Date: Mon May 5 09:12:46 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- df frendly macros
---- Files affected:
SPECS:
kernel-vanilla.spec (1.146 -> 1.147)
---- Diffs:
================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.146 SPECS/kernel-vanilla.spec:1.147
--- SPECS/kernel-vanilla.spec:1.146 Mon May 5 11:09:37 2008
+++ SPECS/kernel-vanilla.spec Mon May 5 11:12:41 2008
@@ -49,16 +49,9 @@
%define kernel_release %{version}_%{alt_kernel}-%{_localversion}
%define _kernelsrcdir /usr/src/linux-%{version}_%{alt_kernel}
-%define _basever 2.6.25
-%define _postver .1
-%define _rel 0.1
-
-# for rc kernels basever is the version patch (source1) should be applied to
-#%define _ver 2.6.20
-#%define _rc rc4
-# for non rc-kernels these should be %{nil}
-%define _ver %{nil}
-%define _rc %{nil}
+%define basever 2.6.25
+%define postver .1
+%define rel 0.1
Summary: The Linux kernel (the core of the Linux operating system)
Summary(de.UTF-8): Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -66,12 +59,12 @@
Summary(fr.UTF-8): Le Kernel-Linux (La partie centrale du systeme)
Summary(pl.UTF-8): Jądro Linuksa
Name: kernel-%{alt_kernel}
-Version: %{?_ver:%{_ver}}%{_basever}%{_postver}
-Release: %{?_rc:%{_rc}}%{_rel}
+Version: %{basever}%{postver}
+Release: %{rel}
Epoch: 3
License: GPL v2
Group: Base/Kernel
-Source0:
http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2
+Source0:
http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
# Source0-md5: db95a49a656a3247d4995a797d333153
Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
# Source1-md5: a30cc67dace1035493cb088f97f84330
@@ -133,7 +126,7 @@
%define initrd_dir /boot
%define topdir %{_builddir}/%{name}-%{version}
-%define srcdir %{topdir}/linux-%{_basever}
+%define srcdir %{topdir}/linux-%{basever}
%define objdir %{topdir}/%{targetobj}
%define targetobj %{_target_base_arch}-gcc-%(%{kgcc}
-dumpversion)
@@ -381,8 +374,8 @@
ln -s %{SOURCE4} kernel-config-update.py
ln -s %{SOURCE5} Makefile
-cd linux-%{_basever}
-%if "%{_postver}" != "%{nil}"
+cd linux-%{basever}
+%if "%{postver}" != "%{nil}"
%{__bzip2} -dc %{SOURCE1} | %{__patch} -p1 -s
%endif
@@ -390,7 +383,7 @@
#cp Makefile{,.vanilla}
# Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}_%{alt_kernel}#g' Makefile
+sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{postver}_%{alt_kernel}#g' Makefile
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 |
xargs -0 -r -l512 rm -f
@@ -400,7 +393,7 @@
install -d %{objdir}
cat > %{targetobj}.mk <<'EOF'
# generated by %{name}.spec
-KERNELSRC := %{_builddir}/%{name}-%{version}/linux-%{_basever}
+KERNELSRC := %{_builddir}/%{name}-%{version}/linux-%{basever}
KERNELOUTPUT := %{objdir}
SRCARCH := %{target_arch_dir}
@@ -832,6 +825,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.147 2008-05-05 09:12:41 glen
+- df frendly macros
+
Revision 1.146 2008-05-05 09:09:37 glen
- 2.6.25.1 tarball
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.146&r2=1.147&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
