/[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 206041 by tmb,
Tue Feb  7 16:37:45 2012 UTC
+revision 224401 by tmb,
Mon Mar 19 15:57:44 2012 UTC
 Line 2
  # *tmb* series kernels now use kernel.org versioning
  #
  %define kernelversion   3
- %define patchlevel      2
+ %define patchlevel      3
  # sublevel is now used for -stable patches
- %define sublevel        5
+ %define sublevel        0
  # Package release
  %define mgarel          1
 Line 101
  # Build server (i686 / 64GB)/x86_64
  %define build_server            1
- # compress modules with xz
- %define build_modxz             0
  # End of user definitions
  %{?_without_desktop586: %global build_desktop586 0}
  %{?_without_desktop: %global build_desktop 0}
-Line 114
+Line 111
  %{?_without_source: %global build_source 0}
  %{?_without_devel: %global build_devel 0}
  %{?_without_debug: %global build_debug 0}
- %{?_without_modxz: %global build_modxz 0}
  %{?_with_desktop586: %global build_desktop586 1}
  %{?_with_desktop: %global build_desktop 1}
-Line 125
+Line 121
  %{?_with_source: %global build_source 1}
  %{?_with_devel: %global build_devel 1}
  %{?_with_debug: %global build_debug 1}
- %{?_with_modxz: %global build_modxz 1}
  # For the .nosrc.rpm
  %define build_nosrc     0
-Line 220 
 of the operating system:  memory allocat
+Line 215 
 of the operating system:  memory allocat
  input and output, etc.
  ### Global Requires/Provides
- %define requires1       dracut >= 014-15
+ %define requires1       dracut >= 017-1
  %define requires2       bootloader-utils >= 1.12-1
  %define requires3       sysfsutils >= 1.3.0-1 module-init-tools >= 3.16-14
  %define requires4       kernel-firmware >= 20111229-1
-Line 563 
 cd %src_dir
+Line 558 
 cd %src_dir
  %define debug --no-debug
  %endif
- # 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
  %{patches_dir}/scripts/create_configs %debug --user_cpu="%{_arch}"
  # make sure the kernel has the sublevel we know it has...
-Line 648 
 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 675 
 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 hexagon ia64 microblaze mips m32r m68k \
+         for i in alpha arm arm26 avr32 blackfin c6x cris frv h8300 hexagon ia64 \
-                  m68knommu mn10300 openrisc parisc powerpc ppc s390 sh sh64 score sparc tile \
+                  microblaze mips m32r m68k m68knommu mn10300 openrisc parisc \
-                  unicore32 v850 xtensa; do
+                  powerpc ppc s390 sh sh64 score sparc tile unicore32 v850 xtensa; do
                  rm -rf $TempDevelRoot/arch/$i
          done
-Line 960 
 chmod -R a+rX %{target_source}
+Line 948 
 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 hexagon ia64 microblaze mips m32r m68k \
+ for i in alpha arm arm26 avr32 blackfin c6x cris frv h8300 hexagon ia64 \
-          m68knommu mn10300 openrisc parisc powerpc ppc s390 sh sh64 score sparc tile \
+          microblaze mips m32r m68k m68knommu mn10300 openrisc parisc \
-          v850 xtensa unicore32; do
+          powerpc ppc s390 sh sh64 score sparc tile v850 xtensa unicore32; do
          rm -rf %{target_source}/arch/$i
  done
-Line 1075 
 popd
+Line 1063 
 popd
  %endif
  %changelog
+ * 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

 Legend:



Removed from v.206041
 


changed lines


 
Added in v.224401
 Legend:



Removed from v.206041
 


changed lines


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

	ViewVC Help
Powered by ViewVC 1.1.30