/[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 75092 by tmb, Sun Mar 20 23:16:11 2011 UTC revision 110087 by tmb, Sun Jun 19 20:28:48 2011 UTC
# Line 3  Line 3 
3  #  #
4  %define kernelversion   2  %define kernelversion   2
5  %define patchlevel      6  %define patchlevel      6
6  %define sublevel        37  %define sublevel        38
7    
8  # kernel Makefile extraversion is substituted by  # kernel Makefile extraversion is substituted by
9  # kpatch/kgit/kstable wich are either 0 (empty), rc (kpatch),  # kpatch/kgit/kstable wich are either 0 (empty), rc (kpatch),
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         4  %define kstable         8
14    
15  # this is the releaseversion  # this is the releaseversion
16  %define kbuild          1  %define kbuild          1
# Line 18  Line 18 
18  %define ktag            tmb  %define ktag            tmb
19  %define kname           kernel-%{ktag}  %define kname           kernel-%{ktag}
20    
21  %define rpmtag          %distsuffix  %define rpmtag          %{distsuffix}%{mgaver}
22  %if %kpatch  %if %kpatch
23  %if %kgit  %if %kgit
24  %define rpmrel          %mkrel 0.%{kpatch}.%{kgit}.%{kbuild}  %define rpmrel          %mkrel 0.%{kpatch}.%{kgit}.%{kbuild}
# 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 729  $DevelRoot/include/rdma Line 718  $DevelRoot/include/rdma
718  $DevelRoot/include/rxrpc  $DevelRoot/include/rxrpc
719  $DevelRoot/include/scsi  $DevelRoot/include/scsi
720  $DevelRoot/include/sound  $DevelRoot/include/sound
721    $DevelRoot/include/target
722  $DevelRoot/include/trace  $DevelRoot/include/trace
723  $DevelRoot/include/video  $DevelRoot/include/video
724  $DevelRoot/include/xen  $DevelRoot/include/xen
# Line 858  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 1027  rm -rf %{buildroot} Line 1018  rm -rf %{buildroot}
1018  %{_kerneldir}/include/rxrpc  %{_kerneldir}/include/rxrpc
1019  %{_kerneldir}/include/scsi  %{_kerneldir}/include/scsi
1020  %{_kerneldir}/include/sound  %{_kerneldir}/include/sound
1021    %{_kerneldir}/include/target
1022  %{_kerneldir}/include/trace  %{_kerneldir}/include/trace
1023  %{_kerneldir}/include/video  %{_kerneldir}/include/video
1024  %{_kerneldir}/include/xen  %{_kerneldir}/include/xen
# Line 1065  rm -rf %{buildroot} Line 1057  rm -rf %{buildroot}
1057  %endif  %endif
1058    
1059  %changelog  %changelog
1060  * Sun Mar 20 2011 Thomas Backlund <tmb@mandriva.org> 2.6.37.4-1mdv  * Sun Jun 19 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.8-1.mga1
1061    - update to 2.6.38.8 (CVE-2011-1017)
1062    - drop merged patches:
1063        * AA01, DP15
1064    - add patches:
1065        * CK02: update bfs scheduler to 0.406
1066        * MK01: ksm: fix race between ksmd and exiting task (CVE-2011-2183)
1067    - add mgaver to 'uname -r'
1068    
1069    * Sun May 22 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.7-1.mga1
1070    - update to 2.6.38.7 (CVE-2011-1770, CVE-2011-1776, CVE-2011-1927)
1071    - drop merged patches:
1072        * DG20-DG24
1073    - update patches:
1074        * FU01, FU03: rollback unionfs to a working 2.5.8
1075    - add patches:
1076        * AA01: block: rescan partitions on invalidated devices on -ENOMEDIA too
1077        * DN17: r8169: add a new chip for RTL8105
1078        * DN18: r8169: add a new chip for RTL8168DP
1079        * DN19: r8169: add support for RTL8168E/RTL8111E
1080    
1081    * Wed May 18 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.6-2.mga1
1082    - disable xz module compression again as not all tools/utils can cope
1083      with it (can be enabled with '--with modxz' buildtime flag)
1084    
1085    * Thu May 12 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.6-1.mga1
1086    - enable xz module compression on 2011.0
1087    - update to 2.6.38.6
1088    - drop merged patches:
1089        * AX01
1090    - add patches:
1091        * DG20: drm/radeon/kms: add pci id to acer travelmate quirk for 5730
1092        * DG21: drm/radeon/kms: fix gart setup on fusion parts (v2) backport
1093        * DG22: drm/i915/dp: Be paranoid in case we disable a DP before it is attached
1094        * DG23: drm/i915/lvds: Only act on lid notify when the device is on
1095        * DG24: drm/i915: Release object along create user fb error path
1096        * DP30: revert: "dell-laptop: Toggle the unsupported hardware killswitch"
1097                as it causes regressions on existing hw (reported by Colin Guthrie)
1098        * SM02: add support for compressing modules with xz
1099    - clean /lib/modules tree on uninstall
1100    - disable ACPI_PROCFS_POWER as its obsoleted by the sysfs interface
1101    - drop hardcoded vendor references from summarys and descriptions (#1161)
1102    - drop warnings about being experimental kernel
1103    
1104    * Wed May  5 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.5-1.mga1
1105    - update to 2.6.38.5
1106    - add patches:
1107        * AX01: x86, AMD: K8 Rev.A-E processors are subject to erratum 400
1108        * AX05: x86, 32bit: raise default vmalloc area to 192MB (Anssi, #904)
1109        * DN15: r8169: add support for RTL8105E
1110        * DN16: r8169: be verbose when unable to load firmware
1111        * DN20: disable powersaving on rt2800 as it is broken (noted by rtp)
1112        * DP06-DP08: samsung-laptop: add support for N230, R410P
1113        * DP20-DP26: hp-wmi: add support for rfkill on HP Mini 5102 (Anssi)
1114    - update patches:
1115        * FU01: unionfs 2.5.9
1116    - drop patches:
1117        * FU03: unionfs oops fix (obsolete)
1118    - enable DEBUG_RODATA and DEBUG_SET_MODULE_RONX (tv)
1119    
1120    * Sun Apr 24 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.4-1.mga1
1121    - update to 2.6.38.4
1122    - update patches:
1123        * DG10: drm/i915: Fix tiling corruption from pipelined fencing
1124        * NI30, NI31: ipset 6.4
1125    - add patches:
1126        * DA60, DA61: ide/ahci/raid support for Intel Panther Point
1127        * DF01: add old ieee1394 aliases to new firewire stack
1128        * DG11: drm: Retry i2c transfer of EDID block after failure
1129        * DG12: drm/i915/dp: Sanity check eDP existence
1130        * DG13: drm/i915: Restore missing command flush before interrupt on BLT ring
1131        * DG14: drm/i915: Avoid unmapping pages from a NULL address space
1132        * DG15: drm/i915: Enable GPU semaphores by default
1133        * DM01: add dm-raid45 aliases to the new dm-raid target
1134        * DP15: intel_ips: fix monitor thread to use TASK_INTERRUPTIBLE
1135    
1136    * Sat Apr 16 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.3-1.mga1
1137    - update to 2.6.38.3
1138    - drop merged patches
1139    
1140    * Mon Apr 11 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.2-2.mga1
1141    - add -stable queue patches (31 fixes)
1142    - update patches:
1143        * CK01: Con Kolivas -ck3 patchset including bfs 0.400
1144        * FR01: reiser4 for 2.6.38 final
1145    - drop patches:
1146        * FR02: reiser4 buildfix (merged)
1147    
1148    * Tue Mar 29 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.2-1.mga1
1149    - update to 2.6.38.2
1150    - drop merged patches:
1151        * AX01, AX10, FS01-FS03, LD01-LD02 (xz support)
1152        * CK02 (-ck1 patchset buildfix)
1153        * DA01-DA03 (ahci ids)
1154        * DG01-DG02 (gpu fixes)
1155        * DM10-DM14 (dm-raid45, replaced by new dm-raid target)
1156        * DM20 (dm-crypt multicore support)
1157        * DP06 (samsung-laptop buildfix)
1158        * KB01 (headers_install_all export fix)
1159        * SE01 (staging fix)
1160    - rediff patches:
1161        * AI01 (Toshiba Equium A60 fix)
1162        * DV01-DV02 (framebuffer oops and deadlock fixes)
1163        * MB02 (3rdparty merge)
1164    - update patches:
1165        * CK01: Con Kolivas -ck1 patchset including BFS v363
1166        * DP05: update samsung-laptop to the one being merged in
1167                2.6.39 (replaces old samsung-backlight)
1168        * FR01-FR02: reiser4 support
1169        * FU01-FU03: unionfs 2.5.8
1170        * KP01: TuxOnIce
1171        * S2: disable mrproper on -devel rpms
1172    - add patches:
1173        * DA20: acpi video blacklist (needed for shuttle-wmi)
1174        * DG10: drm/i915: Fix pipelined fencing
1175        * DP10: shuttle-wmi support
1176        * MB16: ndiswrapper buildfix
1177    - update defconfigs and filelists
1178    
1179    * Sun Mar 20 2011 Thomas Backlund <tmb@mandriva.org> 2.6.37.4-1.mga1
1180  - update to 2.6.37.4 (CVE-2011-1013, CVE-2011-1019, CVE-2011-1076)  - update to 2.6.37.4 (CVE-2011-1013, CVE-2011-1019, CVE-2011-1076)
1181  - drop merged patch:  - drop merged patch:
1182      * NI01      * NI01
# Line 1078  rm -rf %{buildroot} Line 1189  rm -rf %{buildroot}
1189      * DG02: drm/i915: Fix calculation of backlight value in combined mode      * DG02: drm/i915: Fix calculation of backlight value in combined mode
1190  - drop S5, not needed anymore as we ship unprepared kernel-source  - drop S5, not needed anymore as we ship unprepared kernel-source
1191    
1192  * Sat Jan 26 2011 Thomas Backlund <tmb@mandriva.org> 2.6.37.2-1mdv  * Sat Jan 26 2011 Thomas Backlund <tmb@mandriva.org> 2.6.37.2-1.mga1
1193  - update to 2.6.37.2  - update to 2.6.37.2
1194  - rediff patch:  - rediff patch:
1195      * CK01: Con Kolivas -ck1 patchset including BFS      * CK01: Con Kolivas -ck1 patchset including BFS

Legend:
Removed from v.75092  
changed lines
  Added in v.110087

  ViewVC Help
Powered by ViewVC 1.1.30