diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-08-31 11:28:03 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-08-31 11:29:14 -0400 |
| commit | 0ee200eaae7874268ac0fa8a1c5fea5f2315985f (patch) | |
| tree | 97758639feda314b73cf6a68135d91610e51ce86 | |
| parent | 1003f0bfb9fbd272e335e21ce4813dacd5af212c (diff) | |
| download | kernel-0ee200eaae7874268ac0fa8a1c5fea5f2315985f.tar.gz kernel-0ee200eaae7874268ac0fa8a1c5fea5f2315985f.tar.xz kernel-0ee200eaae7874268ac0fa8a1c5fea5f2315985f.zip | |
Linux v4.2
Also add a check for a created git dir. We don't handle the released_kernel
case otherwise. I'll have to go back and fix this later.
| -rw-r--r-- | kernel.spec | 20 | ||||
| -rw-r--r-- | sources | 6 |
2 files changed, 18 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index e80ed4ed2..e0577d2ca 100644 --- a/kernel.spec +++ b/kernel.spec @@ -6,7 +6,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%global released_kernel 0 +%global released_kernel 1 # Sign modules on x86. Make sure the config files match this setting if more # architectures are added. @@ -46,7 +46,7 @@ Summary: The Linux kernel # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base, # which yields a base_sublevel of 0. -%define base_sublevel 1 +%define base_sublevel 2 ## If this is a released kernel ## %if 0%{?released_kernel} @@ -65,9 +65,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%define rcrev 8 +%define rcrev 0 # The git snapshot level -%define gitrev 3 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1142,6 +1142,15 @@ fi cp -al vanilla-%{vanillaversion} linux-%{KVERREL} cd linux-%{KVERREL} +if [ ! -d .git ]; then + git init + git config user.email "kernel-team@fedoraproject.org" + git config user.name "Fedora Kernel Team" + git config gc.auto 0 + git add . + git commit -a -q -m "baseline" +fi + # released_kernel with possible stable updates %if 0%{?stable_base} @@ -2043,6 +2052,9 @@ fi # # %changelog +* Mon Aug 31 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.2.0-1 +- Linux v4.2 + * Fri Aug 28 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.2.0-0.rc8.git3.1 - Linux v4.2-rc8-37-g4941b8f0c2b9 @@ -1,4 +1,2 @@ -fe9dc0f6729f36400ea81aa41d614c37 linux-4.1.tar.xz -84e34c2f58901edcc5c840fe9893c02e perf-man-4.1.tar.gz -9fdcb985419e57c2159d69f660ac9cd3 patch-4.2-rc8.xz -502dbedbeee01741bf15482da9fa7545 patch-4.2-rc8-git3.xz +3d5ea06d767e2f35c999eeadafc76523 linux-4.2.tar.xz +4c964bfba54d65b5b54cc898baddecad perf-man-4.2.tar.gz |