summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-01-26 20:38:01 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-01-26 20:38:01 +0100
commit03ca489db66dd860102f3da468d7a53d0547a8c5 (patch)
tree18a18db89b11bb442ac5ca2706dfe5e6cf07dea4 /kernel.spec
parent7859ab724d58cefe5f67aeec124388dca72c5287 (diff)
parent16838a0aa56767d53e0207778de72b2ed63249b3 (diff)
downloadkernel-03ca489db66dd860102f3da468d7a53d0547a8c5.tar.gz
kernel-03ca489db66dd860102f3da468d7a53d0547a8c5.tar.xz
kernel-03ca489db66dd860102f3da468d7a53d0547a8c5.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc5.20210126git13391c60da33.135.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
-rwxr-xr-xkernel.spec16
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec
index f660fd4f0..5b5ce04a9 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -64,7 +64,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc5.134
+%global distro_build 0.rc5.20210126git13391c60da33.135
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -107,13 +107,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.11.0
-%define pkgrelease 0.rc5.134
+%define pkgrelease 0.rc5.20210126git13391c60da33.135
# This is needed to do merge window version magic
%define patchlevel 11
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.134%{?buildid}%{?dist}
+%define specrelease 0.rc5.20210126git13391c60da33.135%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -203,7 +203,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
# The kernel tarball/base version
%define kversion 5.11
@@ -603,7 +603,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.11-rc5.tar.xz
+Source0: linux-20210126git13391c60da33.tar.xz
Source1: Makefile.rhelver
@@ -1249,8 +1249,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.11-rc5 -c
-mv linux-5.11-rc5 linux-%{KVERREL}
+%setup -q -n kernel-20210126git13391c60da33 -c
+mv linux-20210126git13391c60da33 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2729,7 +2729,7 @@ fi
#
#
%changelog
-* Mon Jan 25 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.134]
+* Tue Jan 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210126git13391c60da33.135]
- redhat: replace inline awk script with genlog.py call (Herton R. Krzesinski)
- redhat: add genlog.py script (Herton R. Krzesinski)
- Turn off vdso_install for ppc (Justin M. Forbes)