From 02d1cba5ee8fa68968826ae0ea35edd1c5da4d52 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 18 Mar 2019 14:09:10 +0000 Subject: [PATCH] Fix up the rawhide-rc.sh script for 5.x --- scripts/rawhide-rc.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/rawhide-rc.sh b/scripts/rawhide-rc.sh index ba8b467b2..a4e15820a 100755 --- a/scripts/rawhide-rc.sh +++ b/scripts/rawhide-rc.sh @@ -22,19 +22,20 @@ 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 - fedpkg upload patch-4.$BASE-rc$RC.xz + xz -9 patch-$MAJORVER.$BASE-rc$RC + fedpkg upload patch-$MAJORVER.$BASE-rc$RC.xz fi # bump rcrev in the spec and set git snapshot to 0 @@ -44,6 +45,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"