diff options
author | Josh Boyer <jwboyer@redhat.com> | 2014-04-12 19:57:02 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2014-04-12 19:57:17 -0400 |
commit | f9bb91845a30b5ec296ef6f01c9d2eca4cd0b0bb (patch) | |
tree | ae6f188c3254fa288da2b260e96c186010236a9c /kernel.spec | |
parent | 58049b49658b32aa5195bc7517018539e6eba59c (diff) | |
download | kernel-f9bb91845a30b5ec296ef6f01c9d2eca4cd0b0bb.tar.gz kernel-f9bb91845a30b5ec296ef6f01c9d2eca4cd0b0bb.tar.xz kernel-f9bb91845a30b5ec296ef6f01c9d2eca4cd0b0bb.zip |
Linux v3.14.1-rc1
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 186 |
1 files changed, 61 insertions, 125 deletions
diff --git a/kernel.spec b/kernel.spec index 51b94e487..3333cab13 100644 --- a/kernel.spec +++ b/kernel.spec @@ -68,13 +68,13 @@ 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 12 +%define base_sublevel 14 ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 5 +%define stable_update 0 # Is it a -stable RC? %define stable_rc 0 # Set rpm version accordingly @@ -394,7 +394,7 @@ Summary: The Linux kernel %endif %ifarch aarch64 -%define all_arch_configs kernel-%{version}-arm64.config +%define all_arch_configs kernel-%{version}-aarch64*.config %define asmarch arm64 %define hdrarch arm64 %define make_target Image.gz @@ -493,11 +493,11 @@ BuildRequires: xmlto, asciidoc BuildRequires: sparse %endif %if %{with_perf} -BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison +BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison flex BuildRequires: audit-libs-devel %endif %if %{with_tools} -BuildRequires: pciutils-devel gettext +BuildRequires: pciutils-devel gettext ncurses-devel %endif BuildConflicts: rhbuildsys(DiskFree) < 500Mb %if %{with_debuginfo} @@ -613,7 +613,6 @@ Patch09: upstream-reverts.patch # Standalone patches Patch390: defaults-acpi-video.patch -Patch396: acpi-sony-nonvs-blacklist.patch Patch450: input-kill-stupid-messages.patch Patch452: no-pcspkr-modalias.patch @@ -625,18 +624,15 @@ Patch470: die-floppy-die.patch Patch510: silence-noise.patch Patch530: silence-fbcon-logo.patch -Patch600: x86-allow-1024-cpus.patch +Patch600: 0001-lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch + +#rhbz 917708 +Patch700: Revert-userns-Allow-unprivileged-users-to-create-use.patch Patch800: crash-driver.patch # crypto/ -# keys -Patch900: keys-expand-keyring.patch -Patch901: keys-krb-support.patch -Patch902: keys-x509-improv.patch -Patch903: keys-fixes.patch - # secure boot Patch1000: secure-modules.patch Patch1001: modsign-uefi.patch @@ -649,18 +645,15 @@ Patch1003: sysrq-secure-boot.patch # nouveau + drm fixes # intel drm is all merged upstream -Patch1825: drm-i915-dp-stfu.patch - +Patch1826: drm-i915-hush-check-crtc-state.patch # Quiet boot fixes -# silence the ACPI blacklist code -Patch2802: silence-acpi-blacklist.patch # fs fixes # NFSv4 # patches headed upstream -Patch10000: fs-proc-devtree-remove_proc_entry.patch +Patch12015: 3.14.1-rc1.patch Patch12016: disable-i8042-check-on-apple-mac.patch @@ -684,18 +677,14 @@ Patch21010: arm-omap-load-tfp410.patch # ARM tegra Patch21020: arm-tegra-usb-no-reset-linux33.patch +# Add panel support for tegra paz00 +# Backported from linux-next scheduled for 3.15 +Patch21021: arm-tegra-paz00-panel-dts.patch + # ARM i.MX6 # http://www.spinics.net/lists/devicetree/msg08276.html Patch21025: arm-imx6-utilite.patch -# am33xx (BeagleBone) -# https://github.com/beagleboard/kernel -# Pulled primarily from the above git repo. First patch is all in arm-soc -# scheduled for 3.13. The others should be landing via other trees -Patch21030: arm-am33xx-arm-soc-upstream.patch -Patch21031: arm-am33xx-bblack.patch -Patch21032: arm-am33xx-cpsw.patch - #rhbz 754518 Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch @@ -709,46 +698,20 @@ Patch22000: weird-root-dentry-name-debug.patch Patch25047: drm-radeon-Disable-writeback-by-default-on-ppc.patch -#rhbz 896695 -Patch25127: 0002-iwlwifi-don-t-WARN-on-bad-firmware-state.patch - -#rhbz 993744 -Patch25128: dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch - -#rhbz 1000439 -Patch25129: cpupower-Fix-segfault-due-to-incorrect-getopt_long-a.patch - -Patch25140: drm-qxl-backport-fixes-for-Fedora.patch - -#rhbz 1011362 -Patch25148: alx-Reset-phy-speed-after-resume.patch - -# Fix 15sec NFS mount delay -Patch25152: sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch -Patch25153: sunrpc-replace-gssd_running-with-more-reliable-check.patch -Patch25154: nfs-check-gssd-running-before-krb5i-auth.patch - -#CVE-2013-6382 rhbz 1033603 1034670 -Patch25157: xfs-underflow-bug-in-xfs_attrlist_by_handle.patch +#rhbz 1051748 +Patch25035: Bluetooth-allocate-static-minor-for-vhci.patch -#rhbz 958826 -Patch25164: dell-laptop.patch +#rhbz 1046495 +Patch25044: iwlwifi-dvm-take-mutex-when-sending-SYNC-BT-config-command.patch -#rhbz 1030802 -Patch25170: Input-elantech-add-support-for-newer-August-2013-dev.patch -Patch25171: elantech-Properly-differentiate-between-clickpads-an.patch +#CVE-2014-0155 rhbz 1081589 1085016 +Patch25036: KVM-ioapic-fix-assignment-of-ioapic-rtc_status-pending_eoi.patch -#CVE-2013-6367 rhbz 1032207 1042081 -Patch25172: KVM-x86-Fix-potential-divide-by-0-in-lapic.patch +#rhbz 1048314 +Patch25062: 0001-HID-rmi-introduce-RMI-driver-for-Synaptics-touchpads.patch -#CVE-2013-6368 rhbz 1032210 1042090 -Patch25173: KVM-x86-Convert-vapic-synchronization-to-_cached-functions.patch - -#CVE-2013-6376 rhbz 1033106 1042099 -Patch25174: KVM-x86-fix-guest-initiated-crash-with-x2apic.patch - -#CVE-2013-4587 rhbz 1030986 1042071 -Patch25175: KVM-Improve-create-VCPU-parameter.patch +#rhbz 1074235 +Patch25055: lib-percpu_counter.c-fix-bad-percpu-counter-state-du.patch # END OF PATCH DEFINITIONS @@ -899,7 +862,7 @@ This package provides debug information for package kernel-tools. # symlinks because of the trailing nonmatching alternation and # the leading .*, because of find-debuginfo.sh's buggy handling # of matching the pattern against the symlinks file. -%{expand:%%global debuginfo_args %{?debuginfo_args} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|XXX' -o kernel-tools-debuginfo.list} +%{expand:%%global debuginfo_args %{?debuginfo_args} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|XXX' -o kernel-tools-debuginfo.list} %endif # with_tools @@ -950,10 +913,10 @@ against the %{?2:%{2} }kernel package.\ 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-modules-extra-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ -Provides: kernel-modules-extra = %{version}-%{release}%{?1:+%{1}}\ +Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ +Provides: kernel%{?1:-%{1}}-modules-extra = %{version}-%{release}%{?1:+%{1}}\ Provides: installonlypkg(kernel-module)\ -Provides: kernel-modules-extra-uname-r = %{KVERREL}%{?1:+%{1}}\ +Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ AutoReqProv: no\ %description -n kernel%{?variant}%{?1:-%{1}}-modules-extra\ @@ -1186,7 +1149,7 @@ if [ ! -d kernel-%{kversion}%{?dist}/vanilla-%{vanillaversion} ]; then done if [[ ! -z $sharedir && -d $sharedir/vanilla-%{kversion} ]] ; then %setup -q -n kernel-%{kversion}%{?dist} -c -T - cp -rl $sharedir/vanilla-%{kversion} . + cp -al $sharedir/vanilla-%{kversion} . else %setup -q -n kernel-%{kversion}%{?dist} -c mv linux-%{kversion} vanilla-%{kversion} @@ -1203,12 +1166,12 @@ if [ ! -d kernel-%{kversion}%{?dist}/vanilla-%{vanillaversion} ]; then done if [[ ! -z $sharedir && -d $sharedir/vanilla-%{vanillaversion} ]] ; then - cp -rl $sharedir/vanilla-%{vanillaversion} . + cp -al $sharedir/vanilla-%{vanillaversion} . else # Need to apply patches to the base vanilla version. - cp -rl vanilla-%{kversion} vanilla-%{vanillaversion} + cp -al vanilla-%{kversion} vanilla-%{vanillaversion} cd vanilla-%{vanillaversion} # Update vanilla to the latest upstream. @@ -1239,7 +1202,7 @@ else fi # Now build the fedora kernel tree. -cp -rl vanilla-%{vanillaversion} linux-%{KVERREL} +cp -al vanilla-%{vanillaversion} linux-%{KVERREL} cd linux-%{KVERREL} @@ -1271,7 +1234,7 @@ make -f %{SOURCE19} config-release make -f %{SOURCE20} VERSION=%{version} configs # Merge in any user-provided local config option changes -for i in kernel-%{version}-*.config +for i in %{all_arch_configs} do mv $i $i.tmp ./merge.pl %{SOURCE1000} $i.tmp > $i @@ -1292,7 +1255,7 @@ ApplyOptionalPatch upstream-reverts.patch -R # Architecture patches # x86(-64) -ApplyPatch x86-allow-1024-cpus.patch +ApplyPatch 0001-lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch # ARM64 @@ -1303,11 +1266,9 @@ ApplyPatch arm-lpae-ax88796.patch ApplyPatch arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch ApplyPatch arm-omap-load-tfp410.patch ApplyPatch arm-tegra-usb-no-reset-linux33.patch +ApplyPatch arm-tegra-paz00-panel-dts.patch ApplyPatch arm-imx6-utilite.patch -ApplyPatch arm-am33xx-arm-soc-upstream.patch -ApplyPatch arm-am33xx-bblack.patch -ApplyPatch arm-am33xx-cpsw.patch # # bugfixes to drivers and filesystems @@ -1329,7 +1290,6 @@ ApplyPatch arm-am33xx-cpsw.patch # ACPI ApplyPatch defaults-acpi-video.patch -ApplyPatch acpi-sony-nonvs-blacklist.patch # # PCI @@ -1365,18 +1325,14 @@ ApplyPatch silence-fbcon-logo.patch # Changes to upstream defaults. +#rhbz 917708 +ApplyPatch Revert-userns-Allow-unprivileged-users-to-create-use.patch # /dev/crash driver. ApplyPatch crash-driver.patch # crypto/ -# keys -ApplyPatch keys-expand-keyring.patch -ApplyPatch keys-krb-support.patch -ApplyPatch keys-x509-improv.patch -ApplyPatch keys-fixes.patch - # secure boot ApplyPatch secure-modules.patch ApplyPatch modsign-uefi.patch @@ -1390,15 +1346,12 @@ ApplyPatch sysrq-secure-boot.patch # Nouveau DRM # Intel DRM -ApplyPatch drm-i915-dp-stfu.patch +ApplyPatch drm-i915-hush-check-crtc-state.patch # Radeon DRM -# silence the ACPI blacklist code -ApplyPatch silence-acpi-blacklist.patch - # Patches headed upstream -ApplyPatch fs-proc-devtree-remove_proc_entry.patch +ApplyPatch 3.14.1-rc1.patch ApplyPatch disable-i8042-check-on-apple-mac.patch @@ -1423,46 +1376,20 @@ ApplyPatch ath9k_rx_dma_stop_check.patch ApplyPatch drm-radeon-Disable-writeback-by-default-on-ppc.patch -#rhbz 896695 -ApplyPatch 0002-iwlwifi-don-t-WARN-on-bad-firmware-state.patch - -#rhbz 993744 -ApplyPatch dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch - -#rhbz 1000439 -ApplyPatch cpupower-Fix-segfault-due-to-incorrect-getopt_long-a.patch - -ApplyPatch drm-qxl-backport-fixes-for-Fedora.patch - -#rhbz 1011362 -ApplyPatch alx-Reset-phy-speed-after-resume.patch - -# Fix 15sec NFS mount delay -ApplyPatch sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch -ApplyPatch sunrpc-replace-gssd_running-with-more-reliable-check.patch -ApplyPatch nfs-check-gssd-running-before-krb5i-auth.patch - -#CVE-2013-6382 rhbz 1033603 1034670 -ApplyPatch xfs-underflow-bug-in-xfs_attrlist_by_handle.patch - -#rhbz 958826 -ApplyPatch dell-laptop.patch - -#rhbz 1030802 -ApplyPatch Input-elantech-add-support-for-newer-August-2013-dev.patch -ApplyPatch elantech-Properly-differentiate-between-clickpads-an.patch +#rhbz 1051748 +ApplyPatch Bluetooth-allocate-static-minor-for-vhci.patch -#CVE-2013-6367 rhbz 1032207 1042081 -ApplyPatch KVM-x86-Fix-potential-divide-by-0-in-lapic.patch +#rhbz 1046495 +ApplyPatch iwlwifi-dvm-take-mutex-when-sending-SYNC-BT-config-command.patch -#CVE-2013-6368 rhbz 1032210 1042090 -ApplyPatch KVM-x86-Convert-vapic-synchronization-to-_cached-functions.patch +#CVE-2014-0155 rhbz 1081589 1085016 +ApplyPatch KVM-ioapic-fix-assignment-of-ioapic-rtc_status-pending_eoi.patch -#CVE-2013-6376 rhbz 1033106 1042099 -ApplyPatch KVM-x86-fix-guest-initiated-crash-with-x2apic.patch +#rhbz 1048314 +ApplyPatch 0001-HID-rmi-introduce-RMI-driver-for-Synaptics-touchpads.patch -#CVE-2013-4587 rhbz 1030986 1042071 -ApplyPatch KVM-Improve-create-VCPU-parameter.patch +#rhbz 1074235 +ApplyPatch lib-percpu_counter.c-fix-bad-percpu-counter-state-du.patch # END OF PATCH APPLICATIONS @@ -1848,6 +1775,9 @@ chmod +x tools/power/cpupower/utils/version-gen.sh popd %endif #turbostat/x86_energy_perf_policy %endif +pushd tools/thermal/tmon/ +%{make} +popd %endif %if %{with_doc} @@ -1961,13 +1891,15 @@ find $RPM_BUILD_ROOT/usr/include \ %if %{with_perf} # perf tool binary and supporting scripts/binaries -%{perf_make} DESTDIR=$RPM_BUILD_ROOT install +%{perf_make} DESTDIR=$RPM_BUILD_ROOT install-bin +# remove the 'trace' symlink. +rm -f %{buildroot}%{_bindir}/trace # python-perf extension %{perf_make} DESTDIR=$RPM_BUILD_ROOT install-python_ext # perf man pages (note: implicit rpm magic compresses them later) -%{perf_make} DESTDIR=$RPM_BUILD_ROOT install-man || %{doc_build_fail} +%{perf_make} DESTDIR=$RPM_BUILD_ROOT try-install-man || %{doc_build_fail} %endif %if %{with_tools} @@ -2002,6 +1934,9 @@ install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower make DESTDIR=%{buildroot} install popd %endif #turbostat/x86_energy_perf_policy +pushd tools/thermal/tmon +make INSTALL_ROOT=%{buildroot} install +popd %endif %if %{with_bootwrapper} @@ -2180,6 +2115,7 @@ fi %{_bindir}/turbostat %{_mandir}/man8/turbostat* %endif +%{_bindir}/tmon %endif %if %{with_debuginfo} |