/[packages]/cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec
ViewVC logotype

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 83510 by tmb, Mon Apr 11 22:32:59 2011 UTC revision 100142 by tmb, Sun May 22 14:28:01 2011 UTC
# Line 10  Line 10 
10  # git (kgit, only the number after "git"), or stable release (kstable)  # git (kgit, only the number after "git"), or stable release (kstable)
11  %define kpatch          0  %define kpatch          0
12  %define kgit            0  %define kgit            0
13  %define kstable         2  %define kstable         7
14    
15  # this is the releaseversion  # this is the releaseversion
16  %define kbuild          2  %define kbuild          1
17    
18  %define ktag            tmb  %define ktag            tmb
19  %define kname           kernel-%{ktag}  %define kname           kernel-%{ktag}
# Line 97  Line 97 
97  # Build server (i686 / 64GB)/x86_64  # Build server (i686 / 64GB)/x86_64
98  %define build_server            1  %define build_server            1
99    
100    # compress modules with xz
101    %define build_modxz             0
102    
103  # End of user definitions  # End of user definitions
104  %{?_without_desktop586: %global build_desktop586 0}  %{?_without_desktop586: %global build_desktop586 0}
105  %{?_without_desktop: %global build_desktop 0}  %{?_without_desktop: %global build_desktop 0}
# Line 107  Line 110 
110  %{?_without_source: %global build_source 0}  %{?_without_source: %global build_source 0}
111  %{?_without_devel: %global build_devel 0}  %{?_without_devel: %global build_devel 0}
112  %{?_without_debug: %global build_debug 0}  %{?_without_debug: %global build_debug 0}
113    %{?_without_modxz: %global build_modxz 0}
114    
115  %{?_with_desktop586: %global build_desktop586 1}  %{?_with_desktop586: %global build_desktop586 1}
116  %{?_with_desktop: %global build_desktop 1}  %{?_with_desktop: %global build_desktop 1}
# Line 117  Line 121 
121  %{?_with_source: %global build_source 1}  %{?_with_source: %global build_source 1}
122  %{?_with_devel: %global build_devel 1}  %{?_with_devel: %global build_devel 1}
123  %{?_with_debug: %global build_debug 1}  %{?_with_debug: %global build_debug 1}
124    %{?_with_modxz: %global build_modxz 1}
125    
126  # For the .nosrc.rpm  # For the .nosrc.rpm
127  %define build_nosrc     0  %define build_nosrc     0
# Line 134  Line 139 
139  #  #
140  # SRC RPM description  # SRC RPM description
141  #  #
142  Summary:        Linux kernel built for Mandriva with modifications by %{ktag}  Summary:        Linux kernel built for %vendor with modifications by %{ktag}
143  Name:           %{kname}  Name:           %{kname}
144  Version:        %{kversion}  Version:        %{kversion}
145  Release:        %{rpmrel}  Release:        %{rpmrel}
# Line 142  License:       GPLv2 Line 147  License:       GPLv2
147  Group:          System/Kernel and hardware  Group:          System/Kernel and hardware
148  ExclusiveArch:  %{ix86} x86_64  ExclusiveArch:  %{ix86} x86_64
149  ExclusiveOS:    Linux  ExclusiveOS:    Linux
150  URL:            http://wiki.mandriva.com/en/Docs/Howto/Mandriva_Kernels#kernel-tmb  URL:            http://www.kernel.org
151    
152  ####################################################################  ####################################################################
153  #  #
# Line 193  Source10:      ftp://ftp.kernel.org/pub/linu Line 198  Source10:      ftp://ftp.kernel.org/pub/linu
198  # Defines for the things that are needed for all the kernels  # Defines for the things that are needed for all the kernels
199  #  #
200  %define common_description_kernel The kernel package contains the Linux kernel (vmlinuz), the core of your \  %define common_description_kernel The kernel package contains the Linux kernel (vmlinuz), the core of your \
201  Mandriva Linux operating system.  The kernel handles the basic functions \  %vendor Linux operating system.  The kernel handles the basic functions \
202  of the operating system:  memory allocation, process allocation, device \  of the operating system:  memory allocation, process allocation, device \
203  input and output, etc.  input and output, etc.
204    
 %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 !!  
   
205  ### Global Requires/Provides  ### Global Requires/Provides
206  %define requires1       mkinitrd >= 6.0.92-12  %define requires1       mkinitrd >= 6.0.92-12
207  %define requires2       bootloader-utils >= 1.12-1  %define requires2       bootloader-utils >= 1.12-1
# Line 222  BuildRequires:                 gcc >= 4.0.1-5 module-i Line 218  BuildRequires:                 gcc >= 4.0.1-5 module-i
218  %description  %description
219  %common_description_kernel  %common_description_kernel
220    
 %common_description_info  
   
221    
222  # mkflavour() name flavour processor  # mkflavour() name flavour processor
223  # name: the flavour name in the package name  # name: the flavour name in the package name
# Line 243  Group:         System/Kernel and hardware              \ Line 237  Group:         System/Kernel and hardware              \
237  %description -n %{kname}-%{1}-%{buildrel}               \  %description -n %{kname}-%{1}-%{buildrel}               \
238  %common_description_kernel %{expand:%{info_%(echo %{1})}} \  %common_description_kernel %{expand:%{info_%(echo %{1})}} \
239                                                          \                                                          \
 %common_description_info                                \  
                                                         \  
240  %if %build_devel                                        \  %if %build_devel                                        \
241  %package -n     %{kname}-%{1}-devel-%{buildrel}         \  %package -n     %{kname}-%{1}-devel-%{buildrel}         \
242  Version:        %{fakever}                              \  Version:        %{fakever}                              \
# Line 262  This package contains the kernel-devel f Line 254  This package contains the kernel-devel f
254                                                          \                                                          \
255  If you want to build your own kernel, you need to install the full \  If you want to build your own kernel, you need to install the full \
256  %{kname}-source-%{buildrel} rpm.                        \  %{kname}-source-%{buildrel} rpm.                        \
                                                         \  
 %common_description_info                                \  
257  %endif                                                  \  %endif                                                  \
258                                                          \                                                          \
259  %package -n %{kname}-%{1}-latest                        \  %package -n %{kname}-%{1}-latest                        \
# Line 280  Conflicts:     arch(x86_64)                            \ Line 270  Conflicts:     arch(x86_64)                            \
270  This package is a virtual rpm that aims to make sure you always have the \  This package is a virtual rpm that aims to make sure you always have the \
271  latest %{kname}-%{1} installed...                       \  latest %{kname}-%{1} installed...                       \
272                                                          \                                                          \
 %common_description_info                                \  
                                                         \  
273  %if %build_devel                                        \  %if %build_devel                                        \
274  %package -n %{kname}-%{1}-devel-latest                  \  %package -n %{kname}-%{1}-devel-latest                  \
275  Version:        %{kversion}                             \  Version:        %{kversion}                             \
# Line 296  Conflicts:     arch(x86_64)                            \ Line 284  Conflicts:     arch(x86_64)                            \
284  %description -n %{kname}-%{1}-devel-latest              \  %description -n %{kname}-%{1}-devel-latest              \
285  This package is a virtual rpm that aims to make sure you always have the \  This package is a virtual rpm that aims to make sure you always have the \
286  latest %{kname}-%{1}-devel installed...                 \  latest %{kname}-%{1}-devel installed...                 \
                                                         \  
 %common_description_info                                \  
287  %endif                                                  \  %endif                                                  \
288                                                          \                                                          \
289  %post -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1}-post \  %post -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1}-post \
# Line 459  build your own custom kernel that is bet Line 445  build your own custom kernel that is bet
445  If you only want the files needed to build 3rdparty (nVidia, Ati, dkms-*,...)  If you only want the files needed to build 3rdparty (nVidia, Ati, dkms-*,...)
446  drivers against, install the *-devel-* rpm that is matching your kernel.  drivers against, install the *-devel-* rpm that is matching your kernel.
447    
 %common_description_info  
448    
449  %post -n %{kname}-source-%{buildrel}  %post -n %{kname}-source-%{buildrel}
450  for i in /lib/modules/%{kversion}-%{ktag}-*-%{buildrpmrel}; do  for i in /lib/modules/%{kversion}-%{ktag}-*-%{buildrpmrel}; do
# Line 497  Conflicts:     arch(x86_64) Line 482  Conflicts:     arch(x86_64)
482  %description -n %{kname}-source-latest  %description -n %{kname}-source-latest
483  This package is a virtual rpm that aims to make sure you always have the  This package is a virtual rpm that aims to make sure you always have the
484  latest %{kname}-source installed...  latest %{kname}-source installed...
   
 %common_description_info  
485  %endif  %endif
486    
487  #  #
# Line 518  Various bits of information about the Li Line 501  Various bits of information about the Li
501  shipped with it are documented in these files. You also might want install  shipped with it are documented in these files. You also might want install
502  this package if you need a reference to the options that can be passed to  this package if you need a reference to the options that can be passed to
503  Linux kernel modules at load time.  Linux kernel modules at load time.
   
 %common_description_info  
504  %endif  %endif
505    
506  #  #
# Line 559  cd %src_dir Line 540  cd %src_dir
540  %define debug --no-debug  %define debug --no-debug
541  %endif  %endif
542    
543    # enable xz module compression
544    %if %build_modxz
545    sed -i  's/^CONFIG_MODULE_COMPRESS_GZIP=y/# CONFIG_MODULE_COMPRESS_GZIP is not set/' \
546            %{patches_dir}/configs/*.config
547    sed -i  's/^# CONFIG_MODULE_COMPRESS_XZ is not set/CONFIG_MODULE_COMPRESS_XZ=y/' \
548            %{patches_dir}/configs/*.config
549    %endif
550    
551  %{patches_dir}/scripts/create_configs %debug --user_cpu="%{_arch}"  %{patches_dir}/scripts/create_configs %debug --user_cpu="%{_arch}"
552    
553  # make sure the kernel has the sublevel we know it has...  # make sure the kernel has the sublevel we know it has...
# Line 859  EOF Line 848  EOF
848  ### Create kernel Postun script on the fly  ### Create kernel Postun script on the fly
849  cat > $kernel_files-postun <<EOF  cat > $kernel_files-postun <<EOF
850  /sbin/kernel_remove_initrd %{kversion}-%{ktag}-$kernel_flavour-%{buildrpmrel}  /sbin/kernel_remove_initrd %{kversion}-%{ktag}-$kernel_flavour-%{buildrpmrel}
851    rm -rf /lib/modules/%{kversion}-%{ktag}-$kernel_flavour-%{buildrpmrel} > /dev/null
852  EOF  EOF
853  }  }
854    
# Line 1067  rm -rf %{buildroot} Line 1057  rm -rf %{buildroot}
1057  %endif  %endif
1058    
1059  %changelog  %changelog
1060    * Sun May 22 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.7-1.mga1
1061    - update to 2.6.38.7 (CVE-2011-1770, CVE-2011-1776, CVE-2011-1927)
1062    - drop merged patches:
1063        * DG20-DG24
1064    - update patches:
1065        * FU01, FU03: rollback unionfs to a working 2.5.8
1066    - add patches:
1067        * AA01: block: rescan partitions on invalidated devices on -ENOMEDIA too
1068        * DN17: r8169: add a new chip for RTL8105
1069        * DN18: r8169: add a new chip for RTL8168DP
1070        * DN19: r8169: add support for RTL8168E/RTL8111E
1071    
1072    * Wed May 18 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.6-2.mga1
1073    - disable xz module compression again as not all tools/utils can cope
1074      with it (can be enabled with '--with modxz' buildtime flag)
1075    
1076    * Thu May 12 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.6-1.mga1
1077    - enable xz module compression on 2011.0
1078    - update to 2.6.38.6
1079    - drop merged patches:
1080        * AX01
1081    - add patches:
1082        * DG20: drm/radeon/kms: add pci id to acer travelmate quirk for 5730
1083        * DG21: drm/radeon/kms: fix gart setup on fusion parts (v2) backport
1084        * DG22: drm/i915/dp: Be paranoid in case we disable a DP before it is attached
1085        * DG23: drm/i915/lvds: Only act on lid notify when the device is on
1086        * DG24: drm/i915: Release object along create user fb error path
1087        * DP30: revert: "dell-laptop: Toggle the unsupported hardware killswitch"
1088                as it causes regressions on existing hw (reported by Colin Guthrie)
1089        * SM02: add support for compressing modules with xz
1090    - clean /lib/modules tree on uninstall
1091    - disable ACPI_PROCFS_POWER as its obsoleted by the sysfs interface
1092    - drop hardcoded vendor references from summarys and descriptions (#1161)
1093    - drop warnings about being experimental kernel
1094    
1095    * Wed May  5 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.5-1.mga1
1096    - update to 2.6.38.5
1097    - add patches:
1098        * AX01: x86, AMD: K8 Rev.A-E processors are subject to erratum 400
1099        * AX05: x86, 32bit: raise default vmalloc area to 192MB (Anssi, #904)
1100        * DN15: r8169: add support for RTL8105E
1101        * DN16: r8169: be verbose when unable to load firmware
1102        * DN20: disable powersaving on rt2800 as it is broken (noted by rtp)
1103        * DP06-DP08: samsung-laptop: add support for N230, R410P
1104        * DP20-DP26: hp-wmi: add support for rfkill on HP Mini 5102 (Anssi)
1105    - update patches:
1106        * FU01: unionfs 2.5.9
1107    - drop patches:
1108        * FU03: unionfs oops fix (obsolete)
1109    - enable DEBUG_RODATA and DEBUG_SET_MODULE_RONX (tv)
1110    
1111    * Sun Apr 24 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.4-1.mga1
1112    - update to 2.6.38.4
1113    - update patches:
1114        * DG10: drm/i915: Fix tiling corruption from pipelined fencing
1115        * NI30, NI31: ipset 6.4
1116    - add patches:
1117        * DA60, DA61: ide/ahci/raid support for Intel Panther Point
1118        * DF01: add old ieee1394 aliases to new firewire stack
1119        * DG11: drm: Retry i2c transfer of EDID block after failure
1120        * DG12: drm/i915/dp: Sanity check eDP existence
1121        * DG13: drm/i915: Restore missing command flush before interrupt on BLT ring
1122        * DG14: drm/i915: Avoid unmapping pages from a NULL address space
1123        * DG15: drm/i915: Enable GPU semaphores by default
1124        * DM01: add dm-raid45 aliases to the new dm-raid target
1125        * DP15: intel_ips: fix monitor thread to use TASK_INTERRUPTIBLE
1126    
1127    * Sat Apr 16 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.3-1.mga1
1128    - update to 2.6.38.3
1129    - drop merged patches
1130    
1131  * Mon Apr 11 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.2-2.mga1  * Mon Apr 11 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.2-2.mga1
1132  - add -stable queue patches (31 fixes)  - add -stable queue patches (31 fixes)
1133  - update patches:  - update patches:

Legend:
Removed from v.83510  
changed lines
  Added in v.100142

  ViewVC Help
Powered by ViewVC 1.1.30