diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-10-15 19:11:09 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-10-15 19:11:09 +0200 |
commit | 3c30e0b2161560f9a52e0ea9be827b3d05c59c55 (patch) | |
tree | d41ecf2718b8abbc11423f59d2688c84926cb491 /kernel.spec | |
parent | e8f8cce79dba4fa72fc6744daaf5387b20830371 (diff) | |
parent | c50522dfcc7d8d9b5669141e251e2a414a6a5bec (diff) | |
download | kernel-4.19.0-0.rc8.git0.1.vanilla.knurd.1.fc28.tar.gz kernel-4.19.0-0.rc8.git0.1.vanilla.knurd.1.fc28.tar.xz kernel-4.19.0-0.rc8.git0.1.vanilla.knurd.1.fc28.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc8.git0.1.vanilla.knurd.1.fc30kernel-4.19.0-0.rc8.git0.1.vanilla.knurd.1.fc29kernel-4.19.0-0.rc8.git0.1.vanilla.knurd.1.fc28kernel-4.19.0-0.rc8.git0.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec index 05cdac731..85613fde4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -75,9 +75,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 7 +%global rcrev 8 # The git snapshot level -%define gitrev 4 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -613,10 +613,8 @@ Patch310: gpio-pxa-handle-corner-case-of-unprobed-device.patch Patch330: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch # Patches enabling device specific brcm firmware nvram -Patch340: 0001-brcmfmac-Remove-firmware-loading-code-duplication.patch -Patch341: 0002-brcmfmac-Remove-recursion-from-firmware-load-error-h.patch -Patch342: 0003-brcmfmac-Add-support-for-first-trying-to-get-a-board.patch -Patch343: 0004-brcmfmac-Set-board_type-used-for-nvram-file-selectio.patch +# https://www.spinics.net/lists/linux-wireless/msg178827.html +Patch340: brcmfmac-Remove-firmware-loading-code-duplication.patch # Fix for AllWinner A64 Timer Errata, still not final # https://patchwork.kernel.org/patch/10392891/ @@ -1296,7 +1294,7 @@ BuildKernel() { %ifarch %{arm} aarch64 %{make} %{?make_opts} ARCH=$Arch dtbs dtbs_install INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer cp -r $RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer $RPM_BUILD_ROOT/lib/modules/$KernelVer/dtb - find arch/$Arch/boot/dts -name '*.dtb' -type f | xargs rm -f + find arch/$Arch/boot/dts -name '*.dtb' -type f -delete %endif # Start installing the results @@ -1577,7 +1575,7 @@ BuildKernel() { ln -sf $DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build # prune junk from kernel-devel - find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -exec rm -f {} \; + find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -delete # build a BLS config for this kernel %{SOURCE43} "$KernelVer" "$RPM_BUILD_ROOT" "%{?variant}" @@ -1687,7 +1685,7 @@ make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install find $RPM_BUILD_ROOT/usr/include \ \( -name .install -o -name .check -o \ - -name ..install.cmd -o -name ..check.cmd \) | xargs rm -f + -name ..install.cmd -o -name ..check.cmd \) -delete %endif @@ -1697,7 +1695,7 @@ make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr/tmp-headers headers_in find $RPM_BUILD_ROOT/usr/tmp-headers/include \ \( -name .install -o -name .check -o \ - -name ..install.cmd -o -name ..check.cmd \) | xargs rm -f + -name ..install.cmd -o -name ..check.cmd \) -delete # Copy all the architectures we care about to their respective asm directories for arch in arm arm64 powerpc s390 x86 ; do @@ -1907,6 +1905,15 @@ fi # # %changelog +* Mon Oct 15 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc8.git0.1 +- Linux v4.19-rc8 + +* Mon Oct 15 2018 Jeremy Cline <jcline@redhat.com> +- Disable debugging options. + +* Fri Oct 12 2018 Peter Robinson <pbrobinson@fedoraproject.org> +- Rebase device specific NVRAM files on brcm WiFi devices to latest + * Fri Oct 12 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc7.git4.1 - Linux v4.19-rc7-139-g6b3944e42e2e |