diff options
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 170 |
1 files changed, 74 insertions, 96 deletions
diff --git a/kernel.spec b/kernel.spec index 80878c5ad..73026b9ff 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 200 +%global baserelease 300 %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 13 +%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 3 +%define stable_update 0 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -125,7 +125,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 %{?_with_vanilla: 1} %{?!_with_vanilla: 0} @@ -187,7 +187,9 @@ Summary: The Linux kernel # 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. +# kernel PAE is only built on ARMv7 in rawhide. +# Fedora 27 and earlier still support PAE, so change this on rebases. +# %ifnarch armv7hl %ifnarch i686 armv7hl %define with_pae 0 %endif @@ -267,7 +269,7 @@ Summary: The Linux kernel %define make_target vmlinux %define kernel_image vmlinux %define kernel_image_elf 1 -%ifarch ppc64 ppc64p7 +%ifarch ppc64 %define all_arch_configs kernel-%{version}-ppc64*.config %endif %ifarch ppc64le @@ -377,7 +379,7 @@ Version: %{rpmversion} Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD -ExclusiveArch: %{all_x86} x86_64 ppc64 ppc64p7 s390x %{arm} aarch64 ppc64le +ExclusiveArch: %{all_x86} x86_64 ppc64 s390x %{arm} aarch64 ppc64le ExclusiveOS: Linux %ifnarch %{nobuildarches} Requires: kernel-core-uname-r = %{KVERREL}%{?variant} @@ -388,8 +390,8 @@ Requires: kernel-modules-uname-r = %{KVERREL}%{?variant} # # List the packages used during the kernel build # -BuildRequires: kmod, patch, bash, sh-utils, tar, git -BuildRequires: bzip2, xz, findutils, gzip, m4, perl, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk +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: net-tools, hostname, bc, elfutils-devel %if %{with_sparse} @@ -408,7 +410,19 @@ BuildRequires: pciutils-devel gettext ncurses-devel BuildConflicts: rhbuildsys(DiskFree) < 500Mb %if %{with_debuginfo} BuildRequires: rpm-build, elfutils -%define debuginfo_args --strict-build-id -r +BuildConflicts: rpm < 4.13.0.1-19 +# Most of these should be enabled after more investigation +%undefine _include_minidebuginfo +%undefine _find_debuginfo_dwz_opts +%undefine _unique_build_ids +%undefine _unique_debug_names +%undefine _unique_debug_srcs +%undefine _debugsource_packages +%undefine _debuginfo_subpackages +%undefine _include_gdb_index +%global _find_debuginfo_opts -r +%global _missing_build_ids_terminate_build 1 +%global _no_recompute_build_ids 1 %endif %if %{signkernel}%{signmodules} @@ -439,7 +453,6 @@ Source93: filter-aarch64.sh Source95: filter-ppc64.sh Source96: filter-ppc64le.sh Source97: filter-s390x.sh -Source98: filter-ppc64p7.sh Source99: filter-modules.sh %define modsign_cmd %{SOURCE18} @@ -457,8 +470,6 @@ Source30: kernel-ppc64.config Source31: kernel-ppc64-debug.config Source32: kernel-ppc64le.config Source33: kernel-ppc64le-debug.config -Source34: kernel-ppc64p7.config -Source35: kernel-ppc64p7-debug.config Source36: kernel-s390x.config Source37: kernel-s390x-debug.config Source38: kernel-x86_64.config @@ -505,9 +516,6 @@ Source5000: patch-4.%{base_sublevel}-git%{gitrev}.xz ## Patches needed for building this package -# build tweak for build ID magic, even for -vanilla -Patch001: kbuild-AFTER_LINK.patch - ## compile fixes # ongoing complaint, full discussion delayed until ksummit/plumbers @@ -569,97 +577,83 @@ Patch211: drm-i915-hush-check-crtc-state.patch # 300 - ARM patches -# a tempory patch for QCOM hardware enablement. Will be gone by F-26 GA -Patch301: qcom-QDF2432-tmp-errata.patch +# Reduces a number of primarily info logs to dmesg +# https://patchwork.freedesktop.org/patch/180737/ +# https://patchwork.freedesktop.org/patch/180554/ +Patch300: drm-cma-reduce-dmesg-logs.patch # http://www.spinics.net/lists/linux-tegra/msg26029.html -Patch302: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch +Patch301: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch # Fix OMAP4 (pandaboard) -Patch303: arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch +Patch302: arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch # http://patchwork.ozlabs.org/patch/587554/ -Patch304: ARM-tegra-usb-no-reset.patch +Patch303: ARM-tegra-usb-no-reset.patch -Patch305: allwinner-net-emac.patch +Patch304: allwinner-net-emac.patch # https://www.spinics.net/lists/arm-kernel/msg554183.html -Patch307: arm-imx6-hummingboard2.patch +Patch305: arm-imx6-hummingboard2.patch -Patch308: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch +Patch306: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.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/ Patch310: qcom-msm89xx-fixes.patch -# https://patchwork.kernel.org/patch/9831825/ -# https://patchwork.kernel.org/patch/9833721/ -Patch311: arm-tegra-fix-gpu-iommu.patch - -# https://www.spinics.net/lists/linux-arm-msm/msg28203.html -Patch312: qcom-display-iommu.patch - -# https://patchwork.kernel.org/patch/9839803/ -Patch313: qcom-Force-host-mode-for-USB-on-apq8016-sbc.patch - -# https://patchwork.kernel.org/patch/9850189/ -Patch314: qcom-msm-ci_hdrc_msm_probe-missing-of_node_get.patch - -Patch320: bcm283x-vc4-fixes.patch +# https://patchwork.kernel.org/patch/10054387/ +Patch311: USB-ulpi-fix-bus-node-lookup.patch # Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/ Patch321: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch -# Updat3 move of bcm2837, landed in 4.14 -Patch322: bcm2837-move-dt.patch +# bcm2837 bluetooth support +Patch323: bcm2837-bluetooth-support.patch + +# Generic fixes and enablement for Socionext SoC and 96board +# https://patchwork.kernel.org/patch/9980861/ +Patch331: PCI-aspm-deal-with-missing-root-ports-in-link-state-handling.patch -# https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?h=next-20170912&id=723288836628bc1c0855f3bb7b64b1803e4b9e4a -Patch324: arm-of-restrict-dma-configuration.patch +# https://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux.git/log/?h=synquacer-netsec +Patch332: arm64-socionext-96b-enablement.patch + +Patch335: arm-exynos-fix-usb3.patch # 400 - IBM (ppc/s390x) patches # 500 - Temp fixes/CVEs etc -# CVE-2017-7477 rhbz 1445207 1445208 -Patch502: CVE-2017-7477.patch +# rhbz 1498016 1498017 +#Patch503: KEYS-don-t-let-add_key-update-an-uninstantiated-key.patch # 600 - Patches for improved Bay and Cherry Trail device support # Below patches are submitted upstream, awaiting review / merging Patch601: 0001-Input-gpio_keys-Allow-suppression-of-input-events-fo.patch Patch602: 0002-Input-soc_button_array-Suppress-power-button-presses.patch Patch610: 0010-Input-silead-Add-support-for-capactive-home-button-f.patch -Patch611: 0011-Input-goodix-Add-support-for-capacitive-home-button.patch -# These patches are queued for 4.14 and can be dropped on rebase to 4.14-rc1 -Patch603: 0001-power-supply-max17042_battery-Add-support-for-ACPI-e.patch -Patch604: 0002-power-supply-max17042_battery-Fix-ACPI-interrupt-iss.patch -Patch613: 0013-iio-accel-bmc150-Add-support-for-BOSC0200-ACPI-devic.patch -Patch615: 0015-i2c-cht-wc-Add-Intel-Cherry-Trail-Whiskey-Cove-SMBUS.patch # rhbz 1476467 Patch617: Fix-for-module-sig-verification.patch -# rhbz 1485086 -Patch619: pci-mark-amd-stoney-gpu-ats-as-broken.patch +# rhbz 1431375 +Patch619: input-rmi4-remove-the-need-for-artifical-IRQ.patch -# CVE-2017-12154 rhbz 1491224 1491231 -Patch620: kvm-nVMX-Don-t-allow-L2-to-access-the-hardware-CR8.patch +# fix gnome 3.26+ not working under VirtualBox, submitted upstream, Cc: Stable +Patch620: 0001-staging-vboxvideo-Fix-reporting-invalid-suggested-of.patch -# CVE-2017-12153 rhbz 1491046 1491057 -Patch621: nl80211-check-for-the-required-netlink-attributes-presence.patch +# Headed upstream +Patch621: drm-i915-Boost-GPU-clocks-if-we-miss-the-pageflip-s-vblank.patch -# Should fix our QXL issues -Patch622: qxl-fixes.patch +# rhbz 1497861, submitted upstream, Cc: Stable +Patch622: 0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch -# rhbz 1431375 -Patch623: HID-rmi-Make-sure-the-HID-device-is-opened-on-resume.patch -Patch624: input-rmi4-remove-the-need-for-artifical-IRQ.patch +Patch623: 0001-PATCH-staging-rtl8822be-fix-wrong-dma-unmap-len.patch -# rhbz 1493435 1493436 -Patch625: KEYS-prevent-KEYCTL_READ-on-negative-key.patch +# rhbz 1509461 +Patch625: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch + +# rhbz 1490803 +Patch626: 1-2-kvm-vmx-Reinstate-support-for-CPUs-without-virtual-NMI.patch # END OF PATCH DEFINITIONS @@ -761,7 +755,7 @@ This package provides debug information for the perf package. # 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}/perf(\.debug)?|.*%%{_libexecdir}/perf-core/.*|.*%%{_libdir}/traceevent/plugins/.*|XXX' -o perf-debuginfo.list} +%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/perf(\.debug)?|.*%%{_libexecdir}/perf-core/.*|.*%%{_libdir}/traceevent/plugins/.*|XXX' -o perf-debuginfo.list} %package -n python-perf Summary: Python bindings for apps which will manipulate perf events @@ -782,7 +776,7 @@ AutoReqProv: no This package provides debug information for the perf python bindings. # the python_sitearch macro should already be defined from above -%{expand:%%global debuginfo_args %{?debuginfo_args} -p '.*%%{python_sitearch}/perf.so(\.debug)?|XXX' -o python-perf-debuginfo.list} +%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{python_sitearch}/perf.so(\.debug)?|XXX' -o python-perf-debuginfo.list} %endif # with_perf @@ -800,6 +794,7 @@ Obsoletes: cpufreq-utils < 1:009-0.6.p1 Obsoletes: cpufrequtils < 1:009-0.6.p1 Obsoletes: cpuspeed < 1:1.5-16 Requires: kernel-tools-libs = %{version}-%{release} +%define __requires_exclude ^%{_bindir}/python %description -n kernel-tools This package contains the tools/ directory from the kernel source and the supporting documentation. @@ -837,7 +832,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)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|XXX' -o kernel-tools-debuginfo.list} +%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -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)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|XXX' -o kernel-tools-debuginfo.list} %endif # with_tools @@ -857,7 +852,7 @@ AutoReqProv: no\ %description %{?1:%{1}-}debuginfo\ This package provides debug information for package %{name}%{?1:-%{1}}.\ This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\ -%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:[+]%{1}}/.*|/.*%%{KVERREL}%{?1:\+%{1}}(\.debug)?' -o debuginfo%{?1}.list}\ +%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '/.*/%%{KVERREL}%{?1:[+]%{1}}/.*|/.*%%{KVERREL}%{?1:\+%{1}}(\.debug)?' -o debuginfo%{?1}.list}\ %{nil} # @@ -875,7 +870,7 @@ Provides: installonlypkg(kernel)\ AutoReqProv: no\ Requires(pre): findutils\ Requires: findutils\ -Requires: perl\ +Requires: perl-interpreter\ %description %{?1:%{1}-}devel\ This package provides kernel headers and makefiles sufficient to build modules\ against the %{?2:%{2} }kernel package.\ @@ -1338,18 +1333,6 @@ cd .. %define sparse_mflags C=1 %endif -%if %{with_debuginfo} -# This override tweaks the kernel makefiles so that we run debugedit on an -# object before embedding it. When we later run find-debuginfo.sh, it will -# run debugedit again. The edits it does change the build ID bits embedded -# in the stripped object, but repeating debugedit is a no-op. We do it -# beforehand to get the proper final build ID bits into the embedded image. -# This affects the vDSO images in vmlinux, and the vmlinux image in bzImage. -export AFTER_LINK=\ -'sh -xc "/usr/lib/rpm/debugedit -b $$RPM_BUILD_DIR -d /usr/src/debug \ - -i $@ > $@.id"' -%endif - cp_vmlinux() { eu-strip --remove-comment -o "$2" "$1" @@ -1562,12 +1545,8 @@ BuildKernel() { cp $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/config/auto.conf %if %{with_debuginfo} - if test -s vmlinux.id; then - cp vmlinux.id $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/vmlinux.id - else - echo >&2 "*** ERROR *** no vmlinux build ID! ***" - exit 1 - fi + eu-readelf -n vmlinux | grep "Build ID" | awk '{print $NF}' > vmlinux.id + cp vmlinux.id $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/vmlinux.id # # save the vmlinux file for kernel debugging into the kernel-debuginfo rpm @@ -1805,10 +1784,6 @@ popd %if %{with_debuginfo} -%define __debug_install_post \ - /usr/lib/rpm/find-debuginfo.sh %{debuginfo_args} %{_builddir}/%{?buildsubdir}\ -%{nil} - %ifnarch noarch %global __debug_package 1 %files -f debugfiles.list debuginfo-common-%{_target_cpu} @@ -1934,7 +1909,7 @@ pushd tools/thermal/tmon make INSTALL_ROOT=%{buildroot} install popd pushd tools/iio -make INSTALL_ROOT=%{buildroot} install +make DESTDIR=%{buildroot} install popd pushd tools/gpio make DESTDIR=%{buildroot} install @@ -2234,6 +2209,9 @@ fi # # %changelog +* Wed Nov 15 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-300 +- Linux v4.14 + * Wed Sep 20 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.13.3-200 - Linux v4.13.3 - Fixes 1493435 1493436 |