diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-20 19:13:38 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-20 19:13:38 +0100 |
commit | 8254b9e89569e42582894c7c8756a71bc84cf9ee (patch) | |
tree | 3a0f64be1de03c637d6671173e93417982cea510 /kernel.spec | |
parent | 89fdb98ea38a73043e91af208ff93c5f86addce2 (diff) | |
parent | 88fc0e2f65816ea00498a0302a7fd5f54695ea9c (diff) | |
download | kernel-8254b9e89569e42582894c7c8756a71bc84cf9ee.tar.gz kernel-8254b9e89569e42582894c7c8756a71bc84cf9ee.tar.xz kernel-8254b9e89569e42582894c7c8756a71bc84cf9ee.zip |
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc3.git0.1.vanilla.knurd.1.fc27kernel-4.11.0-0.rc3.git0.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc3.git0.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc3.git0.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index a7de57b69..dbad343f0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -75,9 +75,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 2 +%global rcrev 3 # The git snapshot level -%define gitrev 4 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -133,7 +133,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 0 +%define debugbuildsenabled 1 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -196,6 +196,9 @@ Summary: The Linux kernel %define _enable_debug_packages 0 %endif %define debuginfodir /usr/lib/debug +# Needed because we override almost everything involving build-ids +# and debuginfo generation. Currently we rely on the old alldebug setting. +%global _build_id_links alldebug # kernel PAE is only built on i686 and ARMv7. %ifnarch i686 armv7hl @@ -539,7 +542,8 @@ Patch424: arm64-mm-Fix-memmap-to-be-initialized-for-the-entire-section.patch # http://patchwork.ozlabs.org/patch/587554/ Patch425: ARM-tegra-usb-no-reset.patch -Patch426: AllWinner-net-emac.patch +Patch426: AllWinner-h3.patch +Patch427: AllWinner-net-emac.patch # http://www.spinics.net/lists/devicetree/msg163238.html Patch430: bcm2837-initial-support.patch @@ -2183,6 +2187,16 @@ fi # # %changelog +* Mon Mar 20 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc3.git0.1 +- Linux v4.11-rc3 +- Fix for debuginfo conflicts (rhbz 1431296) + +* Mon Mar 20 2017 Laura Abbott <labbott@fedoraproject.org> +- Disable debugging options. + +* Sun Mar 19 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- Rebase AllWinner sun8i emac driver to latest proposed upstream + * Fri Mar 17 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc2.git4.1 - Linux v4.11-rc2-235-gd528ae0 |