diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-16 06:21:37 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-16 06:21:37 +0200 |
| commit | 0ff43c729a480821d8afa7cce9e1354b08ecf894 (patch) | |
| tree | ec7e46d28a00431b4aec2dd6d70f7946d318bc51 /kernel.spec | |
| parent | 5db43a6de1f6a60d35890e35ecec65659cc640c9 (diff) | |
| parent | d09e44ea796e7b018d5bf8bd84f4d90d29ee3522 (diff) | |
| download | kernel-0ff43c729a480821d8afa7cce9e1354b08ecf894.tar.gz kernel-0ff43c729a480821d8afa7cce9e1354b08ecf894.tar.xz kernel-0ff43c729a480821d8afa7cce9e1354b08ecf894.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc5.20200715gite9919e11e219.1.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 4a86241a5..0bb09f353 100644 --- a/kernel.spec +++ b/kernel.spec @@ -30,7 +30,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc5.20200714git0dc589da873b.1 +%global distro_build 0.rc5.20200715gite9919e11e219.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,13 +71,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.8.0 -%define pkgrelease 0.rc5.20200714git0dc589da873b.1 +%define pkgrelease 0.rc5.20200715gite9919e11e219.1 # This is needed to do merge window version magic %define patchlevel 8 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20200714git0dc589da873b.1%{?buildid}%{?dist} +%define specrelease 0.rc5.20200715gite9919e11e219.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -569,7 +569,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20200714git0dc589da873b.tar.xz +Source0: linux-20200715gite9919e11e219.tar.xz Source1: Makefile.rhelver @@ -1301,8 +1301,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200714git0dc589da873b -c -mv linux-20200714git0dc589da873b linux-%{KVERREL} +%setup -q -n kernel-20200715gite9919e11e219 -c +mv linux-20200715gite9919e11e219 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2832,8 +2832,8 @@ fi # # %changelog -* Tue Jul 14 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc5.20200714git0dc589da873b.1] -- 0dc589da873b rebase +* Wed Jul 15 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc5.20200715gite9919e11e219.1] +- e9919e11e219 rebase - arm64: dts: sun50i-a64-pinephone: Add touchscreen support (Ondrej Jirman) - arm64: dts: sun50i-a64-pinephone: Enable LCD support on PinePhone (Icenowy Zheng) - drm/panel: st7703: Assert reset prior to powering down the regulators (Ondrej Jirman) |