--- cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec 2011/06/19 20:28:48 110087 +++ cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec 2011/08/18 22:09:27 134369 @@ -1,89 +1,93 @@ # # *tmb* series kernels now use kernel.org versioning # -%define kernelversion 2 -%define patchlevel 6 -%define sublevel 38 +%define kernelversion 3 +%define patchlevel 0 +# sublevel is now used for -stable patches +%define sublevel 3 + +# Package release +%define mgarel 1 # kernel Makefile extraversion is substituted by -# kpatch/kgit/kstable wich are either 0 (empty), rc (kpatch), -# git (kgit, only the number after "git"), or stable release (kstable) +# kpatch/kgit wich are either 0 (empty), rc (kpatch), git (kgit) %define kpatch 0 +# kernel.org -gitX patch (only the number after "git") %define kgit 0 -%define kstable 8 - -# this is the releaseversion -%define kbuild 1 -%define ktag tmb -%define kname kernel-%{ktag} +# Patch tarball tag +%define ktag tmb +# kernel base name (also name of srpm) +%define kname kernel-%{ktag} +# release defines %define rpmtag %{distsuffix}%{mgaver} %if %kpatch %if %kgit -%define rpmrel %mkrel 0.%{kpatch}.%{kgit}.%{kbuild} +%define rpmrel %mkrel 0.%{kpatch}.%{kgit}.%{mgarel} %else -%define rpmrel %mkrel 0.%{kpatch}.%{kbuild} +%define rpmrel %mkrel 0.%{kpatch}.%{mgarel} %endif %else -%define rpmrel %mkrel %{kbuild} +%define rpmrel %mkrel %{mgarel} %endif -# theese two never change, they are used to fool rpm/urpmi/smart +# fakerel and fakever never change, they are used to fool +# rpm/urpmi/smart %define fakever 1 %define fakerel %mkrel 1 +# version defines +%define kversion %{kernelversion}.%{patchlevel}.%{sublevel} +%define kverrel %{kversion}-%{rpmrel} + # When we are using a pre/rc patch, the tarball is a sublevel -1 %if %kpatch -%define kversion %{kernelversion}.%{patchlevel}.%{sublevel} -%define tar_ver %{kernelversion}.%{patchlevel}.%(expr %{sublevel} - 1) -%define patch_ver %{kversion}-%{kpatch}-%{ktag}%{kbuild} -%else -%if %kstable -%define kversion %{kernelversion}.%{patchlevel}.%{sublevel}.%{kstable} -%define tar_ver %{kernelversion}.%{patchlevel}.%{sublevel} +%if %sublevel +%define tar_ver %{kernelversion}.%{patchlevel} %else -%define kversion %{kernelversion}.%{patchlevel}.%{sublevel} -%define tar_ver %{kversion} +%define tar_ver %{kernelversion}.%(expr %{patchlevel} - 1) %endif -%define patch_ver %{kversion}-%{ktag}%{kbuild} +%define patch_ver %{kversion}-%{kpatch}-%{ktag}%{mgarel} +%else +%define tar_ver %{kernelversion}.%{patchlevel} +%define patch_ver %{kversion}-%{ktag}%{mgarel} %endif -%define kverrel %{kversion}-%{rpmrel} -# used for not making too long names for rpms or search paths +# Used for not making too long names for rpms or search paths %if %kpatch %if %kgit -%define buildrpmrel 0.%{kpatch}.%{kgit}.%{kbuild}%{rpmtag} +%define buildrpmrel 0.%{kpatch}.%{kgit}.%{mgarel}%{rpmtag} %else -%define buildrpmrel 0.%{kpatch}.%{kbuild}%{rpmtag} +%define buildrpmrel 0.%{kpatch}.%{mgarel}%{rpmtag} %endif %else -%define buildrpmrel %{kbuild}%{rpmtag} +%define buildrpmrel %{mgarel}%{rpmtag} %endif -%define buildrel %{kversion}-%{buildrpmrel} +%define buildrel %{kversion}-%{buildrpmrel} # having different top level names for packges means that you have to remove them by hard :( -%define top_dir_name %{kname}-%{_arch} +%define top_dir_name %{kname}-%{_arch} -%define build_dir ${RPM_BUILD_DIR}/%{top_dir_name} -%define src_dir %{build_dir}/linux-%{tar_ver} +%define build_dir ${RPM_BUILD_DIR}/%{top_dir_name} +%define src_dir %{build_dir}/linux-%{tar_ver} # disable useless debug rpms... -%define _enable_debug_packages %{nil} -%define debug_package %{nil} +%define _enable_debug_packages %{nil} +%define debug_package %{nil} # Build defines -%define build_doc 0 -%define build_source 1 -%define build_devel 1 -%define build_debug 0 +%define build_doc 0 +%define build_source 1 +%define build_devel 1 +%define build_debug 0 -# Build desktop i586 / 4GB +# Build desktop586 (i586 / 4GB) %ifarch %{ix86} %define build_desktop586 1 %endif -# Build mm (i686 / 4GB) / x86_64 +# Build desktop (i686 / 4GB) / x86_64 %define build_desktop 1 # Build laptop (i686 / 4GB)/ x86_64 @@ -124,7 +128,7 @@ %{?_with_modxz: %global build_modxz 1} # For the .nosrc.rpm -%define build_nosrc 0 +%define build_nosrc 0 %{?_with_nosrc: %global build_nosrc 1} %define kmake %make @@ -177,19 +181,32 @@ # Patch0 to Patch100 are for core kernel upgrades. # -# Pre linus patch: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing +# Pre linus patch: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/testing %if %kpatch -Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}.%{sublevel}-%{kpatch}.bz2 -Source10: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}.%{sublevel}-%{kpatch}.bz2.sign +%if %sublevel +Patch2: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/stable-review/patch-%{kversion}-%{kpatch}.bz2 +Source11: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/stable-review/patch-%{kversion}-%{kpatch}.bz2.sign +%else +Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.bz2 +Source10: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.bz2.sign +%endif %endif %if %kgit -Patch2: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}.%{sublevel}-%{kpatch}-git%{kgit}.bz2 -Source11: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}.%{sublevel}-%{kpatch}-git%{kgit}.bz2.sign +Patch2: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.bz2 +Source11: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.bz2.sign +%endif +%if %sublevel +%if %kpatch +%define prev_sublevel %(expr %{sublevel} - 1) +%if %prev_sublevel +Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kernelversion}.%{patchlevel}.%{prev_sublevel}.bz2 +Source10: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kernelversion}.%{patchlevel}.%{prev_sublevel}.bz2.sign +%endif +%else +Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.bz2 +Source10: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.bz2.sign %endif -%if %kstable -Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.bz2 -Source10: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.bz2.sign %endif #END @@ -432,10 +449,8 @@ Summary: The Linux source code for %{kname}-%{buildrel} Group: Development/Kernel Autoreqprov: no -Provides: kernel-source = %{kverrel}, kernel-devel = %{kverrel} -%ifarch %{ix86} -Conflicts: arch(x86_64) -%endif +Provides: kernel-source = %{kverrel} +Buildarch: noarch %description -n %{kname}-source-%{buildrel} The %{kname}-source package contains the source code files for the %{ktag} @@ -475,9 +490,7 @@ Summary: Virtual rpm for latest %{kname}-source Group: Development/Kernel Requires: %{kname}-source-%{buildrel} -%ifarch %{ix86} -Conflicts: arch(x86_64) -%endif +Buildarch: noarch %description -n %{kname}-source-latest This package is a virtual rpm that aims to make sure you always have the @@ -514,15 +527,24 @@ %define patches_dir ../%{patch_ver}/ cd %src_dir + +%if %sublevel %if %kpatch +%if %prev_sublevel %patch1 -p1 %endif -%if %kgit %patch2 -p1 +%else +%patch1 -p1 %endif -%if %kstable +%else +%if %kpatch %patch1 -p1 %endif +%endif +%if %kgit +%patch2 -p1 +%endif %{patches_dir}/scripts/apply_patches @@ -583,11 +605,7 @@ fi # make sure EXTRAVERSION says what we want it to say - %if %kstable - LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .%{kstable}-$extension/" Makefile - %else - LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -$extension/" Makefile - %endif + LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -$extension/" Makefile %smake oldconfig } @@ -597,7 +615,7 @@ KernelVer=$1 echo "Building kernel $KernelVer" - %kmake all + %kmake -s all # Start installing stuff install -d %{temp_boot} @@ -657,7 +675,7 @@ cp -fR drivers/acpi/acpica/*.h $TempDevelRoot/drivers/acpi/acpica/ for i in alpha arm arm26 avr32 blackfin cris frv h8300 ia64 microblaze mips m32r m68k \ - m68knommu mn10300 parisc powerpc ppc s390 sh sh64 score sparc tile v850 xtensa; do + m68knommu mn10300 parisc powerpc ppc s390 sh sh64 score sparc tile unicore32 v850 xtensa; do rm -rf $TempDevelRoot/arch/$i done @@ -928,7 +946,7 @@ # Create directories infastructure %if %build_source -install -d %{target_source} +install -d %{target_source} tar cf - . | tar xf - -C %{target_source} chmod -R a+rX %{target_source} @@ -936,7 +954,7 @@ # we remove all the source files that we don't ship # first architecture files for i in alpha arm arm26 avr32 blackfin cris frv h8300 ia64 microblaze mips m32r m68k \ - m68knommu mn10300 parisc powerpc ppc s390 sh sh64 score sparc tile v850 xtensa; do + m68knommu mn10300 parisc powerpc ppc s390 sh sh64 score sparc tile v850 xtensa unicore32; do rm -rf %{target_source}/arch/$i done @@ -946,6 +964,7 @@ # other misc files rm -f %{target_source}/{.config.old,.config.cmd,.mailmap,.missing-syscalls.d,arch/.gitignore} +rm -rf %{target_source}/.tmp_depmod/ #endif %build_source %endif @@ -1057,6 +1076,32 @@ %endif %changelog +* Fri Aug 19 2011 Thomas Backlund 3.0.3-1.mga2 +- update to 3.0.3 +- update patches: + * CK01: Con Kolivas -ck patchset including BFS + * FU01: unionfs 2.5.9.2 + * KP01: TuxonIce 3.2 +- drop merged patches: + * CK02, DA60-DA61, DG10-DG14, DN08, DN15-DN19, DP05-DP08 + * DP20-DP26, DP30, DV11, FU02-FU03, MK01, NI30-NI31 +- add patches: + * AA01: genirq: Fix wrong bit operation + * DP10-DP12: samsung-laptop: support nc110, nc210, r700, x520 + * DP13: samsung-laptop: fix support for older N150, N210, N220 + * FB01: btrfs: btrfs_calc_avail_data_space: cope with no read_write devices + * MB17: ndiswrapper buildfix for 3.0 + * MC84: viahss buildfix for 3.0 +- rediff patches: + * NI16: netfilter psd mdv/mga modifications +- disable patches: + * DV01-DV02: framebuffer oops fixes (should not be needed anymore) + * FR01: reiser4 support (broken) +- adapt spec for 3.0 series version changes +- change kernel-tmb-source to noarch +- build with -s(ilent) to only log varnings and errors +- update defconfigs + * Sun Jun 19 2011 Thomas Backlund 2.6.38.8-1.mga1 - update to 2.6.38.8 (CVE-2011-1017) - drop merged patches: