diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-18 15:59:30 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-18 15:59:30 +0100 |
commit | 5a86fcc0d12c79876416d21c6cd67859fe770b2a (patch) | |
tree | c6fa3cefc4764036f6f415c3ca2ad6de4f78548b /scripts | |
parent | e781a69ec5d97b73d8ab778c671c5cc4baad22b7 (diff) | |
parent | b9534d956de311a7bdb390810010bfb0aa409a44 (diff) | |
download | kernel-5a86fcc0d12c79876416d21c6cd67859fe770b2a.tar.gz kernel-5a86fcc0d12c79876416d21c6cd67859fe770b2a.tar.xz kernel-5a86fcc0d12c79876416d21c6cd67859fe770b2a.zip |
merge originkernel-5.1.0-0.rc1.git0.1.vanilla.knurd.1.fc31kernel-5.1.0-0.rc1.git0.1.vanilla.knurd.1.fc30kernel-5.1.0-0.rc1.git0.1.vanilla.knurd.1.fc29kernel-5.1.0-0.rc1.git0.1.vanilla.knurd.1.fc28
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/rawhide-rc.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/rawhide-rc.sh b/scripts/rawhide-rc.sh index 82e0e5224..45de1a95b 100755 --- a/scripts/rawhide-rc.sh +++ b/scripts/rawhide-rc.sh @@ -30,24 +30,24 @@ BASE=`grep "%define base_sublevel" kernel.spec| cut -d ' ' -f 3` OLDBASE=$BASE # See comment in kernel.spec about the base numbering BASE=$(($BASE+1)) +MAJORVER=5 # Kill all patches awk '!/patch/ { print $0 }' < sources > sources.tmp mv sources.tmp sources # Grab the tarball -if [ ! -f patch-4.$BASE-rc$RC.xz ]; then - wget -O patch-4.$BASE-rc$RC https://git.kernel.org/torvalds/p/v4.$BASE-rc$RC/v4.$OLDBASE +if [ ! -f patch-$MAJORVER.$BASE-rc$RC.xz ]; then + wget -O patch-$MAJORVER.$BASE-rc$RC https://git.kernel.org/torvalds/p/v$MAJORVER.$BASE-rc$RC/v$MAJORVER.$OLDBASE if [ ! $? -eq 0 ]; then exit 1 fi - xz -9 patch-4.$BASE-rc$RC + xz -9 patch-$MAJORVER.$BASE-rc$RC + #fedpkg upload patch-$MAJORVER.$BASE-rc$RC.xz - # fedpkg upload patch-4.$BASE-rc$RC.xz - - checksum=$(sha512sum patch-4.$BASE-rc$RC.xz) - echo "SHA512 (patch-4.$BASE-rc$RC.xz) = ${checksum:0:128}" >> sources - fi + checksum=$(sha512sum patch-$MAJORVER.$BASE-rc$RC.xz) + echo "SHA512 (patch-$MAJORVER.$BASE-rc$RC.xz) = ${checksum:0:128}" >> sources +fi # bump rcrev in the spec and set git snapshot to 0 RC=$RC perl -p -i -e 's|%global rcrev.*|%global rcrev $ENV{'RC'}|' kernel.spec @@ -56,6 +56,6 @@ perl -p -i -e 's|%define gitrev.*|%define gitrev 0|' kernel.spec perl -p -i -e 's|%global baserelease.*|%global baserelease 0|' kernel.spec -# rpmdev-bumpspec -c "Linux v4.$BASE-rc$RC" kernel.spec +# rpmdev-bumpspec -c "Linux v$MAJORVER.$BASE-rc$RC" kernel.spec echo "Don't forget to bump kernel-tools" |