diff options
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 72 |
1 files changed, 29 insertions, 43 deletions
diff --git a/kernel.spec b/kernel.spec index 8570c771c..1715e4cec 100644 --- a/kernel.spec +++ b/kernel.spec @@ -44,13 +44,13 @@ 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 8 +%define base_sublevel 9 ## If this is a released kernel ## %if 0%{?released_kernel} @@ -58,7 +58,7 @@ Summary: The Linux kernel %define stable_rc 0 # Do we have a -stable update to apply? -%define stable_update 16 +%define stable_update 2 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -422,7 +422,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/kernel/v4.x/linux-%{kversion}.tar.xz Source10: perf-man-%{kversion}.tar.gz Source11: x509.genkey - +Source12: remove-binary-diff.pl Source15: merge.pl Source16: mod-extra.list Source17: mod-extra.sh @@ -514,9 +514,6 @@ Source5005: kbuild-AFTER_LINK.patch # Standalone patches -# http://www.spinics.net/lists/arm-kernel/msg523359.html -Patch420: arm64-ACPI-parse-SPCR-table.patch - # a tempory patch for QCOM hardware enablement. Will be gone by end of 2016/F-26 GA Patch421: qcom-QDF2432-tmp-errata.patch @@ -545,9 +542,16 @@ Patch431: bcm2837-initial-support.patch Patch432: bcm283x-vc4-fixes.patch -Patch433: AllWinner-net-emac.patch +Patch433: bcm283x-fixes.patch + +# http://www.spinics.net/lists/linux-mmc/msg41151.html +Patch434: bcm283x-mmc-imp-speed.patch + +Patch440: AllWinner-net-emac.patch + +Patch442: ARM-Drop-fixed-200-Hz-timer-requirement-from-Samsung-platforms.patch -Patch434: ARM-Drop-fixed-200-Hz-timer-requirement-from-Samsung-platforms.patch +Patch443: imx6sx-Add-UDOO-Neo-support.patch Patch460: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch @@ -583,7 +587,9 @@ Patch481: x86-Restrict-MSR-access-when-module-loading-is-restr.patch Patch482: Add-option-to-automatically-enforce-module-signature.patch -Patch483: efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch +Patch483: efi-Add-SHIM-and-image-security-database-GUID-defini.patch + +Patch484: efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch Patch485: efi-Add-EFI_SECURE_BOOT-bit.patch @@ -629,41 +635,16 @@ Patch502: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch Patch508: kexec-uefi-copy-secure_boot-flag-in-boot-params.patch +Patch509: MODSIGN-Don-t-try-secure-boot-if-EFI-runtime-is-disa.patch + #CVE-2016-3134 rhbz 1317383 1317384 Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch -#rhbz 1200901 (There should be something better upstream at some point) -Patch842: qxl-reapply-cursor-after-SetCrtc-calls.patch - -# From kernel list, currently in linux-next -Patch845: HID-microsoft-Add-Surface-4-type-cover-pro-4-JP.patch - -# SELinux OverlayFS support (queued for 4.9) -Patch846: security-selinux-overlayfs-support.patch - -#rhbz 1360688 -Patch847: rc-core-fix-repeat-events.patch - #ongoing complaint, full discussion delayed until ksummit/plumbers Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch -# CVE-2016-9083 CVE-2016-9084 rhbz 1389258 1389259 1389285 -Patch850: v3-vfio-pci-Fix-integer-overflows-bitmask-check.patch - -#rhbz 1325354 -Patch852: 0001-HID-input-ignore-System-Control-application-usages-i.patch - -#rhbz 1390308 -Patch854: nouveau-add-maxwell-to-backlight-init.patch - -#rhbz 1385823 -Patch855: 0001-platform-x86-ideapad-laptop-Add-Lenovo-Yoga-910-13IK.patch - -# CVE-2016-9755 rhbz 1400904 1400905 -Patch856: 0001-netfilter-ipv6-nf_defrag-drop-mangled-skb-on-ream-er.patch - -# CVE-2016-9588 rhbz 1404924 1404925 -Patch857: kvm-nVMX-allow-L1-to-intercept-software-exceptions.patch +# Request from dwalsh +Patch850: selinux-namespace-fix.patch # END OF PATCH DEFINITIONS @@ -1179,17 +1160,19 @@ if [ ! -d kernel-%{kversion}%{?dist}/vanilla-%{vanillaversion} ]; then cp -al vanilla-%{kversion} vanilla-%{vanillaversion} cd vanilla-%{vanillaversion} +cp %{SOURCE12} . + # Update vanilla to the latest upstream. # (non-released_kernel case only) %if 0%{?rcrev} - xzcat %{SOURCE5000} | patch -p1 -F1 -s + xzcat %{SOURCE5000} | ./remove-binary-diff.pl | patch -p1 -F1 -s %if 0%{?gitrev} - xzcat %{SOURCE5001} | patch -p1 -F1 -s + xzcat %{SOURCE5001} | ./remove-binary-diff.pl | patch -p1 -F1 -s %endif %else # pre-{base_sublevel+1}-rc1 case %if 0%{?gitrev} - xzcat %{SOURCE5000} | patch -p1 -F1 -s + xzcat %{SOURCE5000} | ./remove-binary-diff.pl | patch -p1 -F1 -s %endif %endif git init @@ -1709,7 +1692,7 @@ BuildKernel %make_target %kernel_image %endif %global perf_make \ - make -s EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix} + make -s EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix} %if %{with_perf} # perf %{perf_make} DESTDIR=$RPM_BUILD_ROOT all @@ -2204,6 +2187,9 @@ fi # # %changelog +* Mon Jan 09 2017 Laura Abbott <labbott@fedoraproject.org> - 4.9.2-200 +- Linux v4.9.2 rebase + * Fri Jan 06 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.16-300 - Linux v4.8.16 |