/[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 110087 by tmb, Sun Jun 19 20:28:48 2011 UTC revision 134369 by tmb, Thu Aug 18 22:09:27 2011 UTC
# Line 1  Line 1 
1  #  #
2  # *tmb* series kernels now use kernel.org versioning  # *tmb* series kernels now use kernel.org versioning
3  #  #
4  %define kernelversion   2  %define kernelversion   3
5  %define patchlevel      6  %define patchlevel      0
6  %define sublevel        38  # sublevel is now used for -stable patches
7    %define sublevel        3
8    
9    # Package release
10    %define mgarel          1
11    
12  # kernel Makefile extraversion is substituted by  # kernel Makefile extraversion is substituted by
13  # kpatch/kgit/kstable wich are either 0 (empty), rc (kpatch),  # kpatch/kgit wich are either 0 (empty), rc (kpatch), git (kgit)
 # git (kgit, only the number after "git"), or stable release (kstable)  
14  %define kpatch          0  %define kpatch          0
15    # kernel.org -gitX patch (only the number after "git")
16  %define kgit            0  %define kgit            0
 %define kstable         8  
   
 # this is the releaseversion  
 %define kbuild          1  
17    
18  %define ktag            tmb  # Patch tarball tag
19  %define kname           kernel-%{ktag}  %define ktag            tmb
20    # kernel base name (also name of srpm)
21    %define kname           kernel-%{ktag}
22    
23    # release defines
24  %define rpmtag          %{distsuffix}%{mgaver}  %define rpmtag          %{distsuffix}%{mgaver}
25  %if %kpatch  %if %kpatch
26  %if %kgit  %if %kgit
27  %define rpmrel          %mkrel 0.%{kpatch}.%{kgit}.%{kbuild}  %define rpmrel          %mkrel 0.%{kpatch}.%{kgit}.%{mgarel}
28  %else  %else
29  %define rpmrel          %mkrel 0.%{kpatch}.%{kbuild}  %define rpmrel          %mkrel 0.%{kpatch}.%{mgarel}
30  %endif  %endif
31  %else  %else
32  %define rpmrel          %mkrel %{kbuild}  %define rpmrel          %mkrel %{mgarel}
33  %endif  %endif
34    
35  # theese two never change, they are used to fool rpm/urpmi/smart  # fakerel and fakever never change, they are used to fool
36    # rpm/urpmi/smart
37  %define fakever         1  %define fakever         1
38  %define fakerel         %mkrel 1  %define fakerel         %mkrel 1
39    
40    # version defines
41    %define kversion        %{kernelversion}.%{patchlevel}.%{sublevel}
42    %define kverrel         %{kversion}-%{rpmrel}
43    
44  # When we are using a pre/rc patch, the tarball is a sublevel -1  # When we are using a pre/rc patch, the tarball is a sublevel -1
45  %if %kpatch  %if %kpatch
46  %define kversion        %{kernelversion}.%{patchlevel}.%{sublevel}  %if %sublevel
47  %define tar_ver         %{kernelversion}.%{patchlevel}.%(expr %{sublevel} - 1)  %define tar_ver         %{kernelversion}.%{patchlevel}
 %define patch_ver       %{kversion}-%{kpatch}-%{ktag}%{kbuild}  
 %else  
 %if %kstable  
 %define kversion        %{kernelversion}.%{patchlevel}.%{sublevel}.%{kstable}  
 %define tar_ver         %{kernelversion}.%{patchlevel}.%{sublevel}  
48  %else  %else
49  %define kversion        %{kernelversion}.%{patchlevel}.%{sublevel}  %define tar_ver         %{kernelversion}.%(expr %{patchlevel} - 1)
 %define tar_ver         %{kversion}  
50  %endif  %endif
51  %define patch_ver       %{kversion}-%{ktag}%{kbuild}  %define patch_ver       %{kversion}-%{kpatch}-%{ktag}%{mgarel}
52    %else
53    %define tar_ver         %{kernelversion}.%{patchlevel}
54    %define patch_ver       %{kversion}-%{ktag}%{mgarel}
55  %endif  %endif
 %define kverrel         %{kversion}-%{rpmrel}  
56    
57  # used for not making too long names for rpms or search paths  # Used for not making too long names for rpms or search paths
58  %if %kpatch  %if %kpatch
59  %if %kgit  %if %kgit
60  %define buildrpmrel     0.%{kpatch}.%{kgit}.%{kbuild}%{rpmtag}  %define buildrpmrel     0.%{kpatch}.%{kgit}.%{mgarel}%{rpmtag}
61  %else  %else
62  %define buildrpmrel     0.%{kpatch}.%{kbuild}%{rpmtag}  %define buildrpmrel     0.%{kpatch}.%{mgarel}%{rpmtag}
63  %endif  %endif
64  %else  %else
65  %define buildrpmrel     %{kbuild}%{rpmtag}  %define buildrpmrel     %{mgarel}%{rpmtag}
66  %endif  %endif
67  %define buildrel        %{kversion}-%{buildrpmrel}  %define buildrel        %{kversion}-%{buildrpmrel}
68    
69  # having different top level names for packges means that you have to remove them by hard :(  # having different top level names for packges means that you have to remove them by hard :(
70  %define top_dir_name    %{kname}-%{_arch}  %define top_dir_name    %{kname}-%{_arch}
71    
72  %define build_dir       ${RPM_BUILD_DIR}/%{top_dir_name}  %define build_dir       ${RPM_BUILD_DIR}/%{top_dir_name}
73  %define src_dir         %{build_dir}/linux-%{tar_ver}  %define src_dir         %{build_dir}/linux-%{tar_ver}
74    
75  # disable useless debug rpms...  # disable useless debug rpms...
76  %define _enable_debug_packages  %{nil}  %define _enable_debug_packages  %{nil}
77  %define debug_package           %{nil}  %define debug_package           %{nil}
78    
79  # Build defines  # Build defines
80  %define build_doc               0  %define build_doc               0
81  %define build_source            1  %define build_source            1
82  %define build_devel             1  %define build_devel             1
83  %define build_debug             0  %define build_debug             0
84    
85  # Build desktop i586 / 4GB  # Build desktop586 (i586 / 4GB)
86  %ifarch %{ix86}  %ifarch %{ix86}
87  %define build_desktop586        1  %define build_desktop586        1
88  %endif  %endif
89    
90  # Build mm (i686 / 4GB) / x86_64  # Build desktop (i686 / 4GB) / x86_64
91  %define build_desktop           1  %define build_desktop           1
92    
93  # Build laptop (i686 / 4GB)/ x86_64  # Build laptop (i686 / 4GB)/ x86_64
# Line 124  Line 128 
128  %{?_with_modxz: %global build_modxz 1}  %{?_with_modxz: %global build_modxz 1}
129    
130  # For the .nosrc.rpm  # For the .nosrc.rpm
131  %define build_nosrc     0  %define build_nosrc     0
132  %{?_with_nosrc: %global build_nosrc 1}  %{?_with_nosrc: %global build_nosrc 1}
133    
134  %define kmake %make  %define kmake %make
# Line 177  Source102:     %{kname}.patchlist Line 181  Source102:     %{kname}.patchlist
181  # Patch0 to Patch100 are for core kernel upgrades.  # Patch0 to Patch100 are for core kernel upgrades.
182  #  #
183    
184  # Pre linus patch: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing  # Pre linus patch: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/testing
185    
186  %if %kpatch  %if %kpatch
187  Patch1:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}.%{sublevel}-%{kpatch}.bz2  %if %sublevel
188  Source10:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}.%{sublevel}-%{kpatch}.bz2.sign  Patch2:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/stable-review/patch-%{kversion}-%{kpatch}.bz2
189    Source11:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/stable-review/patch-%{kversion}-%{kpatch}.bz2.sign
190    %else
191    Patch1:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.bz2
192    Source10:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.bz2.sign
193    %endif
194  %endif  %endif
195  %if %kgit  %if %kgit
196  Patch2:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}.%{sublevel}-%{kpatch}-git%{kgit}.bz2  Patch2:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.bz2
197  Source11:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}.%{sublevel}-%{kpatch}-git%{kgit}.bz2.sign  Source11:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.bz2.sign
198    %endif
199    %if %sublevel
200    %if %kpatch
201    %define prev_sublevel %(expr %{sublevel} - 1)
202    %if %prev_sublevel
203    Patch1:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kernelversion}.%{patchlevel}.%{prev_sublevel}.bz2
204    Source10:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kernelversion}.%{patchlevel}.%{prev_sublevel}.bz2.sign
205    %endif
206    %else
207    Patch1:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.bz2
208    Source10:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.bz2.sign
209  %endif  %endif
 %if %kstable  
 Patch1:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.bz2  
 Source10:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.bz2.sign  
210  %endif  %endif
211    
212  #END  #END
# Line 432  Requires:      glibc-devel, ncurses-devel, m Line 449  Requires:      glibc-devel, ncurses-devel, m
449  Summary:        The Linux source code for %{kname}-%{buildrel}  Summary:        The Linux source code for %{kname}-%{buildrel}
450  Group:          Development/Kernel  Group:          Development/Kernel
451  Autoreqprov:    no  Autoreqprov:    no
452  Provides:       kernel-source = %{kverrel}, kernel-devel = %{kverrel}  Provides:       kernel-source = %{kverrel}
453  %ifarch %{ix86}  Buildarch:      noarch
 Conflicts:      arch(x86_64)  
 %endif  
454    
455  %description -n %{kname}-source-%{buildrel}  %description -n %{kname}-source-%{buildrel}
456  The %{kname}-source package contains the source code files for the %{ktag}  The %{kname}-source package contains the source code files for the %{ktag}
# Line 475  Release:       %{rpmrel} Line 490  Release:       %{rpmrel}
490  Summary:        Virtual rpm for latest %{kname}-source  Summary:        Virtual rpm for latest %{kname}-source
491  Group:          Development/Kernel  Group:          Development/Kernel
492  Requires:       %{kname}-source-%{buildrel}  Requires:       %{kname}-source-%{buildrel}
493  %ifarch %{ix86}  Buildarch:      noarch
 Conflicts:      arch(x86_64)  
 %endif  
494    
495  %description -n %{kname}-source-latest  %description -n %{kname}-source-latest
496  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
# Line 514  Linux kernel modules at load time. Line 527  Linux kernel modules at load time.
527  %define patches_dir ../%{patch_ver}/  %define patches_dir ../%{patch_ver}/
528    
529  cd %src_dir  cd %src_dir
530    
531    %if %sublevel
532  %if %kpatch  %if %kpatch
533    %if %prev_sublevel
534  %patch1 -p1  %patch1 -p1
535  %endif  %endif
 %if %kgit  
536  %patch2 -p1  %patch2 -p1
537    %else
538    %patch1 -p1
539  %endif  %endif
540  %if %kstable  %else
541    %if %kpatch
542  %patch1 -p1  %patch1 -p1
543  %endif  %endif
544    %endif
545    %if %kgit
546    %patch2 -p1
547    %endif
548    
549  %{patches_dir}/scripts/apply_patches  %{patches_dir}/scripts/apply_patches
550    
# Line 583  PrepareKernel() { Line 605  PrepareKernel() {
605          fi          fi
606    
607          # make sure EXTRAVERSION says what we want it to say          # make sure EXTRAVERSION says what we want it to say
608          %if %kstable          LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -$extension/" Makefile
                 LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .%{kstable}-$extension/" Makefile  
         %else  
                 LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -$extension/" Makefile  
         %endif  
609    
610          %smake oldconfig          %smake oldconfig
611  }  }
# Line 597  BuildKernel() { Line 615  BuildKernel() {
615          KernelVer=$1          KernelVer=$1
616          echo "Building kernel $KernelVer"          echo "Building kernel $KernelVer"
617    
618          %kmake all          %kmake -s all
619    
620          # Start installing stuff          # Start installing stuff
621          install -d %{temp_boot}          install -d %{temp_boot}
# Line 657  SaveDevel() { Line 675  SaveDevel() {
675          cp -fR drivers/acpi/acpica/*.h $TempDevelRoot/drivers/acpi/acpica/          cp -fR drivers/acpi/acpica/*.h $TempDevelRoot/drivers/acpi/acpica/
676    
677          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 ia64 microblaze mips m32r m68k \
678                   m68knommu mn10300 parisc powerpc ppc s390 sh sh64 score sparc tile v850 xtensa; do                   m68knommu mn10300 parisc powerpc ppc s390 sh sh64 score sparc tile unicore32 v850 xtensa; do
679                  rm -rf $TempDevelRoot/arch/$i                  rm -rf $TempDevelRoot/arch/$i
680          done          done
681    
# Line 928  cp -a %{temp_root} %{buildroot} Line 946  cp -a %{temp_root} %{buildroot}
946    
947  # Create directories infastructure  # Create directories infastructure
948  %if %build_source  %if %build_source
949  install -d %{target_source}  install -d %{target_source}
950    
951  tar cf - . | tar xf - -C %{target_source}  tar cf - . | tar xf - -C %{target_source}
952  chmod -R a+rX %{target_source}  chmod -R a+rX %{target_source}
# Line 936  chmod -R a+rX %{target_source} Line 954  chmod -R a+rX %{target_source}
954  # we remove all the source files that we don't ship  # we remove all the source files that we don't ship
955  # first architecture files  # first architecture files
956  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 ia64 microblaze mips m32r m68k \
957           m68knommu mn10300 parisc powerpc ppc s390 sh sh64 score sparc tile v850 xtensa; do           m68knommu mn10300 parisc powerpc ppc s390 sh sh64 score sparc tile v850 xtensa unicore32; do
958          rm -rf %{target_source}/arch/$i          rm -rf %{target_source}/arch/$i
959  done  done
960    
# Line 946  done Line 964  done
964    
965  # other misc files  # other misc files
966  rm -f %{target_source}/{.config.old,.config.cmd,.mailmap,.missing-syscalls.d,arch/.gitignore}  rm -f %{target_source}/{.config.old,.config.cmd,.mailmap,.missing-syscalls.d,arch/.gitignore}
967    rm -rf %{target_source}/.tmp_depmod/
968    
969  #endif %build_source  #endif %build_source
970  %endif  %endif
# Line 1057  rm -rf %{buildroot} Line 1076  rm -rf %{buildroot}
1076  %endif  %endif
1077    
1078  %changelog  %changelog
1079    * Fri Aug 19 2011 Thomas Backlund <tmb@mandriva.org> 3.0.3-1.mga2
1080    - update to 3.0.3
1081    - update patches:
1082        * CK01: Con Kolivas -ck patchset including BFS
1083        * FU01: unionfs 2.5.9.2
1084        * KP01: TuxonIce 3.2
1085    - drop merged patches:
1086        * CK02, DA60-DA61, DG10-DG14, DN08, DN15-DN19, DP05-DP08
1087        * DP20-DP26, DP30, DV11, FU02-FU03, MK01, NI30-NI31
1088    - add patches:
1089        * AA01: genirq: Fix wrong bit operation
1090        * DP10-DP12: samsung-laptop: support nc110, nc210, r700, x520
1091        * DP13: samsung-laptop: fix support for older N150, N210, N220
1092        * FB01: btrfs: btrfs_calc_avail_data_space: cope with no read_write devices
1093        * MB17: ndiswrapper buildfix for 3.0
1094        * MC84: viahss buildfix for 3.0
1095    - rediff patches:
1096        * NI16: netfilter psd mdv/mga modifications
1097    - disable patches:
1098        * DV01-DV02: framebuffer oops fixes (should not be needed anymore)
1099        * FR01: reiser4 support (broken)
1100    - adapt spec for 3.0 series version changes
1101    - change kernel-tmb-source to noarch
1102    - build with -s(ilent) to only log varnings and errors
1103    - update defconfigs
1104    
1105  * Sun Jun 19 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.8-1.mga1  * Sun Jun 19 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.8-1.mga1
1106  - update to 2.6.38.8 (CVE-2011-1017)  - update to 2.6.38.8 (CVE-2011-1017)
1107  - drop merged patches:  - drop merged patches:

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

  ViewVC Help
Powered by ViewVC 1.1.28