diff options
Diffstat (limited to 'freed-ora/current/f26/kernel.spec')
| -rw-r--r-- | freed-ora/current/f26/kernel.spec | 234 |
1 files changed, 125 insertions, 109 deletions
diff --git a/freed-ora/current/f26/kernel.spec b/freed-ora/current/f26/kernel.spec index 383f905b9..0b478afb2 100644 --- a/freed-ora/current/f26/kernel.spec +++ b/freed-ora/current/f26/kernel.spec @@ -48,7 +48,7 @@ Summary: The Linux kernel # 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 11 +%define base_sublevel 12 # librev starts empty, then 1, etc, as the linux-libre tarball # changes. This is only used to determine which tarball to use. @@ -58,9 +58,9 @@ Summary: The Linux kernel %define basegnu -gnu%{?librev} # To be inserted between "patch" and "-4.". -%define stablelibre -4.11%{?stablegnux} -#define rcrevlibre -4.11%{?rcrevgnux} -#define gitrevlibre -4.11%{?gitrevgnux} +#define stablelibre -4.12%{?stablegnux} +#define rcrevlibre -4.12%{?rcrevgnux} +#define gitrevlibre -4.12%{?gitrevgnux} %if 0%{?stablelibre:1} %define stablegnu -gnu%{?librev} @@ -92,7 +92,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 11 +%define stable_update 3 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -566,156 +566,154 @@ Patch07: freedo.patch # Git trees. # Standalone patches +# 100 - Generic long running patches -# a tempory patch for QCOM hardware enablement. Will be gone by end of 2016/F-26 GA -Patch420: qcom-QDF2432-tmp-errata.patch +Patch110: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch -# Upstream (in 4.12) patches to fix HiKey WiFi -Patch421: arm-hikey-fixWiFi.patch +Patch111: input-kill-stupid-messages.patch -# http://www.spinics.net/lists/linux-tegra/msg26029.html -Patch422: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch - -# Fix OMAP4 (pandaboard) -Patch423: arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch - -# BBWireless Bluetooth -Patch424: arm-dts-boneblack-wireless-add-WL1835-Bluetooth-device-node.patch - -# http://patchwork.ozlabs.org/patch/587554/ -Patch425: ARM-tegra-usb-no-reset.patch - -Patch426: AllWinner-h3.patch -Patch427: AllWinner-net-emac.patch - -# http://www.spinics.net/lists/linux-bluetooth/msg70169.html -# https://www.spinics.net/lists/devicetree/msg170619.html -Patch428: ti-bluetooth.patch - -Patch429: arm64-hikey-fixes.patch +Patch112: die-floppy-die.patch -Patch430: arm-rk3288-tinker.patch +Patch113: no-pcspkr-modalias.patch -# https://www.spinics.net/lists/arm-kernel/msg554183.html -Patch431: arm-imx6-hummingboard2.patch +Patch114: silence-fbcon-logo.patch -# Cavium fixes -Patch432: arm64-cavium-fixes.patch +Patch115: Kbuild-Add-an-option-to-enable-GCC-VTA.patch -Patch433: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch +Patch116: crash-driver.patch -# https://patchwork.kernel.org/patch/9815555/ -# https://patchwork.kernel.org/patch/9815651/ -# Patch434: qcom-rmsg-spmi-fixes.patch +Patch117: lis3-improve-handling-of-null-rate.patch -# http://www.spinics.net/lists/devicetree/msg163238.html -Patch440: bcm2837-initial-support.patch +Patch118: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch -# bcm283x mmc for wifi http://www.spinics.net/lists/arm-kernel/msg567077.html -Patch441: bcm283x-mmc-bcm2835.patch +Patch119: criu-no-expert.patch -# Upstream fixes for i2c/serial/ethernet MAC addresses -Patch442: bcm283x-fixes.patch +Patch120: ath9k-rx-dma-stop-check.patch -# https://lists.freedesktop.org/archives/dri-devel/2017-February/133823.html -Patch443: vc4-fix-vblank-cursor-update-issue.patch +Patch121: xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch -Patch444: bcm283x-hdmi-audio.patch +Patch122: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch -Patch445: bcm2835-clk-audio-jitter-issues.patch +Patch123: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch -# http://www.spinics.net/lists/dri-devel/msg132235.html -Patch446: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch - -# https://lists.freedesktop.org/archives/dri-devel/2017-June/143688.html -Patch447: vc4-tformat-fixes.patch - -# https://patchwork.freedesktop.org/patch/163300/ -# https://patchwork.freedesktop.org/patch/161978/ -Patch448: bcm283x-vc4-fix-vblank.patch +# 200 - x86 / secureboot -Patch460: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch +Patch201: efi-lockdown.patch -Patch466: input-kill-stupid-messages.patch +Patch202: KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch -Patch467: die-floppy-die.patch +Patch203: Add-EFI-signature-data-types.patch -Patch468: no-pcspkr-modalias.patch +Patch204: Add-an-EFI-signature-blob-parser-and-key-loader.patch -Patch470: silence-fbcon-logo.patch +Patch205: MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch -Patch471: Kbuild-Add-an-option-to-enable-GCC-VTA.patch +Patch206: MODSIGN-Support-not-importing-certs-from-db.patch -Patch472: crash-driver.patch +Patch210: disable-i8042-check-on-apple-mac.patch -Patch473: efi-lockdown.patch +Patch211: drm-i915-hush-check-crtc-state.patch -Patch487: Add-EFI-signature-data-types.patch +# 300 - ARM patches -Patch488: Add-an-EFI-signature-blob-parser-and-key-loader.patch +# a tempory patch for QCOM hardware enablement. Will be gone by F-26 GA +Patch301: qcom-QDF2432-tmp-errata.patch -# This doesn't apply. It seems like it could be replaced by -# https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=5ac7eace2d00eab5ae0e9fdee63e38aee6001f7c -# which has an explicit line about blacklisting -Patch489: KEYS-Add-a-system-blacklist-keyring.patch +# http://www.spinics.net/lists/linux-tegra/msg26029.html +Patch302: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch -Patch490: MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch +# Fix OMAP4 (pandaboard) +Patch303: arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch -Patch491: MODSIGN-Support-not-importing-certs-from-db.patch +# http://www.spinics.net/lists/arm-kernel/msg582772.html +Patch304: arm-dts-boneblack-wireless-add-WL1835-Bluetooth-device-node.patch -Patch493: drm-i915-hush-check-crtc-state.patch +# http://patchwork.ozlabs.org/patch/587554/ +Patch305: ARM-tegra-usb-no-reset.patch -Patch494: disable-i8042-check-on-apple-mac.patch +Patch306: AllWinner-net-emac.patch -Patch495: lis3-improve-handling-of-null-rate.patch +# http://www.spinics.net/lists/devicetree/msg163238.html +Patch308: bcm2837-initial-support.patch -Patch497: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch +# http://www.spinics.net/lists/dri-devel/msg132235.html +Patch309: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch -Patch498: criu-no-expert.patch +# https://www.spinics.net/lists/arm-kernel/msg554183.html +Patch311: arm-imx6-hummingboard2.patch -Patch499: ath9k-rx-dma-stop-check.patch +Patch312: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch -Patch500: xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch +Patch313: bcm2835-clk-audio-jitter-issues.patch +Patch314: bcm2835-fix-potential-null-pointer-dereferences.patch -Patch501: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch +# https://patchwork.freedesktop.org/patch/163300/ +# https://patchwork.freedesktop.org/patch/161978/ +Patch315: bcm283x-vc4-fix-vblank.patch -Patch502: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch +# https://patchwork.kernel.org/patch/9815555/ +# https://patchwork.kernel.org/patch/9815651/ +# https://patchwork.kernel.org/patch/9819885/ +# https://patchwork.kernel.org/patch/9820417/ +# https://patchwork.kernel.org/patch/9821151/ +# https://patchwork.kernel.org/patch/9821157/ +Patch316: qcom-msm89xx-fixes.patch -# Patch503: drm-i915-turn-off-wc-mmaps.patch +Patch317: arm-thermal-fixes.patch +# https://patchwork.kernel.org/patch/9802555/ +Patch318: pinctrl-bcm2835-Avoid-warning-from-__irq_do_set_handler.patch -Patch509: MODSIGN-Don-t-try-secure-boot-if-EFI-runtime-is-disa.patch +# https://patchwork.kernel.org/patch/9831825/ +# https://patchwork.kernel.org/patch/9833721/ +Patch319: arm-tegra-fix-gpu-iommu.patch -# rhbz 1436686 -Patch600: dell-laptop-Adds-support-for-keyboard-backlight-timeout-AC-settings.patch +# https://www.spinics.net/lists/linux-arm-msm/msg28203.html +Patch320: qcom-display-iommu.patch -#CVE-2016-3134 rhbz 1317383 1317384 -Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch +# This breaks RPi booting with a LPAE kernel, we don't support the DSI ports currently +# Revert it while I engage upstream to work out what's going on +Patch321: Revert-ARM-dts-bcm2835-Add-the-DSI-module-nodes-and-.patch -#rhbz 1435154 -Patch666: powerpc-prom-Increase-RMA-size-to-512MB.patch +# 400 - IBM (ppc/s390x) patches -# CVE-2017-7645 rhbz 1443615 1443617 -Patch667: CVE-2017-7645.patch +# 500 - Temp fixes/CVEs etc # CVE-2017-7477 rhbz 1445207 1445208 -Patch668: CVE-2017-7477.patch - -#CVE-2017-9059 rhbz 1451386 1451996 -Patch669: 0001-SUNRPC-Refactor-svc_set_num_threads.patch -Patch670: 0002-NFSv4-Fix-callback-server-shutdown.patch - -# rhbz 1455780 -Patch676: 2-2-nvme-Quirk-APST-on-Intel-600P-P3100-devices.patch - -# rhbz 1459272 -Patch680: 0001-platform-x86-thinkpad_acpi-guard-generic-hotkey-case.patch -Patch681: 0002-platform-x86-thinkpad_acpi-add-mapping-for-new-hotke.patch +Patch502: CVE-2017-7477.patch # rhbz 1459326 -Patch683: RFC-audit-fix-a-race-condition-with-the-auditd-tracking-code.patch - -# rhbz 1458599 -Patch685: 0001-ACPI-LPSS-Only-call-pwm_add_table-for-the-first-PWM-.patch +Patch504: RFC-audit-fix-a-race-condition-with-the-auditd-tracking-code.patch + +# 600 - Patches for improved Bay and Cherry Trail device support +# Below patches are pending in -next: +Patch601: 0001-platform-x86-Add-driver-for-ACPI-INT0002-Virtual-GPI.patch +Patch602: 0002-mfd-Add-Cherry-Trail-Whiskey-Cove-PMIC-driver.patch +Patch603: 0003-power-supply-core-Add-support-for-supplied-from-devi.patch +Patch604: 0004-platform-x86-intel_cht_int33fe-Set-supplied-from-pro.patch +Patch605: 0005-ACPI-PMIC-xpower-Add-support-for-the-GPI1-regulator-.patch +Patch606: 0006-Input-axp20x-pek-Add-wakeup-support.patch +Patch607: 0007-platform-x86-silead_dmi-Add-touchscreen-info-for-GP-.patch +Patch608: 0008-platform-x86-silead_dmi-Add-touchscreen-info-for-PoV.patch +Patch609: 0009-platform-x86-silead_dmi-Add-touchscreen-info-for-Pip.patch +# Below patches are submitted upstream, awaiting review / merging +Patch610: 0010-Input-silead-Add-support-for-capactive-home-button-f.patch +Patch611: 0011-Input-goodix-Add-support-for-capacitive-home-button.patch +Patch612: 0012-Input-gpio_keys-Do-not-report-wake-button-presses-as.patch +Patch613: 0013-iio-accel-bmc150-Add-support-for-BOSC0200-ACPI-devic.patch +Patch614: 0014-mmc-sdhci-acpi-Workaround-conflict-with-PCI-wifi-on-.patch +Patch615: 0015-i2c-cht-wc-Add-Intel-Cherry-Trail-Whiskey-Cove-SMBUS.patch +# Small workaround patches for issues with a more comprehensive fix in -next +Patch616: 0016-Input-silead-Do-not-try-to-directly-access-the-GPIO-.patch + +# CVE-2017-7542 rhbz 1473649 1473650 +Patch701: 0001-ipv6-avoid-overflow-of-offset-in-ip6_find_1stfragopt.patch + +# CVE-2017-11473 rhbz 1473209 147310 +Patch702: CVE-2017-11473.patch + +# rhbz 1431375 +Patch703: HID-rmi-Make-sure-the-HID-device-is-opened-on-resume.patch +Patch704: input-rmi4-remove-the-need-for-artifical-IRQ.patch # END OF PATCH DEFINITIONS @@ -2000,7 +1998,7 @@ find $RPM_BUILD_ROOT/usr/tmp-headers/include \ # Copy all the architectures we care about to their respective asm directories for arch in arm arm64 powerpc s390 x86 ; do mkdir -p $RPM_BUILD_ROOT/usr/${arch}-linux-gnu/include -mv $RPM_BUILD_ROOT/usr/tmp-headers/include/asm-${arch} $RPM_BUILD_ROOT/usr/${arch}-linux-gnu/include/asm +mv $RPM_BUILD_ROOT/usr/tmp-headers/include/arch-${arch}/asm $RPM_BUILD_ROOT/usr/${arch}-linux-gnu/include/ cp -a $RPM_BUILD_ROOT/usr/tmp-headers/include/asm-generic $RPM_BUILD_ROOT/usr/${arch}-linux-gnu/include/. done @@ -2031,6 +2029,9 @@ rm -rf %{buildroot}%{_docdir}/perf-tip mkdir -p %{buildroot}/%{_mandir}/man1 pushd %{buildroot}/%{_mandir}/man1 tar -xf %{SOURCE10} +%if !%{with_tools} + rm -f kvm_stat.1 +%endif popd %endif @@ -2075,6 +2076,9 @@ popd pushd tools/gpio make DESTDIR=%{buildroot} install popd +pushd tools/kvm/kvm_stat +make INSTALL_ROOT=%{buildroot} install-tools +popd %endif %if %{with_firmware} @@ -2283,6 +2287,8 @@ fi %{_bindir}/lsgpio %{_bindir}/gpio-hammer %{_bindir}/gpio-event-mon +%{_mandir}/man1/kvm_stat* +%{_bindir}/kvm_stat %endif %if %{with_debuginfo} @@ -2378,6 +2384,16 @@ fi # # %changelog +* Mon Jul 24 2017 Alexandre Oliva <lxoliva@fsfla.org> -libre +- GNU Linux-libre 4.12.3-gnu. +- Deblobbed 0007-platform-x86-silead_dmi-Add-touchscreen-info-for-GP-.patch. +- Deblobbed 0008-platform-x86-silead_dmi-Add-touchscreen-info-for-PoV.patch. +- Deblobbed 0009-platform-x86-silead_dmi-Add-touchscreen-info-for-Pip.patch. + +* Mon Jul 24 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.3-300 +- Linux v4.12.3 +- Fix rhbz 1431375 + * Mon Jul 17 2017 Alexandre Oliva <lxoliva@fsfla.org> -libre - GNU Linux-libre 4.11.11-gnu. |
