/[packages]/cauldron/kernel-linus/current/SPECS/kernel-linus.spec
ViewVC logotype

Diff of /cauldron/kernel-linus/current/SPECS/kernel-linus.spec

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

revision 1357642 by tmb, Thu Jan 17 15:17:04 2019 UTC revision 1357827 by tmb, Thu Jan 17 22:28:13 2019 UTC
# Line 3  Line 3 
3  %define patchlevel      20  %define patchlevel      20
4  # sublevel is now used for -stable patches  # sublevel is now used for -stable patches
5  %define sublevel        3  %define sublevel        3
 # extstable is for extended stable patches  
 %define extstable       0  
6    
7  # kernel Makefile extraversion is substituted by  # kernel Makefile extraversion is substituted by
8  # kpatch/kgit wich are either 0 (empty), rc (kpatch), git (kgit)  # kpatch/kgit wich are either 0 (empty), rc (kpatch), git (kgit)
# Line 45  Line 43 
43  %else  %else
44  %define tar_ver         %{kernelversion}.%{patchlevel}  %define tar_ver         %{kernelversion}.%{patchlevel}
45  %endif  %endif
 %if %extstable  
 %define kversion        %{kernelversion}.%{patchlevel}.%{sublevel}.%{extstable}  
 %else  
46  %define kversion        %{kernelversion}.%{patchlevel}.%{sublevel}  %define kversion        %{kernelversion}.%{patchlevel}.%{sublevel}
 %endif  
47  %define kverrel         %{kversion}-%{rpmrel}  %define kverrel         %{kversion}-%{rpmrel}
48    
49  # used for not making too long names for rpms or search paths  # used for not making too long names for rpms or search paths
# Line 170  Patch1:         https://cdn.kernel.org/p Line 164  Patch1:         https://cdn.kernel.org/p
164  Patch2:         https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.xz  Patch2:         https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.xz
165  #Source12:      https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.sign  #Source12:      https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.sign
166  %endif  %endif
 %if %extstable  
 Patch3:         patch-%{kernelversion}.%{patchlevel}.%{sublevel}.%{extstable}.patch  
 %endif  
167    
168  # critical fixes  # critical fixes
169    
# Line 441  pushd %src_dir Line 432  pushd %src_dir
432  %if %kpatch  %if %kpatch
433  %patch2 -p1  %patch2 -p1
434  %endif  %endif
 %if %extstable  
 %patch3 -p1  
 %endif  
435    
436  # critical fixes  # critical fixes
437    
# Line 493  cd %{src_dir} Line 481  cd %{src_dir}
481  chmod 755 tools/objtool/sync-check.sh  chmod 755 tools/objtool/sync-check.sh
482    
483  # make sure EXTRAVERSION says what we want it to say  # make sure EXTRAVERSION says what we want it to say
 %if %extstable  
 LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .%{extstable}-%{buildrpmrel}/" Makefile  
 %else  
484  LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{buildrpmrel}/" Makefile  LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{buildrpmrel}/" Makefile
 %endif  
485    
486  # Prepare the kernel  # Prepare the kernel
487  %smake -s mrproper  %smake -s mrproper

Legend:
Removed from v.1357642  
changed lines
  Added in v.1357827

  ViewVC Help
Powered by ViewVC 1.1.30