/[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 206041 by tmb, Tue Feb 7 16:37:45 2012 UTC revision 292370 by tmb, Tue Sep 11 17:23:21 2012 UTC
# Line 2  Line 2 
2  # *tmb* series kernels now use kernel.org versioning  # *tmb* series kernels now use kernel.org versioning
3  #  #
4  %define kernelversion   3  %define kernelversion   3
5  %define patchlevel      2  %define patchlevel      5
6  # sublevel is now used for -stable patches  # sublevel is now used for -stable patches
7  %define sublevel        5  %define sublevel        3
8    
9  # Package release  # Package release
10  %define mgarel          1  %define mgarel          2
11    
12  # kernel Makefile extraversion is substituted by  # kernel Makefile extraversion is substituted by
13  # kpatch/kgit wich are either 0 (empty), rc (kpatch), git (kgit)  # kpatch/kgit wich are either 0 (empty), rc (kpatch), git (kgit)
# 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 >= 017-9
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.16-14  %define requires3       sysfsutils >= 1.3.0-1 kmod >= 7-6
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.16-14  BuildRequires:          gcc >= 4.0.1-5 kmod >= 7-6
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 648  SaveDevel() { Line 635  SaveDevel() {
635          %ifarch %{ix86} x86_64          %ifarch %{ix86} x86_64
636                  cp -fR arch/x86/kernel/asm-offsets.{c,s} $TempDevelRoot/arch/x86/kernel/                  cp -fR arch/x86/kernel/asm-offsets.{c,s} $TempDevelRoot/arch/x86/kernel/
637                  cp -fR arch/x86/kernel/asm-offsets_{32,64}.c $TempDevelRoot/arch/x86/kernel/                  cp -fR arch/x86/kernel/asm-offsets_{32,64}.c $TempDevelRoot/arch/x86/kernel/
638                    cp -fR arch/x86/syscalls/syscall* $TempDevelRoot/arch/x86/syscalls/
639                  cp -fR arch/x86/include $TempDevelRoot/arch/x86/                  cp -fR arch/x86/include $TempDevelRoot/arch/x86/
640                    cp -fR arch/x86/tools/relocs.c $TempDevelRoot/arch/x86/tools/
641          %else          %else
642                  cp -fR arch/%{_arch}/kernel/asm-offsets.{c,s} $TempDevelRoot/arch/%{_arch}/kernel/                  cp -fR arch/%{_arch}/kernel/asm-offsets.{c,s} $TempDevelRoot/arch/%{_arch}/kernel/
643                  cp -fR arch/%{_arch}/include $TempDevelRoot/arch/%{_arch}/                  cp -fR arch/%{_arch}/include $TempDevelRoot/arch/%{_arch}/
644          %endif          %endif
645          cp -fR kernel/bounds.c $TempDevelRoot/kernel/          cp -fR kernel/bounds.c $TempDevelRoot/kernel/
646            cp -fR tools/include $TempDevelRoot/tools/
647          cp -fR .config Module.symvers $TempDevelRoot          cp -fR .config Module.symvers $TempDevelRoot
648          cp -fR 3rdparty/mkbuild.pl $TempDevelRoot/3rdparty/          cp -fR 3rdparty/mkbuild.pl $TempDevelRoot/3rdparty/
649    
# Line 675  SaveDevel() { Line 665  SaveDevel() {
665          # add acpica header files, needed for fglrx build          # add acpica header files, needed for fglrx build
666          cp -fR drivers/acpi/acpica/*.h $TempDevelRoot/drivers/acpi/acpica/          cp -fR drivers/acpi/acpica/*.h $TempDevelRoot/drivers/acpi/acpica/
667    
668          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 \
669                   m68knommu mn10300 openrisc parisc powerpc ppc s390 sh sh64 score sparc tile \                   microblaze mips m32r m68k m68knommu mn10300 openrisc parisc \
670                   unicore32 v850 xtensa; do                   powerpc ppc s390 sh sh64 score sparc tile unicore32 v850 xtensa; do
671                  rm -rf $TempDevelRoot/arch/$i                  rm -rf $TempDevelRoot/arch/$i
672          done          done
673    
# Line 730  $DevelRoot/include/keys Line 720  $DevelRoot/include/keys
720  $DevelRoot/include/linux  $DevelRoot/include/linux
721  $DevelRoot/include/math-emu  $DevelRoot/include/math-emu
722  $DevelRoot/include/media  $DevelRoot/include/media
723    $DevelRoot/include/memory
724  $DevelRoot/include/misc  $DevelRoot/include/misc
725  $DevelRoot/include/mtd  $DevelRoot/include/mtd
726  $DevelRoot/include/net  $DevelRoot/include/net
# Line 960  chmod -R a+rX %{target_source} Line 951  chmod -R a+rX %{target_source}
951    
952  # we remove all the source files that we don't ship  # we remove all the source files that we don't ship
953  # first architecture files  # first architecture files
954  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 \
955           m68knommu mn10300 openrisc parisc powerpc ppc s390 sh sh64 score sparc tile \           microblaze mips m32r m68k m68knommu mn10300 openrisc parisc \
956           v850 xtensa unicore32; do           powerpc ppc s390 sh sh64 score sparc tile v850 xtensa unicore32; do
957          rm -rf %{target_source}/arch/$i          rm -rf %{target_source}/arch/$i
958  done  done
959    
# Line 1030  popd Line 1021  popd
1021  %{_kerneldir}/include/linux  %{_kerneldir}/include/linux
1022  %{_kerneldir}/include/math-emu  %{_kerneldir}/include/math-emu
1023  %{_kerneldir}/include/media  %{_kerneldir}/include/media
1024    %{_kerneldir}/include/memory
1025  %{_kerneldir}/include/misc  %{_kerneldir}/include/misc
1026  %{_kerneldir}/include/mtd  %{_kerneldir}/include/mtd
1027  %{_kerneldir}/include/net  %{_kerneldir}/include/net
# Line 1075  popd Line 1067  popd
1067  %endif  %endif
1068    
1069  %changelog  %changelog
1070    * Tue Sep 11 2012 Thomas Backlund <tmb@mageia.org> 3.5.3-2.mga3
1071    - add patches:
1072      * AA01-AA85: stable queue fixes
1073      * FO01-FO13: overlayfs support (from ubuntu)
1074      * FE01: ext3: Fix fdatasync() for files with only i_size changes (mga #7343)
1075      * FU01: udf: Fix data corruption for files in ICB
1076    - drop patches:
1077      * FU01-FU04: unionfs support (broken)
1078    - update defconfigs
1079    
1080    * Mon Aug 27 2012 Thomas Backlund <tmb@mageia.org> 3.5.3-1.mga3
1081    - update to 3.5.3
1082    
1083    * Thu Aug 16 2012 Thomas Backlund <tmb@mageia.org> 3.5.2-1.mga3
1084    - update to 3.5.2
1085    - update patches:
1086      * CK01: ck1 patchset for 3.5 series kernels including BFS 0.424
1087      * KP01: TuxOnIce 3.3 for 3.5 series kernels
1088    - drop merged patches:
1089      * AA01-AA13: (stable queue fixes)
1090      * BS01: silencing useless scsi ioctl warnings
1091      * CK02: BFS buildfix
1092    - add patches:
1093      * FU03, FU04: unionfs buildfixes for 3.5 series kernels
1094    - update filelists
1095    - update defconfigs
1096    
1097    * Sat Jul 21 2012 Thomas Backlund <tmb@mageia.org> 3.4.6-2.mga3
1098    - make CONFIG_ATA_PIIX, CONFIG_BLK_DEV_SD and CONFIG_CRC_T10DIF
1099      builtin too, so it actually can boot without initrd
1100    - disable CONFIG_LOGO for less screen flickering during boot
1101    
1102    * Fri Jul 20 2012 Thomas Backlund <tmb@mageia.org> 3.4.6-1.mga3
1103    - update to 3.4.6
1104    - drop patch:
1105      * DN25: ipw2x00: add support for nl80211 clients (merged)
1106    - update patch:
1107      * CK01: -ck3 patchset including BFS v0.424
1108    - add patches:
1109      * AA01-AA13: stable queue fixes
1110      * BS01: silence useless scsi ioctl warnings
1111      * CK02: fix BFS build with sched-nohz-rewrite added in 3.4.6
1112    - make theese config options builtin in order to be able to
1113      test booting without initrd:
1114      (see: https://wiki.mageia.org/en/Feature:BootSansRamdisk)
1115      CONFIG_SCSI_MOD, CONFIG_SCSI, CONFIG_ATA, CONFIG_SATA_AHCI,
1116      CONFIG_EXT3_FS, CONFIG_EXT4_FS, CONFIG_JBD, CONFIG_JBD2,
1117      CONFIG_BTRFS_FS, CONFIG_CRYPTO_CRC32C, CONFIG_CRC16,
1118      CONFIG_LIBCRC32C, CONFIG_ZLIB_DEFLATE
1119    
1120    * Sun Jul  1 2012 Thomas Backlund <tmb@mageia.org> 3.4.4-2.mga3
1121    - enable EFI_STUB support (#6598)
1122    
1123    * Wed Jun 27 2012 Thomas Backlund <tmb@mageia.org> 3.4.4-1.mga3
1124    - update to 3.4.4
1125    - drop patch:
1126      * AA01: 3.4.4-rc1 (merged)
1127    
1128    * Wed Jun 20 2012 Thomas Backlund <tmb@mageia.org> 3.4.3-1.mga3
1129    - update to 3.4.3
1130    - add patch:
1131      * AA01: 3.4.4-rc1
1132    - drop patch:
1133      * FE01: ext4 uninit_bg fix (merged)
1134    - update patch:
1135      * CK01: ck2 patchset including BFS 0.423
1136    
1137    * Sat Jun  9 2012 Thomas Backlund <tmb@mageia.org> 3.4.2-1.mga3
1138    - update to 3.4.2
1139    - add patch:
1140      * FE01: ext4: fix the free blocks calculation for ext3
1141              file systems w/ uninit_bg
1142    
1143    * Mon Jun  4 2012 Thomas Backlund <tmb@mageia.org> 3.4.1-1.mga3
1144    - update to 3.4.1
1145    - drop merged patches:
1146      * DA60, DA61: ahci/ata ids
1147      * DG01-DG04, DG20-DG21, DG40-DG44, DG60: drm backports
1148      * DN10-DN11: ath5k stablilty fixes
1149      * DS20-DS24: sound fixes
1150    - update patches:
1151      * CK01: ck1 patchset including BFS 0.422
1152      * FU01: unionfs 2.5.11
1153      * KP01: tuxonice 3.2.1
1154      * NI10-NI11: netfilter IFWLOG support
1155      * NI16: netfilter psd support
1156    - add patches:
1157      * DM60: radio-rttrack buildfix
1158      * FU02: unionfs buildfix for kernel-3.4
1159    - drop patches:
1160      * DA50: prefer ata over ide hack, needs to be fixed properly
1161      * DN20: disabling powersave on rt2800usb
1162      * LK01: lib/Kconfig.debug text update
1163    - update defconfigs
1164    - update filelists
1165    
1166    * Thu May 17 2012 Thomas Backlund <tmb@mageia.org> 3.3.6-2.mga2
1167    - revert switching server kernels to SLAB allocator at it fails to boot
1168      with BFS scheduler (reported/confirmed by Charles A Edwards.on -dev ml)
1169    - add patches:
1170      * DN25: ipw2x00: add support for nl80211 clients like Network Manager (#5720)
1171      * DS20: ALSA: echoaudio: Remove incorrect part of assertion
1172      * DS21: ALSA: HDA: Lessen CPU usage when waiting for chip to respond
1173      * DS22: ALSA: hda/realtek - Add missing CD-input pin for MSI-7350 mobo
1174      * DS23: ALSA: hda/idt - Fix power-map for speaker-pins with some HP laptops
1175    
1176    * Sat May 12 2012 Thomas Backlund <tmb@mageia.org> 3.3.6-1.mga2
1177    - update to 3.3.6
1178    - drop merged patches:
1179      * AA01-AA32: stable queue fixes
1180      * DP10-DP13: samsung-laptop dmitable addons
1181    - switch server kernels back to SLAB allocator as it performs better
1182      on bigger server hardware and workloads
1183    
1184    * Thu May 10 2012 Thomas Backlund <tmb@mageia.org> 3.3.5-1.mga2
1185    - update to 3.3.5
1186    - drop merged patches:
1187      * DN15-DN17: iwlwifi fixes
1188    - add patches from stable queue
1189      * AA01-AA32: fixes all over
1190    
1191    * Sat Apr 28 2012 Thomas Backlund <tmb@mageia.org> 3.3.4-1.mga2
1192    - update to 3.3.4
1193    - require dracut >= 017-9
1194    - add patches:
1195      * DN16: iwlwifi: use 6000G2B for 6030 device series
1196      * DN17: iwlwifi: fix hardware queue programming
1197    
1198    * Mon Apr 23 2012 Thomas Backlund <tmb@mageia.org> 3.3.3-1.mga2
1199    - update to 3.3.3
1200    - add patches:
1201      * BF01: floppy: disable pnp autoloading
1202      * DN10: ath5k: do not stop queues for full calibration
1203      * DN11: ath5k: do not re-run AGC calibration periodically
1204      * DN15: iwlwifi: use correct released ucode version
1205    - update patch:
1206      * KP01: TuxOnIce 3.2.1 for kernel-3.3
1207    
1208    * Tue Apr 03 2012 Thomas Backlund <tmb@mageia.org> 3.3.1-1.mga2
1209    - update to 3.3.1
1210    - drop merged patches:
1211      * DM51, SR01-SR03
1212    - update patch:
1213      * CK01: -ck1 patchset including BFS v0.420
1214    - add patches:
1215      * DA50: ata: prefer ata drivers over ide drivers when both are built (Anssi)
1216      * DA60-DA61: ata: add ide/ahci/raid mode support for Intel Lynx Point chipset
1217      * DG01-DG04: drm: add upstream drm changes to support gpu driver backports
1218      * DG20, DG21: drm/radeon: backport support for Southern Islands (HD7xxx)
1219                    GPUs and Trinity APUs
1220      * DG40-DG44: drm/nouveau: backport Kepler (GTX6xx) support
1221      * DG60: drm/i915: add Ivy Bridge GT2 Server entries
1222    - update defconfigs
1223    
1224    * Mon Mar 19 2012 Thomas Backlund <tmb@mageia.org> 3.3.0-1.mga2
1225    - update to 3.3 final
1226    - add patches:
1227        * DM50: media: fix initialization on Hauppauge WinTV Nova HD-S2
1228                and similar hardware
1229        * DM51: media/tda10071: correct delivery system to DVB-S/S2
1230    - update defconfigs
1231    
1232    * Sun Mar 11 2012 Thomas Backlund <tmb@mageia.org> 3.3.0-0.rc7.1.mga2
1233    - update to 3.3-rc7
1234    
1235    * Wed Mar  7 2012 Thomas Backlund <tmb@mageia.org> 3.3.0-0.rc6.1.mga2
1236    - update to 3.3-rc6
1237    - update patches:
1238        * FU01: unionfs 2.5.11
1239        * MB10, MB13, MB14: ndiswrapper 1.57
1240    - rediff patches:
1241        * NI15, NI16: netfilter psd support
1242        * patch disabling mrproper in -devel rpms
1243    - disable patch:
1244        * CK01: -ck1 patchset including BFS sceduler (needs update to 3.3 series)
1245    - update defconfigs
1246    - update filelists
1247    
1248    * Thu Mar  1 2012 Thomas Backlund <tmb@mageia.org> 3.2.9-1.mga2
1249    - update to 3.2.9
1250    - require dracut >= 017-1
1251    - drop merged patches:
1252        * DG01, DP01, DU01, NM01
1253    - add patches:
1254        * SR01-SR03: fix nonworking r8172u wireless driver in staging (#4491)
1255    
1256    * Sat Feb 25 2012 Thomas Backlund <tmb@mageia.org> 3.2.7-1.mga2
1257    - update to 3.2.7
1258    - drop merged patches AA01-AA28
1259    - add patches:
1260        * DG01: drm/radeon/kms: fix MSI re-arm on rv370+
1261        * DP01: PCI: workaround hard-wired bus number
1262        * DS20, DS21: fix nonworking r8172u wireless driver in staging (#4491)
1263        * DU01: xhci: Fix oops caused by more USB2 ports than USB3 ports
1264        * NM01: mac80211: Fix a rwlock bad magic bug
1265    
1266    * Thu Feb 16 2012 Thomas Backlund <tmb@mageia.org> 3.2.6-1.mga2
1267    - update to 3.2.6
1268    - add current stable queue (28 fixes, AA01-AA28)
1269    - require dracut >= 016-1 for xz compressed modules support and
1270      other needed fixes
1271    - compress modules with xz
1272    
1273  * Tue Feb  7 2012 Thomas Backlund <tmb@mageia.org> 3.2.5-1.mga2  * Tue Feb  7 2012 Thomas Backlund <tmb@mageia.org> 3.2.5-1.mga2
1274  - update to 3.2.5  - update to 3.2.5
1275  - drop merged patch  - drop merged patch

Legend:
Removed from v.206041  
changed lines
  Added in v.292370

  ViewVC Help
Powered by ViewVC 1.1.30