diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-09 07:18:58 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-09 07:18:58 +0100 |
| commit | 0267cceadc6b3cdba27564f9bab7252196e3685c (patch) | |
| tree | 2903279069034d70b32b94172e2ec241002f21d3 /scripts | |
| parent | b2e527479baa73e20e6b52e2779b69e4bd387c2f (diff) | |
| parent | 63d40f4c3a7c56eedd7c737e9dc0059090b93f1e (diff) | |
| download | kernel-0267cceadc6b3cdba27564f9bab7252196e3685c.tar.gz kernel-0267cceadc6b3cdba27564f9bab7252196e3685c.tar.xz kernel-0267cceadc6b3cdba27564f9bab7252196e3685c.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.0.0-0.rc1.git1.1.vanilla.knurd.1.fc29
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/create_headers_tarball.sh | 8 | ||||
| -rwxr-xr-x | scripts/generate-git-snapshot.sh | 2 | ||||
| -rw-r--r-- | scripts/kernel-version.sh | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/scripts/create_headers_tarball.sh b/scripts/create_headers_tarball.sh index 9d43548df..cb57db634 100755 --- a/scripts/create_headers_tarball.sh +++ b/scripts/create_headers_tarball.sh @@ -19,7 +19,7 @@ if [ ! -f $PKGLOC/kernel-headers.spec ]; then fi # Kernel version information taken from kernel.spec and change to prepared sources directory -MAJORVER='4' +MAJORVER='5' RELEASED=`grep "%global released_kernel" kernel.spec| cut -d ' ' -f 3` BASERELEASE=`cat kernel.spec | grep "%global baserelease" | cut -d ' ' -f 3` BASE=`grep "%define base_sublevel" kernel.spec| cut -d ' ' -f 3` @@ -27,8 +27,10 @@ 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?? - NEWBASE=$(($BASE+1)) + #cd kernel-$MAJORVER.$BASE.fc?? + cd kernel-5.0-rc$RC.fc?? + #NEWBASE=$(($BASE+1)) + NEWBASE=0 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/generate-git-snapshot.sh b/scripts/generate-git-snapshot.sh index 242200ef6..2ad6a5f06 100755 --- a/scripts/generate-git-snapshot.sh +++ b/scripts/generate-git-snapshot.sh @@ -20,7 +20,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.xz// | sed s/[\(\)]//g) + VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.gz// | sed s/[\(\)]//g) fi OLDGIT=$(grep gitrev kernel.spec | head -n1 | sed s/%define\ gitrev\ //) diff --git a/scripts/kernel-version.sh b/scripts/kernel-version.sh index e2ec93a5a..0de4c10d9 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.xz// | tr -d "()") + VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.gz// | tr -d "()") fi |