diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-20 13:53:23 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-20 13:53:23 +0100 |
| commit | 16cc387f1ce26863110ae7429e540a133a66d88a (patch) | |
| tree | 3816321c0a637f0b6cccde17404666741d1b0b1c /scripts | |
| parent | 57c6af7e720d37b38e61537473ff1c27f107d8ad (diff) | |
| parent | 48e1a4dcfc8683a472483fa4a8d1f261fbcc8211 (diff) | |
| download | kernel-16cc387f1ce26863110ae7429e540a133a66d88a.tar.gz kernel-16cc387f1ce26863110ae7429e540a133a66d88a.tar.xz kernel-16cc387f1ce26863110ae7429e540a133a66d88a.zip | |
merge originkernel-5.4.5-350.vanilla.knurd.1.fc31
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/create_headers_tarball.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/create_headers_tarball.sh b/scripts/create_headers_tarball.sh index 5ec563f8e..9a59f03a5 100755 --- a/scripts/create_headers_tarball.sh +++ b/scripts/create_headers_tarball.sh @@ -26,13 +26,14 @@ BASE=`grep "%define base_sublevel" kernel.spec| cut -d ' ' -f 3` 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` +BUILDID=`grep "^%define buildid" kernel.spec| cut -d ' ' -f 3` if [ $RELEASED -eq 0 ]; then 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*/ + KVER=$MAJORVER.$NEWBASE.0-0.rc$RC.git$GITREV.$BASERELEASE$BUILDID + cd linux-$MAJORVER.$NEWBASE.0-0.rc$RC.git$GITREV.$BASERELEASE$BUILDID.fc*/ else - cd kernel-$MAJORVER.$BASE.fc??/linux-$MAJORVER.$BASE.$STABLE-$BASERELEASE.fc*/ + cd kernel-$MAJORVER.$BASE.fc??/linux-$MAJORVER.$BASE.$STABLE-$BASERELEASE$BUILDID.fc*/ KVER=$MAJORVER.$BASE.$STABLE-$BASERELEASE fi @@ -71,6 +72,7 @@ BASERELEASE=$(($BASERELEASE-1)) BASERELEASE=$BASERELEASE perl -p -i -e 's|%global baserelease.*|%global baserelease $ENV{'BASERELEASE'}|' kernel-headers.spec if [ $RELEASED -eq 0 ]; then + [ -n "$BUILDID" ] && sed -i -e 's/^# define buildid .local/%define buildid '$BUILDID'/' kernel-headers.spec RC=$RC perl -p -i -e 's|%global rcrev.*|%global rcrev $ENV{'RC'}|' kernel-headers.spec GITREV=$GITREV perl -p -i -e 's|%define gitrev.*|%define gitrev $ENV{'GITREV'}|' kernel-headers.spec rpmdev-bumpspec -c "Linux v$MAJORVER.$NEWBASE-rc$RC.git$GITREV" kernel-headers.spec |