From 99d5108d7e29aa819daba0545d545c423bcef4cc Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 4 Apr 2018 09:42:24 -0400 Subject: Linux v4.16 --- kernel.spec | 142 +++++++++++++++++++++++++----------------------------------- 1 file changed, 60 insertions(+), 82 deletions(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index ebff58b65..90b308d79 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,19 +42,19 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 300 +%global baserelease 200 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base, # which yields a base_sublevel of 0. -%define base_sublevel 15 +%define base_sublevel 16 ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 2 +%define stable_update 0 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -368,9 +368,8 @@ Summary: The Linux kernel Name: kernel%{?variant} -Group: System Environment/Kernel License: GPLv2 and Redistributable, no modification permitted -URL: http://www.kernel.org/ +URL: https://www.kernel.org/ Version: %{rpmversion} Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. @@ -388,7 +387,7 @@ Requires: kernel-modules-uname-r = %{KVERREL}%{?variant} # BuildRequires: kmod, patch, bash, tar, git BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk -BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc +BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex BuildRequires: net-tools, hostname, bc, elfutils-devel %if %{with_sparse} BuildRequires: sparse @@ -506,6 +505,9 @@ Source5000: patch-4.%{base_sublevel}-git%{gitrev}.xz # ongoing complaint, full discussion delayed until ksummit/plumbers Patch002: 0001-iio-Use-event-header-from-kernel-tree.patch +# gcc -Werror=aliasing workaround +Patch003: 0001-Temporarily-work-around-gcc-aliasing-warning-error.patch + %if !%{nopatches} # Git trees. @@ -577,78 +579,63 @@ Patch302: arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch # http://patchwork.ozlabs.org/patch/587554/ Patch303: ARM-tegra-usb-no-reset.patch -# https://www.spinics.net/lists/arm-kernel/msg554183.html -Patch304: arm-imx6-hummingboard2.patch - -Patch305: arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch +Patch304: arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch # https://patchwork.kernel.org/patch/9820417/ -Patch306: qcom-msm89xx-fixes.patch +Patch305: qcom-msm89xx-fixes.patch # https://patchwork.kernel.org/patch/10173115/ -Patch307: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch +Patch306: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch -# Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/ -Patch308: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch +# http://patches.linaro.org/patch/131764/ +Patch307: wcn36xx-Fix-firmware-crash-due-to-corrupted-buffer-address.patch -# https://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux.git/log/?h=synquacer-netsec -Patch330: arm64-socionext-96b-enablement.patch +# https://patchwork.kernel.org/patch/10245303/ +Patch308: wcn36xx-reduce-verbosity-of-drivers-messages.patch -# https://patchwork.kernel.org/patch/10149775/ MMC support for Synquacer -Patch331: arm64-mmc-sdhci_f_sdh30-add-ACPI-support.patch - -# 400 - IBM (ppc/s390x) patches +# https://www.spinics.net/lists/arm-kernel/msg632925.html +Patch309: arm-crypto-sunxi-ss-Add-MODULE_ALIAS-to-sun4i-ss.patch -# 500 - Temp fixes/CVEs etc +# Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/ +Patch310: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch -# 600 - Patches for improved Bay and Cherry Trail device support -# Below patches are submitted upstream, awaiting review / merging -Patch610: 0010-Input-silead-Add-support-for-capactive-home-button-f.patch +# https://www.spinics.net/lists/arm-kernel/msg621982.html +Patch311: bcm283x-Fix-probing-of-bcm2835-i2s.patch -# rhbz 1476467 -Patch617: Fix-for-module-sig-verification.patch +# https://www.spinics.net/lists/arm-kernel/msg633942.html +Patch312: mmc-sdhci-iproc-Disable-preset-values-for-BCM2835.patch -# rhbz 1431375 -Patch619: input-rmi4-remove-the-need-for-artifical-IRQ.patch +# https://www.spinics.net/lists/arm-kernel/msg633945.html +Patch313: bcm2835-hwrng-Handle-deferred-clock-properly.patch -# rhbz 1509461 -Patch625: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch +Patch314: bcm283x-clk-audio-fixes.patch -# For https://fedoraproject.org/wiki/Changes/ImprovedLaptopBatteryLife -# Queued in bluetooth-next for merging into 4.16 -Patch628: 0001-Bluetooth-btusb-Add-a-Kconfig-option-to-enable-USB-a.patch +# Enabling Patches for the RPi3+ +Patch330: bcm2837-rpi-initial-support-for-the-3.patch +Patch331: bcm2837-gpio-expander.patch +Patch332: bcm2837-enable-pmu.patch +Patch333: bcm2837-lan78xx-fixes.patch -# Fix left-button not working with some hid-multitouch touchpads -# Adding these suggested by Benjamin Tissoires -# Queued in hid.git/for-4.16/hid-quirks-cleanup/multitouch for merging into 4.16 -Patch630: 0001-HID-multitouch-Properly-deal-with-Win8-PTP-reports-w.patch -Patch631: 0002-HID-multitouch-Only-look-at-non-touch-fields-in-firs.patch -Patch632: 0003-HID-multitouch-Combine-all-left-button-events-in-a-f.patch +# 400 - IBM (ppc/s390x) patches -# Make SATA link powermanagement policy configurable for: -# https://fedoraproject.org/wiki/Changes/ImprovedLaptopBatteryLife -# Queued upstream for merging into 4.16 -Patch636: 0001-ahci-Annotate-PCI-ids-for-mobile-Intel-chipsets-as-s.patch -Patch637: 0002-ahci-Add-PCI-ids-for-Intel-Bay-Trail-Cherry-Trail-an.patch -Patch638: 0003-ahci-Allow-setting-a-default-LPM-policy-for-mobile-c.patch +# 500 - Temp fixes/CVEs etc -# rhbz1514969, submitted upstream -Patch640: 0001-platform-x86-dell-laptop-Filter-out-spurious-keyboar.patch +# rhbz 1476467 +Patch501: Fix-for-module-sig-verification.patch -# rhbz1514836, submitted upstream -Patch641: 0001-Bluetooth-btusb-Disable-autosuspend-on-QCA-Rome-devi.patch +# rhbz 1431375 +Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch -# Speculative Execution patches -Patch642: prevent-bounds-check-bypass-via-speculative-execution.patch +# rhbz 1509461 +Patch503: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch -# Fix crash on Xwayland using nouveau -Patch650: dma-buf-fix-reservation_object_wait_timeout_rcu-once-more-v2.patch +# rhbz 1558977 +Patch504: sunrpc-remove-incorrect-HMAC-request-initialization.patch # END OF PATCH DEFINITIONS %endif -BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root %description The kernel meta package @@ -682,7 +669,6 @@ AutoProv: yes\ %package headers Summary: Header files for the Linux kernel for use by glibc -Group: Development/System Obsoletes: glibc-kernheaders < 3.0-46 Provides: glibc-kernheaders = 3.0-46 %if "0%{?variant}" @@ -698,7 +684,6 @@ glibc package. %package cross-headers Summary: Header files for the Linux kernel for use by cross-glibc -Group: Development/System %description cross-headers Kernel-cross-headers includes the C header files that specify the interface between the Linux kernel and userspace libraries and programs. The @@ -709,7 +694,6 @@ cross-glibc package. %package bootwrapper Summary: Boot wrapper files for generating combined kernel + initrd images -Group: Development/System Requires: gzip binutils %description bootwrapper Kernel-bootwrapper contains the wrapper code which makes bootable "zImage" @@ -717,7 +701,6 @@ files combining both kernel and initial ramdisk. %package debuginfo-common-%{_target_cpu} Summary: Kernel source files used by %{name}-debuginfo packages -Group: Development/Debug Provides: installonlypkg(kernel) %description debuginfo-common-%{_target_cpu} This package is required by %{name}-debuginfo subpackages. @@ -730,7 +713,6 @@ It provides the kernel source files common to all builds. %define kernel_debuginfo_package() \ %package %{?1:%{1}-}debuginfo\ Summary: Debug information for package %{name}%{?1:-%{1}}\ -Group: Development/Debug\ Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}\ Provides: %{name}%{?1:-%{1}}-debuginfo-%{_target_cpu} = %{version}-%{release}\ Provides: installonlypkg(kernel)\ @@ -748,7 +730,6 @@ This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\ %define kernel_devel_package() \ %package %{?1:%{1}-}devel\ Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\ -Group: System Environment/Kernel\ Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\ Provides: kernel-devel-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel-devel-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\ @@ -769,7 +750,6 @@ against the %{?2:%{2} }kernel package.\ %define kernel_modules_extra_package() \ %package %{?1:%{1}-}modules-extra\ Summary: Extra kernel modules to match the %{?2:%{2} }kernel\ -Group: System Environment/Kernel\ Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}\ Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel%{?1:-%{1}}-modules-extra = %{version}-%{release}%{?1:+%{1}}\ @@ -790,7 +770,6 @@ This package provides less commonly used kernel modules for the %{?2:%{2} }kerne %define kernel_modules_package() \ %package %{?1:%{1}-}modules\ Summary: kernel modules to match the %{?2:%{2}-}core kernel\ -Group: System Environment/Kernel\ Provides: kernel%{?1:-%{1}}-modules-%{_target_cpu} = %{version}-%{release}\ Provides: kernel-modules-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel-modules = %{version}-%{release}%{?1:+%{1}}\ @@ -810,7 +789,6 @@ This package provides commonly used kernel modules for the %{?2:%{2}-}core kerne %define kernel_meta_package() \ %package %{1}\ summary: kernel meta-package for the %{1} kernel\ -group: system environment/kernel\ Requires: kernel-%{1}-core-uname-r = %{KVERREL}%{?variant}+%{1}\ Requires: kernel-%{1}-modules-uname-r = %{KVERREL}%{?variant}+%{1}\ Provides: installonlypkg(kernel)\ @@ -826,7 +804,6 @@ The meta-package for the %{1} kernel\ %define kernel_variant_package(n:) \ %package %{?1:%{1}-}core\ Summary: %{variant_summary}\ -Group: System Environment/Kernel\ Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\ Provides: installonlypkg(kernel)\ %{expand:%%kernel_reqprovconf}\ @@ -1152,6 +1129,7 @@ git am %{patches} # Any further pre-build tree manipulations happen here. chmod +x scripts/checkpatch.pl +chmod +x tools/objtool/sync-check.sh # This Prevents scripts/setlocalversion from mucking with our version numbers. touch .scmversion @@ -1369,6 +1347,16 @@ BuildKernel() { cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build if [ -f tools/objtool/objtool ]; then cp -a tools/objtool/objtool $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/objtool/ || : + # these are a few files associated with objtool + cp -a --parents tools/build/Build.include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + cp -a --parents tools/build/Build $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + cp -a --parents tools/build/fixdep.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + cp -a --parents tools/scripts/utilities.mak $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + # also more than necessary but it's not that many more files + cp -a --parents tools/objtool/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + cp -a --parents tools/lib/str_error_r.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + cp -a --parents tools/lib/string.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + cp -a --parents tools/lib/subcmd/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ fi if [ -d arch/$Arch/scripts ]; then cp -a arch/$Arch/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || : @@ -1414,7 +1402,9 @@ BuildKernel() { cp -a --parents arch/x86/tools/relocs.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a --parents arch/x86/tools/relocs_common.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a --parents arch/x86/tools/relocs.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ - cp -a --parents tools/include/tools/le_byteshift.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + # Yes this is more includes than we probably need. Feel free to sort out + # dependencies if you so choose. + cp -a --parents tools/include/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a --parents arch/x86/purgatory/purgatory.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a --parents arch/x86/purgatory/sha256.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a --parents arch/x86/purgatory/sha256.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ @@ -1631,7 +1621,6 @@ BuildKernel %make_target %kernel_image %{_use_vdso} %ifnarch noarch %global __debug_package 1 %files -f debugfiles.list debuginfo-common-%{_target_cpu} -%defattr(-,root,root) %endif %endif @@ -1704,9 +1693,6 @@ make DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kerne ### clean ### -%clean -rm -rf $RPM_BUILD_ROOT - ### ### scripts ### @@ -1817,27 +1803,22 @@ fi %if %{with_headers} %files headers -%defattr(-,root,root) /usr/include/* %endif %if %{with_cross_headers} %files cross-headers -%defattr(-,root,root) /usr/*-linux-gnu/include/* %endif %if %{with_bootwrapper} %files bootwrapper -%defattr(-,root,root) /usr/sbin/* %{_libdir}/kernel-wrapper %endif # empty meta-package %files -%defattr(-,root,root) - # This is %%{image_install_path} on an arch where that includes ELF files, # or empty otherwise. %define elf_image_install_path %{?kernel_image_elf:%{image_install_path}} @@ -1850,7 +1831,6 @@ fi %define kernel_variant_files(k:) \ %if %{2}\ %{expand:%%files -f kernel-%{?3:%{3}-}core.list %{?3:%{3}-}core}\ -%defattr(-,root,root)\ %{!?_licensedir:%global license %%doc}\ %license linux-%{KVERREL}/COPYING\ /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}\ @@ -1878,29 +1858,24 @@ fi %endif\ /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.*\ %{expand:%%files -f kernel-%{?3:%{3}-}modules.list %{?3:%{3}-}modules}\ -%defattr(-,root,root)\ %{expand:%%files %{?3:%{3}-}devel}\ -%defattr(-,root,root)\ %defverify(not mtime)\ /usr/src/kernels/%{KVERREL}%{?3:+%{3}}\ %{expand:%%files %{?3:%{3}-}modules-extra}\ -%defattr(-,root,root)\ /lib/modules/%{KVERREL}%{?3:+%{3}}/extra\ %if %{with_debuginfo}\ %ifnarch noarch\ %{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\ -%defattr(-,root,root)\ %endif\ %endif\ %if %{?3:1} %{!?3:0}\ %{expand:%%files %{3}}\ -%defattr(-,root,root)\ %endif\ %endif\ %{nil} -%kernel_variant_files %{_use_vdso} %{with_up} -%kernel_variant_files %{_use_vdso} %{with_debug} debug +%kernel_variant_files %{_use_vdso} %{with_up} +%kernel_variant_files %{_use_vdso} %{with_debug} debug %kernel_variant_files %{use_vdso} %{with_pae} %{pae} %kernel_variant_files %{use_vdso} %{with_pae_debug} %{pae}debug @@ -1909,6 +1884,9 @@ fi # # %changelog +* Thu Apr 05 2018 Jeremy Cline - 4.16.0-200 +- Linux v4.16 + * Wed Feb 07 2018 Laura Abbott - 4.15.2-300 - Linux v4.15.2 -- cgit