diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-04 16:34:21 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-04 16:34:21 +0100 |
commit | 0f2ece3e3cde7faf83d54ed6879c79d1aae64d65 (patch) | |
tree | c32efce0f2fd7859a65bfa4e10be7e06042349f2 /scripts | |
parent | b9d72545b7ca785ac5aec22711c0405e60f3a4aa (diff) | |
parent | 1bde9dbcae119aa2a77d4aa36961f1aa0cde5ced (diff) | |
download | kernel-0f2ece3e3cde7faf83d54ed6879c79d1aae64d65.tar.gz kernel-0f2ece3e3cde7faf83d54ed6879c79d1aae64d65.tar.xz kernel-0f2ece3e3cde7faf83d54ed6879c79d1aae64d65.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.0.0-1.vanilla.knurd.1.fc31kernel-5.0.0-1.vanilla.knurd.1.fc30kernel-5.0.0-1.vanilla.knurd.1.fc29kernel-5.0.0-1.vanilla.knurd.1.fc28
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/create_headers_tarball.sh | 6 | ||||
-rw-r--r-- | scripts/kernel-version.sh | 2 |
2 files changed, 3 insertions, 5 deletions
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 |