diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-10 07:40:41 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-10 07:40:41 +0100 |
| commit | 27432396f0fed41435da1984e2a3b3f26cb92d56 (patch) | |
| tree | 2d0e6842d7096770a412ceffb446bc51d9def44a /scripts | |
| parent | 9cacc14c983719fae347d8e54eaf79d7ab2a02ce (diff) | |
| parent | 69bc19100964a54f0aace7f1ed5945e871f51bd7 (diff) | |
| download | kernel-27432396f0fed41435da1984e2a3b3f26cb92d56.tar.gz kernel-27432396f0fed41435da1984e2a3b3f26cb92d56.tar.xz kernel-27432396f0fed41435da1984e2a3b3f26cb92d56.zip | |
Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedora
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 |