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

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

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

revision 201840 by tmb, Thu Jan 26 10:09:07 2012 UTC revision 209856 by tmb, Thu Feb 16 21:55:11 2012 UTC
# Line 4  Line 4 
4  %define kernelversion   3  %define kernelversion   3
5  %define patchlevel      2  %define patchlevel      2
6  # sublevel is now used for -stable patches  # sublevel is now used for -stable patches
7  %define sublevel        2  %define sublevel        6
8    
9  # Package release  # Package release
10  %define mgarel          1  %define mgarel          1
# Line 101  Line 101 
101  # Build server (i686 / 64GB)/x86_64  # Build server (i686 / 64GB)/x86_64
102  %define build_server            1  %define build_server            1
103    
 # compress modules with xz  
 %define build_modxz             0  
   
104  # End of user definitions  # End of user definitions
105  %{?_without_desktop586: %global build_desktop586 0}  %{?_without_desktop586: %global build_desktop586 0}
106  %{?_without_desktop: %global build_desktop 0}  %{?_without_desktop: %global build_desktop 0}
# Line 114  Line 111 
111  %{?_without_source: %global build_source 0}  %{?_without_source: %global build_source 0}
112  %{?_without_devel: %global build_devel 0}  %{?_without_devel: %global build_devel 0}
113  %{?_without_debug: %global build_debug 0}  %{?_without_debug: %global build_debug 0}
 %{?_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 125  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}
 %{?_with_modxz: %global build_modxz 1}  
124    
125  # For the .nosrc.rpm  # For the .nosrc.rpm
126  %define build_nosrc     0  %define build_nosrc     0
# Line 220  of the operating system:  memory allocat Line 215  of the operating system:  memory allocat
215  input and output, etc.  input and output, etc.
216    
217  ### Global Requires/Provides  ### Global Requires/Provides
218  %define requires1       dracut >= 014-15  %define requires1       dracut >= 016-1
219  %define requires2       bootloader-utils >= 1.12-1  %define requires2       bootloader-utils >= 1.12-1
220  %define requires3       sysfsutils >= 1.3.0-1 module-init-tools >= 3.6-14  %define requires3       sysfsutils >= 1.3.0-1 module-init-tools >= 3.16-14
221  %define requires4       kernel-firmware >= 20111229-1  %define requires4       kernel-firmware >= 20111229-1
222    
223  %define kprovides       %{kname} = %{kverrel}, kernel = %{tar_ver}, drbd-api = 88  %define kprovides       %{kname} = %{kverrel}, kernel = %{tar_ver}, drbd-api = 88
224    
225  Autoreqprov:            no  Autoreqprov:            no
226  BuildRequires:          gcc >= 4.0.1-5 module-init-tools >= 3.6-14  BuildRequires:          gcc >= 4.0.1-5 module-init-tools >= 3.16-14
227    
228  %description  %description
229  %common_description_kernel  %common_description_kernel
# Line 563  cd %src_dir Line 558  cd %src_dir
558  %define debug --no-debug  %define debug --no-debug
559  %endif  %endif
560    
 # enable xz module compression  
 %if %build_modxz  
 sed -i  's/^CONFIG_MODULE_COMPRESS_GZIP=y/# CONFIG_MODULE_COMPRESS_GZIP is not set/' \  
         %{patches_dir}/configs/*.config  
 sed -i  's/^# CONFIG_MODULE_COMPRESS_XZ is not set/CONFIG_MODULE_COMPRESS_XZ=y/' \  
         %{patches_dir}/configs/*.config  
 %endif  
   
561  %{patches_dir}/scripts/create_configs %debug --user_cpu="%{_arch}"  %{patches_dir}/scripts/create_configs %debug --user_cpu="%{_arch}"
562    
563  # make sure the kernel has the sublevel we know it has...  # make sure the kernel has the sublevel we know it has...
# Line 1075  popd Line 1062  popd
1062  %endif  %endif
1063    
1064  %changelog  %changelog
1065  * Thu Jan 26 2012 Thomas Backlund <tmb@mandriva.org> 3.2.2-1.mga2  * Thu Feb 16 2012 Thomas Backlund <tmb@mageia.org> 3.2.6-1.mga2
1066    - update to 3.2.6
1067    - add current stable queue (28 fixes, AA01-AA28)
1068    - require dracut >= 016-1 for xz compressed modules support and
1069      other needed fixes
1070    - compress modules with xz
1071    
1072    * Tue Feb  7 2012 Thomas Backlund <tmb@mageia.org> 3.2.5-1.mga2
1073    - update to 3.2.5
1074    - drop merged patch
1075        * DP01: ASPM rework
1076    
1077    * Thu Jan 26 2012 Thomas Backlund <tmb@mageia.org> 3.2.2-1.mga2
1078  - update to 3.2.2 (CVE-2012-0056)  - update to 3.2.2 (CVE-2012-0056)
1079  - update patches:  - update patches:
1080      * CK01: Con Kolivas 3.2-ck1 patchset      * CK01: Con Kolivas 3.2-ck1 patchset
# Line 1083  popd Line 1082  popd
1082  - require dracut instead of mkinitrd  - require dracut instead of mkinitrd
1083  - require module-init-tools >= 3.6-14 for xz support  - require module-init-tools >= 3.6-14 for xz support
1084    
1085  * Sun Jan 15 2012 Thomas Backlund <tmb@mandriva.org> 3.2.1-1.mga2  * Sun Jan 15 2012 Thomas Backlund <tmb@mageia.org> 3.2.1-1.mga2
1086  - update to 3.2.1  - update to 3.2.1
1087    
1088  * Thu Jan  5 2012 Thomas Backlund <tmb@mandriva.org> 3.2.0-1.mga2  * Thu Jan  5 2012 Thomas Backlund <tmb@mageia.org> 3.2.0-1.mga2
1089  - update to 3.2  - update to 3.2
1090  - add patches:  - add patches:
1091      * FU02: fix unionfs build with 3.2 series kernels      * FU02: fix unionfs build with 3.2 series kernels
# Line 1099  popd Line 1098  popd
1098      * FB01: btrfs fix, merged      * FB01: btrfs fix, merged
1099  - update filelists and defconfigs  - update filelists and defconfigs
1100    
1101  * Thu Dec 22 2011 Thomas Backlund <tmb@mandriva.org> 3.1.6-1.mga2  * Thu Dec 22 2011 Thomas Backlund <tmb@mageia.org> 3.1.6-1.mga2
1102  - update to 3.1.6  - update to 3.1.6
1103  - drop patch DS01 (merged)  - drop patch DS01 (merged)
1104  - trigger dkms build in posttrans so modules get built at kernel install  - trigger dkms build in posttrans so modules get built at kernel install
# Line 1111  popd Line 1110  popd
1110    for apps that requests it), as it fixes desktop freeze when accessing    for apps that requests it), as it fixes desktop freeze when accessing
1111    slow media such as usb (thanks to fbui/mdv mail on @cooker ml).    slow media such as usb (thanks to fbui/mdv mail on @cooker ml).
1112    
1113  * Fri Dec  9 2011 Thomas Backlund <tmb@mandriva.org> 3.1.5-1.mga2  * Fri Dec  9 2011 Thomas Backlund <tmb@mageia.org> 3.1.5-1.mga2
1114  - update to 3.1.5  - update to 3.1.5
1115  - drop merged patches:  - drop merged patches:
1116      * DG01-DG06, FX01-FX06      * DG01-DG06, FX01-FX06
# Line 1119  popd Line 1118  popd
1118      * DS01: ALSA: hda/realtek - Fix Oops in alc_mux_select()      * DS01: ALSA: hda/realtek - Fix Oops in alc_mux_select()
1119  - clean spec: drop buildroot and defattr  - clean spec: drop buildroot and defattr
1120    
1121  * Tue Dec  6 2011 Thomas Backlund <tmb@mandriva.org> 3.1.4-3.mga2  * Tue Dec  6 2011 Thomas Backlund <tmb@mageia.org> 3.1.4-3.mga2
1122  - fix patch NI12: IFWLOG: fix return value of checkentry  - fix patch NI12: IFWLOG: fix return value of checkentry
1123    (not properly modified in 2.6.35+ patch, blino, #3594)    (not properly modified in 2.6.35+ patch, blino, #3594)
1124  - rebuild with GCC-4.6.2  - rebuild with GCC-4.6.2
1125    
1126  * Wed Nov 30 2011 Thomas Backlund <tmb@mandriva.org> 3.1.4-2.mga2  * Wed Nov 30 2011 Thomas Backlund <tmb@mageia.org> 3.1.4-2.mga2
1127  - update patch:  - update patch:
1128    * CK01: upstream 3.1.0-ck2 including BFS 0.415    * CK01: upstream 3.1.0-ck2 including BFS 0.415
1129    
1130  * Tue Nov 29 2011 Thomas Backlund <tmb@mandriva.org> 3.1.4-1.mga2  * Tue Nov 29 2011 Thomas Backlund <tmb@mageia.org> 3.1.4-1.mga2
1131  - update to 3.1.4  - update to 3.1.4
1132    * reverts usb patch that broke isochronous devices    * reverts usb patch that broke isochronous devices
1133      (i.e. webcam, audio, or other streaming devices)      (i.e. webcam, audio, or other streaming devices)
1134    
1135  * Mon Nov 28 2011 Thomas Backlund <tmb@mandriva.org> 3.1.3-1.mga2  * Mon Nov 28 2011 Thomas Backlund <tmb@mageia.org> 3.1.3-1.mga2
1136  - update to 3.1.3  - update to 3.1.3
1137  - add patches:  - add patches:
1138    * DG01: i915: Fix inconsistent backlight level during disabled    * DG01: i915: Fix inconsistent backlight level during disabled
# Line 1163  popd Line 1162  popd
1162  - dont ship openrisc arch files  - dont ship openrisc arch files
1163  - update defconfigs  - update defconfigs
1164    
1165  * Tue Oct 25 2011 Thomas Backlund <tmb@mandriva.org> 3.0.8-1.mga2  * Tue Oct 25 2011 Thomas Backlund <tmb@mageia.org> 3.0.8-1.mga2
1166  - update to 3.0.8  - update to 3.0.8
1167    * drop merged patch: DM20    * drop merged patch: DM20
1168  - enable PM_RUNTIME and USB_SUSPEND  - enable PM_RUNTIME and USB_SUSPEND
1169    
1170  * Tue Oct 18 2011 Thomas Backlund <tmb@mandriva.org> 3.0.7-1.mga2  * Tue Oct 18 2011 Thomas Backlund <tmb@mageia.org> 3.0.7-1.mga2
1171  - update to 3.0.7  - update to 3.0.7
1172  - update patch:  - update patch:
1173      * CK01: 3.0.7-ck1 including BFS 0.413      * CK01: 3.0.7-ck1 including BFS 0.413
1174  - re-enable usblp as it is needed by both usb-pp adapters and some printers  - re-enable usblp as it is needed by both usb-pp adapters and some printers
1175    (mga #2240, #2264) (cups is patched to work with both usblp and libusb)    (mga #2240, #2264) (cups is patched to work with both usblp and libusb)
1176    
1177  * Tue Oct 04 2011 Thomas Backlund <tmb@mandriva.org> 3.0.6-1.mga2  * Tue Oct 04 2011 Thomas Backlund <tmb@mageia.org> 3.0.6-1.mga2
1178  - update to 3.0.6  - update to 3.0.6
1179  - add patch:  - add patch:
1180      * DM20: fix boot hang on uvc webcam init (mga #2425)      * DM20: fix boot hang on uvc webcam init (mga #2425)
1181    
1182  * Tue Aug 30 2011 Thomas Backlund <tmb@mandriva.org> 3.0.4-1.mga2  * Tue Aug 30 2011 Thomas Backlund <tmb@mageia.org> 3.0.4-1.mga2
1183  - update to 3.0.4  - update to 3.0.4
1184  - drop merged patch: AA01  - drop merged patch: AA01
1185    
1186  * Fri Aug 19 2011 Thomas Backlund <tmb@mandriva.org> 3.0.3-1.mga2  * Fri Aug 19 2011 Thomas Backlund <tmb@mageia.org> 3.0.3-1.mga2
1187  - update to 3.0.3  - update to 3.0.3
1188  - update patches:  - update patches:
1189      * CK01: Con Kolivas -ck patchset including BFS      * CK01: Con Kolivas -ck patchset including BFS
# Line 1210  popd Line 1209  popd
1209  - build with -s(ilent) to only log varnings and errors  - build with -s(ilent) to only log varnings and errors
1210  - update defconfigs  - update defconfigs
1211    
1212  * Sun Jun 19 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.8-1.mga1  * Sun Jun 19 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.8-1.mga1
1213  - update to 2.6.38.8 (CVE-2011-1017)  - update to 2.6.38.8 (CVE-2011-1017)
1214  - drop merged patches:  - drop merged patches:
1215      * AA01, DP15      * AA01, DP15
# Line 1219  popd Line 1218  popd
1218      * MK01: ksm: fix race between ksmd and exiting task (CVE-2011-2183)      * MK01: ksm: fix race between ksmd and exiting task (CVE-2011-2183)
1219  - add mgaver to 'uname -r'  - add mgaver to 'uname -r'
1220    
1221  * Sun May 22 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.7-1.mga1  * Sun May 22 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.7-1.mga1
1222  - update to 2.6.38.7 (CVE-2011-1770, CVE-2011-1776, CVE-2011-1927)  - update to 2.6.38.7 (CVE-2011-1770, CVE-2011-1776, CVE-2011-1927)
1223  - drop merged patches:  - drop merged patches:
1224      * DG20-DG24      * DG20-DG24
# Line 1231  popd Line 1230  popd
1230      * DN18: r8169: add a new chip for RTL8168DP      * DN18: r8169: add a new chip for RTL8168DP
1231      * DN19: r8169: add support for RTL8168E/RTL8111E      * DN19: r8169: add support for RTL8168E/RTL8111E
1232    
1233  * Wed May 18 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.6-2.mga1  * Wed May 18 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.6-2.mga1
1234  - disable xz module compression again as not all tools/utils can cope  - disable xz module compression again as not all tools/utils can cope
1235    with it (can be enabled with '--with modxz' buildtime flag)    with it (can be enabled with '--with modxz' buildtime flag)
1236    
1237  * Thu May 12 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.6-1.mga1  * Thu May 12 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.6-1.mga1
1238  - enable xz module compression on 2011.0  - enable xz module compression on 2011.0
1239  - update to 2.6.38.6  - update to 2.6.38.6
1240  - drop merged patches:  - drop merged patches:
# Line 1254  popd Line 1253  popd
1253  - drop hardcoded vendor references from summarys and descriptions (#1161)  - drop hardcoded vendor references from summarys and descriptions (#1161)
1254  - drop warnings about being experimental kernel  - drop warnings about being experimental kernel
1255    
1256  * Wed May  5 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.5-1.mga1  * Wed May  5 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.5-1.mga1
1257  - update to 2.6.38.5  - update to 2.6.38.5
1258  - add patches:  - add patches:
1259      * AX01: x86, AMD: K8 Rev.A-E processors are subject to erratum 400      * AX01: x86, AMD: K8 Rev.A-E processors are subject to erratum 400
# Line 1270  popd Line 1269  popd
1269      * FU03: unionfs oops fix (obsolete)      * FU03: unionfs oops fix (obsolete)
1270  - enable DEBUG_RODATA and DEBUG_SET_MODULE_RONX (tv)  - enable DEBUG_RODATA and DEBUG_SET_MODULE_RONX (tv)
1271    
1272  * Sun Apr 24 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.4-1.mga1  * Sun Apr 24 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.4-1.mga1
1273  - update to 2.6.38.4  - update to 2.6.38.4
1274  - update patches:  - update patches:
1275      * DG10: drm/i915: Fix tiling corruption from pipelined fencing      * DG10: drm/i915: Fix tiling corruption from pipelined fencing
# Line 1286  popd Line 1285  popd
1285      * DM01: add dm-raid45 aliases to the new dm-raid target      * DM01: add dm-raid45 aliases to the new dm-raid target
1286      * DP15: intel_ips: fix monitor thread to use TASK_INTERRUPTIBLE      * DP15: intel_ips: fix monitor thread to use TASK_INTERRUPTIBLE
1287    
1288  * Sat Apr 16 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.3-1.mga1  * Sat Apr 16 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.3-1.mga1
1289  - update to 2.6.38.3  - update to 2.6.38.3
1290  - drop merged patches  - drop merged patches
1291    
1292  * Mon Apr 11 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.2-2.mga1  * Mon Apr 11 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.2-2.mga1
1293  - add -stable queue patches (31 fixes)  - add -stable queue patches (31 fixes)
1294  - update patches:  - update patches:
1295      * CK01: Con Kolivas -ck3 patchset including bfs 0.400      * CK01: Con Kolivas -ck3 patchset including bfs 0.400
# Line 1298  popd Line 1297  popd
1297  - drop patches:  - drop patches:
1298      * FR02: reiser4 buildfix (merged)      * FR02: reiser4 buildfix (merged)
1299    
1300  * Tue Mar 29 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.2-1.mga1  * Tue Mar 29 2011 Thomas Backlund <tmb@mageia.org> 2.6.38.2-1.mga1
1301  - update to 2.6.38.2  - update to 2.6.38.2
1302  - drop merged patches:  - drop merged patches:
1303      * AX01, AX10, FS01-FS03, LD01-LD02 (xz support)      * AX01, AX10, FS01-FS03, LD01-LD02 (xz support)
# Line 1329  popd Line 1328  popd
1328      * MB16: ndiswrapper buildfix      * MB16: ndiswrapper buildfix
1329  - update defconfigs and filelists  - update defconfigs and filelists
1330    
1331  * 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
1332  - 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)
1333  - drop merged patch:  - drop merged patch:
1334      * NI01      * NI01
# Line 1342  popd Line 1341  popd
1341      * DG02: drm/i915: Fix calculation of backlight value in combined mode      * DG02: drm/i915: Fix calculation of backlight value in combined mode
1342  - drop S5, not needed anymore as we ship unprepared kernel-source  - drop S5, not needed anymore as we ship unprepared kernel-source
1343    
1344  * 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
1345  - update to 2.6.37.2  - update to 2.6.37.2
1346  - rediff patch:  - rediff patch:
1347      * CK01: Con Kolivas -ck1 patchset including BFS      * CK01: Con Kolivas -ck1 patchset including BFS
Legend:
Removed from v.201840  
changed lines
  Added in v.209856
  ViewVC Help
Powered by ViewVC 1.1.30