From 1bde9dbcae119aa2a77d4aa36961f1aa0cde5ced Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott@redhat.com>
Date: Mon, 4 Mar 2019 07:13:09 -0800
Subject: Linux v5.0.0

---
 scripts/create_headers_tarball.sh | 6 ++----
 scripts/kernel-version.sh         | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/scripts/create_headers_tarball.sh b/scripts/create_headers_tarball.sh
index cb57db634..5105f790c 100755
--- a/scripts/create_headers_tarball.sh
+++ b/scripts/create_headers_tarball.sh
@@ -27,10 +27,8 @@ STABLE=`grep "%define stable_update" kernel.spec| cut -d ' ' -f 3`
 RC=`grep "%global rcrev" kernel.spec| cut -d ' ' -f 3`
 GITREV=`grep "%define gitrev" kernel.spec| cut -d ' ' -f 3`
 if [ $RELEASED -eq 0 ]; then
-	#cd kernel-$MAJORVER.$BASE.fc??
-	cd kernel-5.0-rc$RC.fc??
-	#NEWBASE=$(($BASE+1))
-	NEWBASE=0
+	cd kernel-$MAJORVER.$BASE.fc??
+	NEWBASE=$(($BASE+1))
 	KVER=$MAJORVER.$NEWBASE.0-0.rc$RC.git$GITREV.$BASERELEASE
 	cd linux-$MAJORVER.$NEWBASE.0-0.rc$RC.git$GITREV.$BASERELEASE.fc*/
 else
diff --git a/scripts/kernel-version.sh b/scripts/kernel-version.sh
index 0de4c10d9..e2ec93a5a 100644
--- a/scripts/kernel-version.sh
+++ b/scripts/kernel-version.sh
@@ -2,7 +2,7 @@ VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed
 
 if [ -z "$VER" ] ;
 then
-    VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.gz// | tr -d "()")
+    VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.xz// | tr -d "()")
 fi
 
 
-- 
cgit