diff options
| author | Alexandre Oliva <lxoliva@fsfla.org> | 2017-03-30 12:35:45 +0000 |
|---|---|---|
| committer | Alexandre Oliva <lxoliva@fsfla.org> | 2017-03-30 12:35:45 +0000 |
| commit | 60d47b98d435792871d7fd4edda6e2af5f0b9678 (patch) | |
| tree | ada2bc8028d668fff6483069814c6dccf461bbe6 /freed-ora/current/f24/scripts | |
| parent | 1c69d37c4a4f9a03f282d39bf3a408d61e5e87cb (diff) | |
| download | linux-libre-raptor-60d47b98d435792871d7fd4edda6e2af5f0b9678.tar.gz linux-libre-raptor-60d47b98d435792871d7fd4edda6e2af5f0b9678.zip | |
4.10.6-100.fc24.gnu
Diffstat (limited to 'freed-ora/current/f24/scripts')
| -rwxr-xr-x | freed-ora/current/f24/scripts/generate-git-snapshot.sh | 4 | ||||
| -rwxr-xr-x | freed-ora/current/f24/scripts/rawhide-rc.sh | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/freed-ora/current/f24/scripts/generate-git-snapshot.sh b/freed-ora/current/f24/scripts/generate-git-snapshot.sh index 972fd2148..242200ef6 100755 --- a/freed-ora/current/f24/scripts/generate-git-snapshot.sh +++ b/freed-ora/current/f24/scripts/generate-git-snapshot.sh @@ -16,11 +16,11 @@ if [ ! -d "$LINUX_GIT" ]; then exit 1 fi -VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed s/-git.*// | sed s/.xz//) +VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed s/-git.*// | sed s/.xz// | sed s/[\(\)]//g) if [ -z "$VER" ] ; then - VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.xz//) + VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.xz// | sed s/[\(\)]//g) fi OLDGIT=$(grep gitrev kernel.spec | head -n1 | sed s/%define\ gitrev\ //) diff --git a/freed-ora/current/f24/scripts/rawhide-rc.sh b/freed-ora/current/f24/scripts/rawhide-rc.sh index 2e871ee8e..51a3b09f2 100755 --- a/freed-ora/current/f24/scripts/rawhide-rc.sh +++ b/freed-ora/current/f24/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 |
