summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-10-24 09:02:35 -0700
committerLaura Abbott <labbott@fedoraproject.org>2016-10-24 09:09:55 -0700
commit4894ff88ff3d6213e28075da9424a4feb6f08291 (patch)
tree1329409502c933ea24912248010dd382517e40ff /scripts
parentae409faa50468c2287adee363a9f97bba0fcc28e (diff)
downloadkernel-4894ff88ff3d6213e28075da9424a4feb6f08291.tar.gz
kernel-4894ff88ff3d6213e28075da9424a4feb6f08291.tar.xz
kernel-4894ff88ff3d6213e28075da9424a4feb6f08291.zip
rawhide-rc fixes
- rcrev is a %global, not a %define - base_sublevel needs to be +1 (see comments in kernel.spec)
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rawhide-rc.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/rawhide-rc.sh b/scripts/rawhide-rc.sh
index 2e871ee8e..51a3b09f2 100755
--- a/scripts/rawhide-rc.sh
+++ b/scripts/rawhide-rc.sh
@@ -9,9 +9,11 @@ scripts/fixup-bumpspec.sh
fedpkg commit -c
# Figure out what is our RC
-RC=`grep "%define rcrev" kernel.spec| cut -d ' ' -f 3`
+RC=`grep "%global rcrev" kernel.spec| cut -d ' ' -f 3`
RC=$(($RC+1))
BASE=`grep "%define base_sublevel" kernel.spec| cut -d ' ' -f 3`
+# See comment in kernel.spec about the base numbering
+BASE=$(($BASE+1))
# Kill all patches
awk '!/patch/ { print $0 }' < sources > sources.tmp
@@ -27,7 +29,7 @@ if [ ! -f patch-4.$BASE-rc$RC.xz ]; then
fi
# bump rcrev in the spec and set git snapshot to 0
-RC=$RC perl -p -i -e 's|%define rcrev.*|%global rcrev $ENV{'RC'}|' kernel.spec
+RC=$RC perl -p -i -e 's|%global rcrev.*|%global rcrev $ENV{'RC'}|' kernel.spec
perl -p -i -e 's|%define gitrev.*|%define gitrev 0|' kernel.spec