/[packages]/cauldron/kernel-tmb/pristine/SPECS/kernel-tmb.spec

Diff of /cauldron/kernel-tmb/pristine/SPECS/kernel-tmb.spec

Parent Directory | Revision Log | View Patch Patch

-revision 78708 by tmb,
Tue Mar 29 10:06:54 2011 UTC
+revision 232861 by tmb,
Mon Apr 23 08:48:16 2012 UTC
 Line 1
  #
  # *tmb* series kernels now use kernel.org versioning
  #
- %define kernelversion   2
+ %define kernelversion   3
- %define patchlevel      6
+ %define patchlevel      3
- %define sublevel        38
+ # 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),
+ # kpatch/kgit wich are either 0 (empty), rc (kpatch), git (kgit)
- # git (kgit, only the number after "git"), or stable release (kstable)
  %define kpatch          0
+ # kernel.org -gitX patch (only the number after "git")
  %define kgit            0
- %define kstable         2
- # this is the releaseversion
- %define kbuild          1
- %define ktag            tmb
+ # Patch tarball tag
- %define kname           kernel-%{ktag}
+ %define ktag            tmb
+ # kernel base name (also name of srpm)
+ %define kname           kernel-%{ktag}
- %define rpmtag          %distsuffix
+ # 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}
+ %if %sublevel
- %define tar_ver         %{kernelversion}.%{patchlevel}.%(expr %{sublevel} - 1)
+ %define tar_ver         %{kernelversion}.%{patchlevel}
- %define patch_ver       %{kversion}-%{kpatch}-%{ktag}%{kbuild}
  %else
- %if %kstable
+ %define tar_ver         %{kernelversion}.%(expr %{patchlevel} - 1)
- %define kversion        %{kernelversion}.%{patchlevel}.%{sublevel}.%{kstable}
- %define tar_ver         %{kernelversion}.%{patchlevel}.%{sublevel}
- %else
- %define kversion        %{kernelversion}.%{patchlevel}.%{sublevel}
- %define tar_ver         %{kversion}
  %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}
  # having different top level names for packges means that you have to remove them by hard :(
  %define top_dir_name    %{kname}-%{_arch}
  %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}
  # Build defines
  %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
-Line 119
+Line 123
  %{?_with_debug: %global build_debug 1}
  # For the .nosrc.rpm
  %define build_nosrc     0
  %{?_with_nosrc: %global build_nosrc 1}
  %define kmake %make
-Line 134
+Line 138
  #
  # SRC RPM description
  #
- Summary:        Linux kernel built for Mandriva with modifications by %{ktag}
+ Summary:        Linux kernel built for %vendor with modifications by %{ktag}
  Name:           %{kname}
  Version:        %{kversion}
  Release:        %{rpmrel}
-Line 142 
 License:       GPLv2
+Line 146 
 License:       GPLv2
  Group:          System/Kernel and hardware
  ExclusiveArch:  %{ix86} x86_64
  ExclusiveOS:    Linux
- URL:            http://wiki.mandriva.com/en/Docs/Howto/Mandriva_Kernels#kernel-tmb
+ URL:            http://www.kernel.org
  ####################################################################
  #
  # Sources
  #
  ### This is for full SRC RPM
- Source0:        ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/linux-%{tar_ver}.tar.bz2
+ Source0:        ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/linux-%{tar_ver}.tar.xz
- Source1:        ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/linux-%{tar_ver}.tar.bz2.sign
+ Source1:        ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/linux-%{tar_ver}.tar.sign
  ### This is for stripped SRC RPM
  %if %build_nosrc
  NoSource: 0
-Line 172 
 Source102:     %{kname}.patchlist
+Line 176 
 Source102:     %{kname}.patchlist
  # 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
+ %if %sublevel
- Source10:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}.%{sublevel}-%{kpatch}.bz2.sign
+ Patch2:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/stable-review/patch-%{kversion}-%{kpatch}.xz
+ Source11:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/stable-review/patch-%{kversion}-%{kpatch}.sign
+ %else
+ Patch1:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.xz
+ Source10:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.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
+ Patch2:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.xz
- Source11:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}.%{sublevel}-%{kpatch}-git%{kgit}.bz2.sign
+ Source11:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.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}.xz
+ Source10:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kernelversion}.%{patchlevel}.%{prev_sublevel}.sign
+ %endif
+ %else
+ Patch1:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.xz
+ Source10:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.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
-Line 193 
 Source10:      ftp://ftp.kernel.org/pub/linu
+Line 210 
 Source10:      ftp://ftp.kernel.org/pub/linu
  # Defines for the things that are needed for all the kernels
  #
  %define common_description_kernel The kernel package contains the Linux kernel (vmlinuz), the core of your \
- Mandriva Linux operating system.  The kernel handles the basic functions \
+ %vendor Linux operating system.  The kernel handles the basic functions \
  of the operating system:  memory allocation, process allocation, device \
  input and output, etc.
- %define common_description_info For instructions for update, see:       \
- http://www.mandriva.com/en/security/kernelupdate                        \
-                                                                         \
- The %{ktag} kernels is an experimental kernel based on the kernel.org   \
- kernels with added patches. Some of them may/will never end up in       \
- the main kernels due to their experimental nature. Some refer to        \
- this kernel as a 'hackkernel' ...                                       \
- Use these kernels at your own risk !!
  ### Global Requires/Provides
- %define requires1       mkinitrd >= 6.0.92-12
+ %define requires1       dracut >= 017-1
  %define requires2       bootloader-utils >= 1.12-1
- %define requires3       sysfsutils >= 1.3.0-1 module-init-tools >= 3.6-10
+ %define requires3       sysfsutils >= 1.3.0-1 module-init-tools >= 3.16-14
- %define requires4       kernel-firmware >= 20100217-1
+ %define requires4       kernel-firmware >= 20111229-1
  %define kprovides       %{kname} = %{kverrel}, kernel = %{tar_ver}, drbd-api = 88
- BuildRoot:              %{_tmppath}/%{kname}-%{kversion}-%{_arch}-build
- %define buildroot       %{_tmppath}/%{kname}-%{kversion}-%{_arch}-build
  Autoreqprov:            no
- BuildRequires:          gcc >= 4.0.1-5 module-init-tools >= 3.2-0.pre8.2
+ BuildRequires:          gcc >= 4.0.1-5 module-init-tools >= 3.16-14
  %description
  %common_description_kernel
- %common_description_info
  # mkflavour() name flavour processor
  # name: the flavour name in the package name
-Line 243 
 Group:         System/Kernel and hardware              \
+Line 247 
 Group:         System/Kernel and hardware              \
  %description -n %{kname}-%{1}-%{buildrel}               \
  %common_description_kernel %{expand:%{info_%(echo %{1})}} \
                                                          \
- %common_description_info                                \
-                                                         \
  %if %build_devel                                        \
  %package -n     %{kname}-%{1}-devel-%{buildrel}         \
  Version:        %{fakever}                              \
-Line 262 
 This package contains the kernel-devel f
+Line 264 
 This package contains the kernel-devel f
                                                          \
  If you want to build your own kernel, you need to install the full \
  %{kname}-source-%{buildrel} rpm.                        \
-                                                         \
- %common_description_info                                \
  %endif                                                  \
                                                          \
  %package -n %{kname}-%{1}-latest                        \
 Line 280 
 Conflicts:     arch(x86_64)                            \
  This package is a virtual rpm that aims to make sure you always have the \
  latest %{kname}-%{1} installed...                       \
                                                          \
- %common_description_info                                \
-                                                         \
  %if %build_devel                                        \
  %package -n %{kname}-%{1}-devel-latest                  \
  Version:        %{kversion}                             \
-Line 296 
 Conflicts:     arch(x86_64)                            \
+Line 294 
 Conflicts:     arch(x86_64)                            \
  %description -n %{kname}-%{1}-devel-latest              \
  This package is a virtual rpm that aims to make sure you always have the \
  latest %{kname}-%{1}-devel installed...                 \
-                                                         \
- %common_description_info                                \
  %endif                                                  \
                                                          \
  %post -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1}-post \
+ %posttrans -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1}-posttrans \
  %preun -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1}-preun \
  %postun -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1}-postun \
                                                          \
-Line 311 
 latest %{kname}-%{1}-devel installed...
+Line 308 
 latest %{kname}-%{1}-devel installed...
                                                          \
  %files -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1} \
  %files -n %{kname}-%{1}-latest                          \
- %defattr(-,root,root)                                   \
                                                          \
  %if %build_devel                                        \
  %files -n %{kname}-%{1}-devel-%{buildrel} -f kernel_devel_files.%{1} \
  %files -n %{kname}-%{1}-devel-latest                    \
- %defattr(-,root,root)                                   \
  %endif
-Line 325 
 latest %{kname}-%{1}-devel installed...
+Line 320 
 latest %{kname}-%{1}-devel installed...
  #
  %ifarch %{ix86}
  %if %build_desktop586
- %define summary_desktop586 Linux kernel for desktop use with i586 & 4GB RAM
+ %define summary_desktop586 Linux kernel for desktop use with i586 and up to 4GB RAM
  %define info_desktop586 This kernel is compiled for desktop use, single or \
- multiple i586 processor(s)/core(s) and less than 4GB RAM, using full \
+ multiple i586 processor(s)/core(s) and less than 4GB RAM (usually 3-3.5GB \
- preempt, BFS cpu scheduler and cfq i/o scheduler. \
+ detected, if you need/want to use all 4GB or more, install %{kname}-server),\
+  using full preempt, BFS cpu scheduler and cfq i/o scheduler. \
  This kernel relies on in-kernel smp alternatives to switch between up & smp \
  mode depending on detected hardware. To force the kernel to boot in single \
  processor mode, use the "nosmp" boot parameter.
-Line 341 
 processor mode, use the "nosmp" boot par
+Line 337 
 processor mode, use the "nosmp" boot par
  #
  %if %build_desktop
  %ifarch %{ix86}
- %define summary_desktop Linux Kernel for desktop use with i686 & 4GB RAM
+ %define summary_desktop Linux Kernel for desktop use with i686 and up to 4GB RAM
  %define info_desktop This kernel is compiled for desktop use, single or \
- multiple i686 processor(s)/core(s) and less than 4GB RAM, using full \
+ multiple i686 processor(s)/core(s) and less than 4GB RAM (usually 3-3.5GB \
- preempt, BFS cpu scheduler and cfq i/o scheduler. \
+ detected, if you need/want to use all 4GB or more, install %{kname}-server), \
+ using full preempt, BFS cpu scheduler and cfq i/o scheduler. \
  This kernel relies on in-kernel smp alternatives to switch between up & smp \
  mode depending on detected hardware. To force the kernel to boot in single \
  processor mode, use the "nosmp" boot parameter.
-Line 365 
 processor mode, use the "nosmp" boot par
+Line 362 
 processor mode, use the "nosmp" boot par
  #
  %if %build_laptop
  %ifarch %{ix86}
- %define summary_laptop Linux kernel for laptop use with i686-up/smp-4GB
+ %define summary_laptop Linux kernel for laptop use with i686 and up to 4GB
  %define info_laptop This kernel is compiled for laptop use, single or \
- multiple i686 processor(s)/core(s) and less than 4GB RAM, using HZ_250 \
+ multiple i686 processor(s)/core(s) and less than 4GB RAM (usually 3-3.5GB \
- to save battery, voluntary preempt, BFS cpu scheduler, cfq i/o scheduler \
+ detected, if you need/want to use all 4GB or more, install %{kname}-server), \
- and some other laptop-specific optimizations. If you want to sacrifice \
+ using HZ_250 to save battery, voluntary preempt, BFS cpu scheduler, \
- battery life for performance, you better use the %{kname}-desktop. \
+ cfq i/o scheduler and some other laptop-specific optimizations. \
+ If you want to sacrifice battery life for performance, you better use the \
+ %{kname}-desktop. \
  This kernel relies on in-kernel smp alternatives to switch between up & smp \
  mode depending on detected hardware. To force the kernel to boot in single \
  processor mode, use the "nosmp" boot parameter. \
-Line 446 
 Requires:      glibc-devel, ncurses-devel, m
+Line 445 
 Requires:      glibc-devel, ncurses-devel, m
  Summary:        The Linux source code for %{kname}-%{buildrel}
  Group:          Development/Kernel
  Autoreqprov:    no
- Provides:       kernel-source = %{kverrel}, kernel-devel = %{kverrel}
+ Provides:       kernel-source = %{kverrel}
- %ifarch %{ix86}
+ Buildarch:      noarch
- Conflicts:      arch(x86_64)
- %endif
  %description -n %{kname}-source-%{buildrel}
  The %{kname}-source package contains the source code files for the %{ktag}
-Line 459 
 build your own custom kernel that is bet
+Line 456 
 build your own custom kernel that is bet
  If you only want the files needed to build 3rdparty (nVidia, Ati, dkms-*,...)
  drivers against, install the *-devel-* rpm that is matching your kernel.
- %common_description_info
  %post -n %{kname}-source-%{buildrel}
  for i in /lib/modules/%{kversion}-%{ktag}-*-%{buildrpmrel}; do
-Line 490 
 Release:       %{rpmrel}
+Line 486 
 Release:       %{rpmrel}
  Summary:        Virtual rpm for latest %{kname}-source
  Group:          Development/Kernel
  Requires:       %{kname}-source-%{buildrel}
- %ifarch %{ix86}
+ Buildarch:      noarch
- Conflicts:      arch(x86_64)
- %endif
  %description -n %{kname}-source-latest
  This package is a virtual rpm that aims to make sure you always have the
  latest %{kname}-source installed...
- %common_description_info
  %endif
  #
-Line 518 
 Various bits of information about the Li
+Line 510 
 Various bits of information about the Li
  shipped with it are documented in these files. You also might want install
  this package if you need a reference to the options that can be passed to
  Linux kernel modules at load time.
- %common_description_info
  %endif
  #
-Line 533 
 Linux kernel modules at load time.
+Line 523 
 Linux kernel modules at load time.
  %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
-Line 594 
 PrepareKernel() {
+Line 593 
 PrepareKernel() {
          fi
          # make sure EXTRAVERSION says what we want it to say
-         %if %kstable
+         LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -$extension/" Makefile
-                 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
          %smake oldconfig
  }
-Line 608 
 BuildKernel() {
+Line 603 
 BuildKernel() {
          KernelVer=$1
          echo "Building kernel $KernelVer"
-         %kmake all
+         %kmake -s all
          # Start installing stuff
          install -d %{temp_boot}
-Line 640 
 SaveDevel() {
+Line 635 
 SaveDevel() {
          %ifarch %{ix86} x86_64
                  cp -fR arch/x86/kernel/asm-offsets.{c,s} $TempDevelRoot/arch/x86/kernel/
                  cp -fR arch/x86/kernel/asm-offsets_{32,64}.c $TempDevelRoot/arch/x86/kernel/
+                 cp -fR arch/x86/syscalls/syscall* $TempDevelRoot/arch/x86/syscalls/
                  cp -fR arch/x86/include $TempDevelRoot/arch/x86/
          %else
                  cp -fR arch/%{_arch}/kernel/asm-offsets.{c,s} $TempDevelRoot/arch/%{_arch}/kernel/
-Line 667 
 SaveDevel() {
+Line 663 
 SaveDevel() {
          # add acpica header files, needed for fglrx build
          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 \
+         for i in alpha arm arm26 avr32 blackfin c6x cris frv h8300 hexagon ia64 \
-                  m68knommu mn10300 parisc powerpc ppc s390 sh sh64 score sparc tile v850 xtensa; do
+                  microblaze mips m32r m68k m68knommu mn10300 openrisc parisc \
+                  powerpc ppc s390 sh sh64 score sparc tile unicore32 v850 xtensa; do
                  rm -rf $TempDevelRoot/arch/$i
          done
-Line 695 
 SaveDevel() {
+Line 692 
 SaveDevel() {
  ### Create the kernel_devel_files.*
  cat > $kernel_devel_files <<EOF
- %defattr(-,root,root)
  %dir $DevelRoot
  %dir $DevelRoot/arch
  %dir $DevelRoot/include
-Line 722 
 $DevelRoot/include/keys
+Line 718 
 $DevelRoot/include/keys
  $DevelRoot/include/linux
  $DevelRoot/include/math-emu
  $DevelRoot/include/media
+ $DevelRoot/include/misc
  $DevelRoot/include/mtd
  $DevelRoot/include/net
  $DevelRoot/include/pcmcia
-Line 786 
 CreateFiles() {
+Line 783 
 CreateFiles() {
  ### Create the kernel_files.*
  cat > $kernel_files <<EOF
- %defattr(-,root,root)
  %{_bootdir}/System.map-%{kversion}-%{ktag}-$kernel_flavour-%{buildrpmrel}
  %{_bootdir}/config-%{kversion}-%{ktag}-$kernel_flavour-%{buildrpmrel}
  %{_bootdir}/vmlinuz-%{kversion}-%{ktag}-$kernel_flavour-%{buildrpmrel}
-Line 828 
 fi
+Line 824 
 fi
  %endif
  EOF
+ ### Create kernel Posttran script
+ cat > $kernel_files-posttrans <<EOF
+ if [ -x /usr/sbin/dkms_autoinstaller -a -d /usr/src/%{kversion}-%{ktag}-$kernel_flavour-%{buildrpmrel} ]; then
+     /usr/sbin/dkms_autoinstaller start %{kversion}-%{ktag}-$kernel_flavour-%{buildrpmrel}
+ fi
+ EOF
  ### Create kernel Preun script on the fly
  cat > $kernel_files-preun <<EOF
-Line 859 
 EOF
+Line 861 
 EOF
  ### Create kernel Postun script on the fly
  cat > $kernel_files-postun <<EOF
  /sbin/kernel_remove_initrd %{kversion}-%{ktag}-$kernel_flavour-%{buildrpmrel}
+ rm -rf /lib/modules/%{kversion}-%{ktag}-$kernel_flavour-%{buildrpmrel} > /dev/null
  EOF
  }
-Line 938 
 cp -a %{temp_root} %{buildroot}
+Line 941 
 cp -a %{temp_root} %{buildroot}
  # Create directories infastructure
  %if %build_source
  install -d %{target_source}
  tar cf - . | tar xf - -C %{target_source}
  chmod -R a+rX %{target_source}
  # 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 \
+ for i in alpha arm arm26 avr32 blackfin c6x cris frv h8300 hexagon ia64 \
-          m68knommu mn10300 parisc powerpc ppc s390 sh sh64 score sparc tile v850 xtensa; do
+          microblaze mips m32r m68k m68knommu mn10300 openrisc parisc \
+          powerpc ppc s390 sh sh64 score sparc tile v850 xtensa unicore32; do
          rm -rf %{target_source}/arch/$i
  done
-Line 956 
 done
+Line 960 
 done
  # 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
-Line 979 
 done
+Line 984 
 done
  popd
- ###
- ### clean
- ###
- %clean
- rm -rf %{buildroot}
  # We don't want to remove this, the whole reason of its existence is to be
  # able to do several rpm --short-circuit -bi for testing install
  # phase without repeating compilation phase
-Line 996 
 rm -rf %{buildroot}
+Line 994 
 rm -rf %{buildroot}
  ###
  %if %build_source
  %files -n %{kname}-source-%{buildrel}
- %defattr(-,root,root)
  %dir %{_kerneldir}
  %dir %{_kerneldir}/arch
  %dir %{_kerneldir}/include
-Line 1021 
 rm -rf %{buildroot}
+Line 1018 
 rm -rf %{buildroot}
  %{_kerneldir}/include/linux
  %{_kerneldir}/include/math-emu
  %{_kerneldir}/include/media
+ %{_kerneldir}/include/misc
  %{_kerneldir}/include/mtd
  %{_kerneldir}/include/net
  %{_kerneldir}/include/pcmcia
-Line 1057 
 rm -rf %{buildroot}
+Line 1055 
 rm -rf %{buildroot}
  %doc README.kernel-%{ktag}-sources
  %files -n %{kname}-source-latest
- %defattr(-,root,root)
  %endif
  %if %build_doc
  %files -n %{kname}-doc
- %defattr(-,root,root)
  %doc linux-%{tar_ver}/Documentation/*
  %endif
  %changelog
- * Tue Mar 29 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.2-1.mga1
+ * Mon Apr 23  2012 Thomas Backlund <tmb@mageia.org> 3.3.3-1.mga2
+ - update to 3.3.3
+ - add patches:
+   * BF01: floppy: disable pnp autoloading
+   * DN10: ath5k: do not stop queues for full calibration
+   * DN11: ath5k: do not re-run AGC calibration periodically
+   * DN15: iwlwifi: use correct released ucode version
+ * Tue Apr 03  2012 Thomas Backlund <tmb@mageia.org> 3.3.1-1.mga2
+ - update to 3.3.1
+ - drop merged patches:
+   * DM51, SR01-SR03
+ - update patch:
+   * CK01: -ck1 patchset including BFS v0.420
+ - add patches:
+   * DA50: ata: prefer ata drivers over ide drivers when both are built (Anssi)
+   * DA60-DA61: ata: add ide/ahci/raid mode support for Intel Lynx Point chipset
+   * DG01-DG04: drm: add upstream drm changes to support gpu driver backports
+   * DG20, DG21: drm/radeon: backport support for Southern Islands (HD7xxx)
+                 GPUs and Trinity APUs
+   * DG40-DG44: drm/nouveau: backport Kepler (GTX6xx) support
+   * DG60: drm/i915: add Ivy Bridge GT2 Server entries
+ - update defconfigs
+ * Mon Mar 19 2012 Thomas Backlund <tmb@mageia.org> 3.3.0-1.mga2
+ - update to 3.3 final
+ - add patches:
+     * DM50: media: fix initialization on Hauppauge WinTV Nova HD-S2
+             and similar hardware
+     * DM51: media/tda10071: correct delivery system to DVB-S/S2
+ - update defconfigs
+ * Sun Mar 11 2012 Thomas Backlund <tmb@mageia.org> 3.3.0-0.rc7.1.mga2
+ - update to 3.3-rc7
+ * Wed Mar  7 2012 Thomas Backlund <tmb@mageia.org> 3.3.0-0.rc6.1.mga2
+ - update to 3.3-rc6
+ - update patches:
+     * FU01: unionfs 2.5.11
+     * MB10, MB13, MB14: ndiswrapper 1.57
+ - rediff patches:
+     * NI15, NI16: netfilter psd support
+     * patch disabling mrproper in -devel rpms
+ - disable patch:
+     * CK01: -ck1 patchset including BFS sceduler (needs update to 3.3 series)
+ - update defconfigs
+ - update filelists
+ * Thu Mar  1 2012 Thomas Backlund <tmb@mageia.org> 3.2.9-1.mga2
+ - update to 3.2.9
+ - require dracut >= 017-1
+ - drop merged patches:
+     * DG01, DP01, DU01, NM01
+ - add patches:
+     * SR01-SR03: fix nonworking r8172u wireless driver in staging (#4491)
+ * Sat Feb 25 2012 Thomas Backlund <tmb@mageia.org> 3.2.7-1.mga2
+ - update to 3.2.7
+ - drop merged patches AA01-AA28
+ - add patches:
+     * DG01: drm/radeon/kms: fix MSI re-arm on rv370+
+     * DP01: PCI: workaround hard-wired bus number
+     * DS20, DS21: fix nonworking r8172u wireless driver in staging (#4491)
+     * DU01: xhci: Fix oops caused by more USB2 ports than USB3 ports
+     * NM01: mac80211: Fix a rwlock bad magic bug
+ * Thu Feb 16 2012 Thomas Backlund <tmb@mageia.org> 3.2.6-1.mga2
+ - update to 3.2.6
+ - add current stable queue (28 fixes, AA01-AA28)
+ - require dracut >= 016-1 for xz compressed modules support and
+   other needed fixes
+ - compress modules with xz
+ * Tue Feb  7 2012 Thomas Backlund <tmb@mageia.org> 3.2.5-1.mga2
+ - update to 3.2.5
+ - drop merged patch
+     * DP01: ASPM rework
+ * Thu Jan 26 2012 Thomas Backlund <tmb@mageia.org> 3.2.2-1.mga2
+ - update to 3.2.2 (CVE-2012-0056)
+ - update patches:
+     * CK01: Con Kolivas 3.2-ck1 patchset
+     * KP01: TuxOnIce 3.2.1
+ - require dracut instead of mkinitrd
+ - require module-init-tools >= 3.6-14 for xz support
+ * Sun Jan 15 2012 Thomas Backlund <tmb@mageia.org> 3.2.1-1.mga2
+ - update to 3.2.1
+ * Thu Jan  5 2012 Thomas Backlund <tmb@mageia.org> 3.2.0-1.mga2
+ - update to 3.2
+ - add patches:
+     * FU02: fix unionfs build with 3.2 series kernels
+     * MB13: fix ndiswrapper build with 3.2 series kernels
+ - update patches:
+     * CK01: BFS scheduler 0.416
+ - rediff patches:
+     * DP11, MB02, NI11, NI16, Source2
+ - drop patches:
+     * FB01: btrfs fix, merged
+ - update filelists and defconfigs
+ * Thu Dec 22 2011 Thomas Backlund <tmb@mageia.org> 3.1.6-1.mga2
+ - update to 3.1.6
+ - drop patch DS01 (merged)
+ - trigger dkms build in posttrans so modules get built at kernel install
+   instead of at boot (speeds up boot time with new kernel)
+ - update desktop(586) & laptop summaries and descriptions to point out that
+   only 3-3.5GB RAM is detected on 32bit, and that server kernel is needed to
+   fully support 4GB or more
+ - switch transparent hugepages from on by default to madvise (only enabled
+   for apps that requests it), as it fixes desktop freeze when accessing
+   slow media such as usb (thanks to fbui/mdv mail on @cooker ml).
+ * Fri Dec  9 2011 Thomas Backlund <tmb@mageia.org> 3.1.5-1.mga2
+ - update to 3.1.5
+ - drop merged patches:
+     * DG01-DG06, FX01-FX06
+ - add patch:
+     * DS01: ALSA: hda/realtek - Fix Oops in alc_mux_select()
+ - clean spec: drop buildroot and defattr
+ * Tue Dec  6 2011 Thomas Backlund <tmb@mageia.org> 3.1.4-3.mga2
+ - fix patch NI12: IFWLOG: fix return value of checkentry
+   (not properly modified in 2.6.35+ patch, blino, #3594)
+ - rebuild with GCC-4.6.2
+ * Wed Nov 30 2011 Thomas Backlund <tmb@mageia.org> 3.1.4-2.mga2
+ - update patch:
+   * CK01: upstream 3.1.0-ck2 including BFS 0.415
+ * Tue Nov 29 2011 Thomas Backlund <tmb@mageia.org> 3.1.4-1.mga2
+ - update to 3.1.4
+   * reverts usb patch that broke isochronous devices
+     (i.e. webcam, audio, or other streaming devices)
+ * Mon Nov 28 2011 Thomas Backlund <tmb@mageia.org> 3.1.3-1.mga2
+ - update to 3.1.3
+ - add patches:
+   * DG01: i915: Fix inconsistent backlight level during disabled
+   * DG02: drm: fix integer overflow in drm_mode_dirtyfb_ioctl()
+   * DG03: radeon/kms: fix up gpio i2c mask bits for r4xx for real
+   * DG04: i915: Ivybridge still has fences
+   * DG05: i915: Turn on a required 3D clock gating bit on Sandybridge
+   * DG06: i915: Turn on another required clock gating bit on Sandybridge
+   * DP01: pci: rework ASPM disable code (brings power usage back down
+                to 2.6.37 level)
+   * FX01: don't serialise direct IO reads on page cache checks
+           (fixes performance regression introduced in 2.6.38)
+   * FX02: avoid direct I/O write vs buffered I/O race
+   * FX03: return -EIO when xfs_vn_getattr() failed
+   * FX04: fix buffer flushing during unmount
+   * FX05: fix possible memory corruption in xfs_readlink
+   * FX06: use doalloc flag in xfs_qm_dqattach_one()
+ - update patches:
+   * FU01: unionfs 2.5.10 for 3.1.3
+   * MB02: merge 3rdparty support
+   * MB10-MB12: ndiswrapper 1.57-rc1
+ - drop patches:
+   * DS15: its replaced by SND_HDA_PREALLOC_SIZE config option
+   * MB13-MB17: ndiswrapper fixes, merged
+ - disable patches:
+   * KP01: TuxOnIce support, currently broken
+ - dont ship openrisc arch files
+ - update defconfigs
+ * Tue Oct 25 2011 Thomas Backlund <tmb@mageia.org> 3.0.8-1.mga2
+ - update to 3.0.8
+   * drop merged patch: DM20
+ - enable PM_RUNTIME and USB_SUSPEND
+ * Tue Oct 18 2011 Thomas Backlund <tmb@mageia.org> 3.0.7-1.mga2
+ - update to 3.0.7
+ - update patch:
+     * CK01: 3.0.7-ck1 including BFS 0.413
+ - re-enable usblp as it is needed by both usb-pp adapters and some printers
+   (mga #2240, #2264) (cups is patched to work with both usblp and libusb)
+ * Tue Oct 04 2011 Thomas Backlund <tmb@mageia.org> 3.0.6-1.mga2
+ - update to 3.0.6
+ - add patch:
+     * DM20: fix boot hang on uvc webcam init (mga #2425)
+ * Tue Aug 30 2011 Thomas Backlund <tmb@mageia.org> 3.0.4-1.mga2
+ - update to 3.0.4
+ - drop merged patch: AA01
+ * Fri Aug 19 2011 Thomas Backlund <tmb@mageia.org> 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 <tmb@mageia.org> 2.6.38.8-1.mga1
+ - update to 2.6.38.8 (CVE-2011-1017)
+ - drop merged patches:
+     * AA01, DP15
+ - add patches:
+     * CK02: update bfs scheduler to 0.406
+     * MK01: ksm: fix race between ksmd and exiting task (CVE-2011-2183)
+ - add mgaver to 'uname -r'
+ * Sun May 22 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.7-1.mga1
+ - update to 2.6.38.7 (CVE-2011-1770, CVE-2011-1776, CVE-2011-1927)
+ - drop merged patches:
+     * DG20-DG24
+ - update patches:
+     * FU01, FU03: rollback unionfs to a working 2.5.8
+ - add patches:
+     * AA01: block: rescan partitions on invalidated devices on -ENOMEDIA too
+     * DN17: r8169: add a new chip for RTL8105
+     * DN18: r8169: add a new chip for RTL8168DP
+     * DN19: r8169: add support for RTL8168E/RTL8111E
+ * Wed May 18 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.6-2.mga1
+ - disable xz module compression again as not all tools/utils can cope
+   with it (can be enabled with '--with modxz' buildtime flag)
+ * Thu May 12 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.6-1.mga1
+ - enable xz module compression on 2011.0
+ - update to 2.6.38.6
+ - drop merged patches:
+     * AX01
+ - add patches:
+     * DG20: drm/radeon/kms: add pci id to acer travelmate quirk for 5730
+     * DG21: drm/radeon/kms: fix gart setup on fusion parts (v2) backport
+     * DG22: drm/i915/dp: Be paranoid in case we disable a DP before it is attached
+     * DG23: drm/i915/lvds: Only act on lid notify when the device is on
+     * DG24: drm/i915: Release object along create user fb error path
+     * DP30: revert: "dell-laptop: Toggle the unsupported hardware killswitch"
+             as it causes regressions on existing hw (reported by Colin Guthrie)
+     * SM02: add support for compressing modules with xz
+ - clean /lib/modules tree on uninstall
+ - disable ACPI_PROCFS_POWER as its obsoleted by the sysfs interface
+ - drop hardcoded vendor references from summarys and descriptions (#1161)
+ - drop warnings about being experimental kernel
+ * Wed May  5 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.5-1.mga1
+ - update to 2.6.38.5
+ - add patches:
+     * AX01: x86, AMD: K8 Rev.A-E processors are subject to erratum 400
+     * AX05: x86, 32bit: raise default vmalloc area to 192MB (Anssi, #904)
+     * DN15: r8169: add support for RTL8105E
+     * DN16: r8169: be verbose when unable to load firmware
+     * DN20: disable powersaving on rt2800 as it is broken (noted by rtp)
+     * DP06-DP08: samsung-laptop: add support for N230, R410P
+     * DP20-DP26: hp-wmi: add support for rfkill on HP Mini 5102 (Anssi)
+ - update patches:
+     * FU01: unionfs 2.5.9
+ - drop patches:
+     * FU03: unionfs oops fix (obsolete)
+ - enable DEBUG_RODATA and DEBUG_SET_MODULE_RONX (tv)
+ * Sun Apr 24 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.4-1.mga1
+ - update to 2.6.38.4
+ - update patches:
+     * DG10: drm/i915: Fix tiling corruption from pipelined fencing
+     * NI30, NI31: ipset 6.4
+ - add patches:
+     * DA60, DA61: ide/ahci/raid support for Intel Panther Point
+     * DF01: add old ieee1394 aliases to new firewire stack
+     * DG11: drm: Retry i2c transfer of EDID block after failure
+     * DG12: drm/i915/dp: Sanity check eDP existence
+     * DG13: drm/i915: Restore missing command flush before interrupt on BLT ring
+     * DG14: drm/i915: Avoid unmapping pages from a NULL address space
+     * DG15: drm/i915: Enable GPU semaphores by default
+     * DM01: add dm-raid45 aliases to the new dm-raid target
+     * DP15: intel_ips: fix monitor thread to use TASK_INTERRUPTIBLE
+ * Sat Apr 16 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.3-1.mga1
+ - update to 2.6.38.3
+ - drop merged patches
+ * Mon Apr 11 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.2-2.mga1
+ - add -stable queue patches (31 fixes)
+ - update patches:
+     * CK01: Con Kolivas -ck3 patchset including bfs 0.400
+     * FR01: reiser4 for 2.6.38 final
+ - drop patches:
+     * FR02: reiser4 buildfix (merged)
+ * Tue Mar 29 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.2-1.mga1
  - update to 2.6.38.2
  - drop merged patches:
      * AX01, AX10, FS01-FS03, LD01-LD02 (xz support)
-Line 1098 
 rm -rf %{buildroot}
+Line 1395 
 rm -rf %{buildroot}
      * MB16: ndiswrapper buildfix
  - update defconfigs and filelists
- * Sun Mar 20 2011 Thomas Backlund <tmb@mandriva.org> 2.6.37.4-1.mga1
+ * Sun Mar 20 2011 Thomas Backlund <tmb@mageia.org> 2.6.37.4-1.mga1
  - update to 2.6.37.4 (CVE-2011-1013, CVE-2011-1019, CVE-2011-1076)
  - drop merged patch:
      * NI01
-Line 1111 
 rm -rf %{buildroot}
+Line 1408 
 rm -rf %{buildroot}
      * DG02: drm/i915: Fix calculation of backlight value in combined mode
  - drop S5, not needed anymore as we ship unprepared kernel-source
- * Sat Jan 26 2011 Thomas Backlund <tmb@mandriva.org> 2.6.37.2-1.mga1
+ * Sat Jan 26 2011 Thomas Backlund <tmb@mageia.org> 2.6.37.2-1.mga1
  - update to 2.6.37.2
  - rediff patch:
      * CK01: Con Kolivas -ck1 patchset including BFS

 Legend:



Removed from v.78708
 


changed lines


 
Added in v.232861
 Legend:



Removed from v.78708
 


changed lines


 
Added in v.232861
-Removed from v.78708
+Added in v.232861

	ViewVC Help
Powered by ViewVC 1.1.30