/[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 174468 by tmb,
Wed Nov 30 17:47:21 2011 UTC
+revision 206041 by tmb,
Tue Feb  7 16:37:45 2012 UTC
 Line 2
  # *tmb* series kernels now use kernel.org versioning
  #
  %define kernelversion   3
- %define patchlevel      1
+ %define patchlevel      2
  # sublevel is now used for -stable patches
- %define sublevel        4
+ %define sublevel        5
  # Package release
- %define mgarel          2
+ %define mgarel          1
  # kernel Makefile extraversion is substituted by
  # kpatch/kgit wich are either 0 (empty), rc (kpatch), git (kgit)
 Line 220 
 of the operating system:  memory allocat
  input and output, etc.
  ### Global Requires/Provides
- %define requires1       mkinitrd >= 6.0.92-12
+ %define requires1       dracut >= 014-15
  %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
-Line 304 
 latest %{kname}-%{1}-devel installed...
+Line 302 
 latest %{kname}-%{1}-devel installed...
  %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 314 
 latest %{kname}-%{1}-devel installed...
+Line 313 
 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 328 
 latest %{kname}-%{1}-devel installed...
+Line 325 
 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 344 
 processor mode, use the "nosmp" boot par
+Line 342 
 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 368 
 processor mode, use the "nosmp" boot par
+Line 367 
 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 674 
 SaveDevel() {
+Line 675 
 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 cris frv h8300 hexagon ia64 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
-Line 703 
 SaveDevel() {
+Line 704 
 SaveDevel() {
  ### Create the kernel_devel_files.*
  cat > $kernel_devel_files <<EOF
- %defattr(-,root,root)
  %dir $DevelRoot
  %dir $DevelRoot/arch
  %dir $DevelRoot/include
 Line 730 
 $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 794 
 CreateFiles() {
+Line 795 
 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 836 
 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 954 
 chmod -R a+rX %{target_source}
+Line 960 
 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 cris frv h8300 hexagon ia64 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
-Line 990 
 done
+Line 996 
 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 1007 
 rm -rf %{buildroot}
+Line 1006 
 rm -rf %{buildroot}
  ###
  %if %build_source
  %files -n %{kname}-source-%{buildrel}
- %defattr(-,root,root)
  %dir %{_kerneldir}
  %dir %{_kerneldir}/arch
  %dir %{_kerneldir}/include
-Line 1032 
 rm -rf %{buildroot}
+Line 1030 
 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 1068 
 rm -rf %{buildroot}
+Line 1067 
 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
- * Wed Nov 30 2011 Thomas Backlund <tmb@mandriva.org> 3.1.4-2.mga2
+ * 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@mandriva.org> 3.1.4-1.mga2
+ * 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@mandriva.org> 3.1.3-1.mga2
+ * 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
-Line 1117 
 rm -rf %{buildroot}
+Line 1168 
 rm -rf %{buildroot}
  - dont ship openrisc arch files
  - update defconfigs
- * 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
  - update to 3.0.8
    * drop merged patch: DM20
  - enable PM_RUNTIME and USB_SUSPEND
- * 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
  - 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@mandriva.org> 3.0.6-1.mga2
+ * 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@mandriva.org> 3.0.4-1.mga2
+ * 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@mandriva.org> 3.0.3-1.mga2
+ * 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
-Line 1164 
 rm -rf %{buildroot}
+Line 1215 
 rm -rf %{buildroot}
  - build with -s(ilent) to only log varnings and errors
  - update defconfigs
- * 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
  - update to 2.6.38.8 (CVE-2011-1017)
  - drop merged patches:
      * AA01, DP15
-Line 1173 
 rm -rf %{buildroot}
+Line 1224 
 rm -rf %{buildroot}
      * MK01: ksm: fix race between ksmd and exiting task (CVE-2011-2183)
  - add mgaver to 'uname -r'
- * 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
  - update to 2.6.38.7 (CVE-2011-1770, CVE-2011-1776, CVE-2011-1927)
  - drop merged patches:
      * DG20-DG24
-Line 1185 
 rm -rf %{buildroot}
+Line 1236 
 rm -rf %{buildroot}
      * DN18: r8169: add a new chip for RTL8168DP
      * DN19: r8169: add support for RTL8168E/RTL8111E
- * 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
  - 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@mandriva.org> 2.6.38.6-1.mga1
+ * 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:
-Line 1208 
 rm -rf %{buildroot}
+Line 1259 
 rm -rf %{buildroot}
  - drop hardcoded vendor references from summarys and descriptions (#1161)
  - drop warnings about being experimental kernel
- * 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
  - update to 2.6.38.5
  - add patches:
      * AX01: x86, AMD: K8 Rev.A-E processors are subject to erratum 400
-Line 1224 
 rm -rf %{buildroot}
+Line 1275 
 rm -rf %{buildroot}
      * FU03: unionfs oops fix (obsolete)
  - enable DEBUG_RODATA and DEBUG_SET_MODULE_RONX (tv)
- * 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
  - update to 2.6.38.4
  - update patches:
      * DG10: drm/i915: Fix tiling corruption from pipelined fencing
-Line 1240 
 rm -rf %{buildroot}
+Line 1291 
 rm -rf %{buildroot}
      * 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@mandriva.org> 2.6.38.3-1.mga1
+ * 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@mandriva.org> 2.6.38.2-2.mga1
+ * 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
-Line 1252 
 rm -rf %{buildroot}
+Line 1303 
 rm -rf %{buildroot}
  - drop patches:
      * FR02: reiser4 buildfix (merged)
- * 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
  - update to 2.6.38.2
  - drop merged patches:
      * AX01, AX10, FS01-FS03, LD01-LD02 (xz support)
-Line 1283 
 rm -rf %{buildroot}
+Line 1334 
 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 1296 
 rm -rf %{buildroot}
+Line 1347 
 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.174468
 


changed lines


 
Added in v.206041
 Legend:



Removed from v.174468
 


changed lines


 
Added in v.206041
-Removed from v.174468
+Added in v.206041

	ViewVC Help
Powered by ViewVC 1.1.30