summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kernel.spec657
-rwxr-xr-xscripts/stable-update.sh21
2 files changed, 668 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec
index a89d6af5d..b172774a4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -25,6 +25,8 @@ Summary: The Linux kernel
%endif
# define buildid .local
+%define packager Thorsten Leemhuis https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories
+%define buildid .vanilla.knurd.1
# baserelease defines which build revision of this kernel version we're
# building. We used to call this fedora_build, but the magical name
@@ -42,7 +44,7 @@ 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 250
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -52,6 +54,8 @@ Summary: The Linux kernel
## If this is a released kernel ##
%if 0%{?released_kernel}
+# Is it a -stable RC?
+%define stable_rc 0
# Do we have a -stable update to apply?
%define stable_update 15
@@ -59,6 +63,10 @@ Summary: The Linux kernel
%if 0%{?stable_update}
%define stablerev %{stable_update}
%define stable_base %{stable_update}
+%if 0%{?stable_rc}
+# stable RCs are incremental patches, so we need the previous stable patch
+%define stable_base %(echo $((%{stable_update} - 1)))
+%endif
%endif
%define rpmversion 5.%{base_sublevel}.%{stable_update}
@@ -89,12 +97,12 @@ Summary: The Linux kernel
# kernel PAE (only valid for ARM (lpae))
%define with_pae %{?_without_pae: 0} %{?!_without_pae: 1}
# kernel-debug
-%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1}
+%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0}
# kernel-headers
%define with_headers %{?_without_headers: 0} %{?!_without_headers: 1}
%define with_cross_headers %{?_without_cross_headers: 0} %{?!_without_cross_headers: 1}
# kernel-debuginfo
-%define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
+%define with_debuginfo %{?_with_debuginfo: 1} %{?!_with_debuginfo: 0}
# Want to build a the vsdo directories installed
%define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
#
@@ -114,7 +122,7 @@ Summary: The Linux kernel
%define with_cross %{?_with_cross: 1} %{?!_with_cross: 0}
#
# build a release kernel on rawhide
-%define with_release %{?_with_release: 1} %{?!_with_release: 0}
+%define with_release %{?_without_release: 0} %{?!_without_release: 1}
# verbose build, i.e. no silent rules and V=1
%define with_verbose %{?_with_verbose: 1} %{?!_with_verbose: 0}
@@ -137,12 +145,17 @@ Summary: The Linux kernel
%endif
# Want to build a vanilla kernel build without any non-upstream patches?
-%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
+%define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
# pkg_release is what we'll fill in for the rpm Release: field
%if 0%{?released_kernel}
+%if 0%{?stable_rc}
+%define stable_rctag .rc%{stable_rc}
+%define pkg_release 0%{stable_rctag}.%{fedora_build}%{?buildid}%{?dist}
+%else
%define pkg_release %{fedora_build}%{?buildid}%{?dist}
+%endif
%else
@@ -180,7 +193,7 @@ Summary: The Linux kernel
%endif
%if %{nopatches}
-%define variant -vanilla
+#define variant -vanilla
%endif
%if !%{debugbuildsenabled}
@@ -464,6 +477,10 @@ Source1000: kernel-local
%define stable_patch_00 patch-5.%{base_sublevel}.%{stable_base}.xz
Source5000: %{stable_patch_00}
%endif
+%if 0%{?stable_rc}
+%define stable_patch_01 patch-3.%{base_sublevel}.%{stable_update}-rc%{stable_rc}.xz
+Patch01: %{stable_patch_01}
+%endif
# non-released_kernel case
# These are automagically defined by the rcrev and gitrev values set up
@@ -1104,6 +1121,9 @@ do
rm $i.tmp
done
%endif
+%if 0%{?stable_rc}
+ApplyPatch %{stable_patch_01}
+%endif
# only deal with configs if we are going to build for the arch
%ifnarch %nobuildarches
@@ -2172,6 +2192,631 @@ fi
- Fix WiFi on Raspberry Pi 3 on aarch64 (rhbz 1649344)
- Fixes for Raspberry Pi hwmon driver and firmware interface
+<<<<<<< HEAD
+* Fri Nov 16 2018 Hans de Goede <hdegoede@redhat.com>
+- Add patches from 4.20 fixing black screen on CHT devices with i915.fastboot=1
+
+* Thu Nov 15 2018 Hans de Goede <hdegoede@redhat.com>
+- Add patch fixing touchpads on some Apollo Lake devices not working (#1526312)
+
+* Wed Nov 14 2018 Jeremy Cline <jcline@redhat.com> - 4.19.2-300
+- Linux v4.19.2
+- Fix CVE-2018-18710 (rhbz 1645140 1648485)
+
+* Mon Nov 12 2018 Laura Abbott <labbott@redhat.com> - 4.18.18-300
+- Linux v4.18.18
+
+* Mon Nov 05 2018 Laura Abbott <labbott@redhat.com> - 4.18.17-300
+- Linux v4.18.17
+
+* Tue Oct 23 2018 Laura Abbott <labbott@redhat.com>
+- Add i915 eDP fixes
+
+* Sat Oct 20 2018 Peter Robinson <pbrobinson@fedoraproject.org> 4.18.16-300
+- Linux v4.18.16
+- Fix network on some i.MX6 devices (rhbz 1628209)
+
+* Thu Oct 18 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.18.15-300
+- Linux v4.18.15
+
+* Thu Oct 18 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add patch to fix mSD on 96boards Hikey
+
+* Tue Oct 16 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fixes to Rock960 series of devices, improves stability considerably
+- Raspberry Pi graphics fix
+
+* Mon Oct 15 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.18.14-300
+- Linux v4.18.14
+
+* 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 <jeremy@jcline.org>
+- Fix the microphone on Lenovo G50-30s (rhbz 1249364)
+
+* Wed Oct 10 2018 Laura Abbott <labbott@redhat.com> - 4.18.13-300
+- Linux v4.18.13
+
+* Mon Oct 08 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Revert drm/amd/pp: Send khz clock values to DC for smu7/8 (rhbz 1636249)
+
+* Thu Oct 04 2018 Laura Abbott <labbott@redhat.com> - 4.18.12-300
+- Linux v4.18.12
+
+* Wed Oct 3 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fixes for Ampere platforms
+
+* Wed Oct 03 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix arm64 kvm priv escalation (rhbz 1635475 1635476)
+
+* Mon Oct 01 2018 Laura Abbott <labbott@redhat.com>
+- Disable CONFIG_CRYPTO_DEV_SP_PSP (rhbz 1608242)
+
+* Mon Oct 1 2018 Laura Abbott <labbott@redhat.com>
+- Fix for Intel Sensor Hub (rhbz 1634250)
+
+* Mon Oct 1 2018 Peter Robinson <pbrobinson@fedoraproject.org> 4.18.11-301
+- Support loading device specific NVRAM files on brcm WiFi devices
+
+* Sun Sep 30 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fixes for AllWinner A64 NICs
+
+* Sun Sep 30 2018 Laura Abbott <labbott@redhat.com> - 4.18.11-300
+- Linux v4.18.11
+
+* Wed Sep 26 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add thermal trip to bcm283x (Raspberry Pi) cpufreq
+- Add initial RockPro64 DT support
+- Add Pine64-LTS support and some other AllWinner-A64 fixes
+
+* Wed Sep 26 2018 Laura Abbott <labbott@redhat.com> - 4.18.10-300
+- Linux v4.18.10
+
+* Wed Sep 26 2018 Laura Abbott <labbott@redhat.com>
+- Fix powerpc IPv6 (rhbz 1628394)
+
+* Mon Sep 24 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix CVE-2018-14633 (rhbz 1626035 1632185)
+
+* Thu Sep 20 2018 Laura Abbott <labbott@redhat.com> - 4.18.9-300
+- Linux v4.18.9
+- Fixes CVE-2018-17182 (rhbz 1631205 1631206)
+
+* Sun Sep 16 2018 Laura Abbott <labbott@redhat.com> - 4.18.8-300
+- Linux v4.18.8
+
+* Fri Sep 14 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Additional Fixes for CVE-2018-5391 (rhbz 1616059)
+
+* Thu Sep 13 2018 Laura Abbott <labbott@redhat.com>
+- Use the CPU RNG for entropy (rhbz 1572944)
+
+* Thu Sep 13 2018 Laura Abbott <labbott@redhat.com>
+- HID fixes (rhbz 1627963 1628715)
+
+* Thu Sep 13 2018 Hans de Goede <hdegoede@redhat.com>
+- Add patch silencing "EFI stub: UEFI Secure Boot is enabled." at boot
+
+* Mon Sep 10 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add 96boards rk3399 Ficus and Rock960 support
+
+* Mon Sep 10 2018 Laura Abbott <labbott@redhat.com> - 4.18.7-300
+- Linux v4.18.7
+
+* Wed Sep 05 2018 Laura Abbott <labbott@redhat.com> - 4.18.6-300
+- Linux v4.18.6
+
+* Fri Aug 24 2018 Laura Abbott <labbott@redhat.com> - 4.18.5-300
+- Linux v4.18.5
+
+* Wed Aug 22 2018 Laura Abbott <labbott@redhat.com> - 4.18.4-300
+- Linux v4.18.4
+
+* Wed Aug 22 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Re-add mvebu a3700 ATF memory exclusion
+- Upstream fix for dwc2 on some ARM platforms
+
+* Mon Aug 20 2018 Laura Abbott <labbott@redhat.com> - 4.18.3-300
+- Linux v4.18.3
+
+* Mon Aug 20 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix CVE-2018-15471 (rhbz 1610555 1618414)
+
+* Fri Aug 17 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add fix and re-enable BPF JIT on ARMv7
+
+* Thu Aug 16 2018 Laura Abbott <labbott@redhat.com> - 4.18.1-300
+- Linux v4.18.1
+
+* Wed Aug 15 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Drop PPC64 (Big Endian) configs
+
+* Mon Aug 13 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-1
+- Linux v4.18
+- Disable debugging options.
+
+* Mon Aug 13 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Disable speck crypto cipher
+
+* Sat Aug 11 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add ZYNQMP clock and firmware driver
+
+* Fri Aug 10 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc8.git2.1
+- Linux v4.18-rc8-4-gfedb8da96355
+
+* Fri Aug 10 2018 Hans de Goede <hdegoede@redhat.com>
+- Sync FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER bugfix with upstream
+
+* Wed Aug 08 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc8.git1.1
+- Linux v4.18-rc8-2-g1236568ee3cb
+
+* Wed Aug 08 2018 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
+* Mon Aug 06 2018 Hans de Goede <hdegoede@redhat.com>
+- Add one more FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER bugfix patch
+
+* Mon Aug 06 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc8.git0.1
+- Linux v4.18-rc8
+
+* Mon Aug 06 2018 Laura Abbott <labbott@redhat.com>
+- Disable debugging options.
+
+* Sat Aug 04 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc7.git3.1
+- Linux v4.18-rc7-178-g0b5b1f9a78b5
+
+* Thu Aug 02 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc7.git2.1
+- Linux v4.18-rc7-112-g6b4703768268
+
+* Thu Aug 2 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add ARM Helios4 support
+
+* Wed Aug 01 2018 Hans de Goede <hdegoede@redhat.com>
+- Add patch fixing FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER breaking
+ VT switching when combined with vgacon (rhbz#1610562)
+- Enable Apollo Lake Whiskey Cove PMIC support
+
+* Wed Aug 01 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc7.git1.1
+- Linux v4.18-rc7-90-gc1d61e7fe376
+
+* Wed Aug 01 2018 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
+* Wed Aug 01 2018 Jeremy Cline <jeremy@jcline.org>
+- Enable AEGIS and MORUS ciphers (rhbz 1610180)
+
+* Tue Jul 31 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add two bcm283x vc4 stability patches
+- Some AllWinner MMC driver fixes
+
+* Tue Jul 31 2018 Hans de Goede <hdegoede@redhat.com>
+- Add patch to fix FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER on s390x and
+ re-enable FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER on s390x
+
+* Mon Jul 30 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc7.git0.1
+- Linux v4.18-rc7
+
+* Mon Jul 30 2018 Laura Abbott <labbott@redhat.com>
+- Disable debugging options.
+
+* Mon Jul 30 2018 Hans de Goede <hdegoede@redhat.com>
+- Add patch queued in -next to make quiet more quiet
+- Add patches queued in -next to make efifb / fbcon retain the vendor logo
+ (ACPI BRGT boot graphics) until the first text is output to the console
+- Enable support for ICN8505 touchscreen used on some Cherry Trail tablets
+
+* Fri Jul 27 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable FPGA Manager kernel framework
+
+* Fri Jul 27 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc6.git3.1
+- Linux v4.18-rc6-152-gcd3f77d74ac3
+- Disable headers in preparation for kernel headers split
+
+* Thu Jul 26 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc6.git2.1
+- Linux v4.18-rc6-110-g6e77b267723c
+
+* Thu Jul 26 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add Raspberry Pi voltage sensor driver
+
+* Wed Jul 25 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc6.git1.1
+- Linux v4.18-rc6-93-g9981b4fb8684
+
+* Wed Jul 25 2018 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
+* Mon Jul 23 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc6.git0.1
+- Linux v4.18-rc6
+
+* Mon Jul 23 2018 Laura Abbott <labbott@redhat.com>
+- Disable debugging options.
+
+* Fri Jul 20 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc5.git4.1
+- Linux v4.18-rc5-290-g28c20cc73b9c
+
+* Thu Jul 19 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc5.git3.1
+- Linux v4.18-rc5-264-gf39f28ff82c1
+
+* Wed Jul 18 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc5.git2.1
+- Linux v4.18-rc5-37-g3c53776e29f8
+
+* Tue Jul 17 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc5.git1.1
+- Linux v4.18-rc5-36-g30b06abfb92b
+- Fix aio uapi breakage (rhbz 1601529)
+
+* Tue Jul 17 2018 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
+* Mon Jul 16 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc5.git0.1
+- Linux v4.18-rc5
+
+* Mon Jul 16 2018 Laura Abbott <labbott@redhat.com>
+- Disable debugging options.
+
+* Fri Jul 13 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc4.git4.1
+- Linux v4.18-rc4-71-g63f047771621
+
+* Thu Jul 12 2018 Laura Abbott <labbott@redhat.com>
+- Proper support for parallel debuginfo and hardening flags
+
+* Thu Jul 12 2018 Javier Martinez Canillas <javierm@redhat.com>
+- Drop the id field from generated BLS snippets
+
+* Thu Jul 12 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc4.git3.1
+- Linux v4.18-rc4-69-gc25c74b7476e
+
+* Wed Jul 11 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc4.git2.1
+- Linux v4.18-rc4-17-g1e09177acae3
+
+* Tue Jul 10 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc4.git1.1
+- Linux v4.18-rc4-7-g092150a25cb7
+
+* Tue Jul 10 2018 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
+* Mon Jul 09 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc4.git0.1
+- Linux v4.18-rc4
+
+* Mon Jul 09 2018 Laura Abbott <labbott@redhat.com>
+- Disable debugging options.
+
+* Mon Jul 9 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add fix for AllWinner A64 timer scew errata
+
+* Fri Jul 06 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc3.git3.1
+- Linux v4.18-rc3-183-gc42c12a90545
+
+* Thu Jul 05 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc3.git2.1
+- Linux v4.18-rc3-134-g06c85639897c
+
+* Tue Jul 03 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc3.git1.1
+- Linux v4.18-rc3-107-gd0fbad0aec1d
+
+* Tue Jul 03 2018 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
+* Mon Jul 02 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc3.git0.1
+- Linux v4.18-rc3
+
+* Mon Jul 02 2018 Laura Abbott <labbott@redhat.com>
+- Disable debugging options.
+
+* Fri Jun 29 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc2.git4.1
+- Linux v4.18-rc2-207-gcd993fc4316d
+
+* Fri Jun 29 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add a possible i.MX6 sdhci fix
+
+* Thu Jun 28 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc2.git3.1
+- Linux v4.18-rc2-132-gf57494321cbf
+
+* Tue Jun 26 2018 Laura Abbott <labbott@redhat.com>
+- Enable leds-pca9532 module (rhbz 1595163)
+
+* Tue Jun 26 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc2.git2.1
+- Linux v4.18-rc2-44-g813835028e9a
+
+* Mon Jun 25 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc2.git1.1
+- Linux v4.18-rc2-37-g6f0d349d922b
+- Fix for aarch64 bpf (rhbz 1594447)
+
+* Mon Jun 25 2018 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
+* Mon Jun 25 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc2.git0.1
+- Linux v4.18-rc2
+
+* Mon Jun 25 2018 Laura Abbott <labbott@redhat.com>
+- Disable debugging options.
+
+* Mon Jun 25 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Disable BFP JIT on ARMv7 as it's currently broken
+- Remove forced console on aarch64, legacy config (rhbz 1594402)
+
+* Fri Jun 22 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc1.git4.1
+- Linux v4.18-rc1-189-g894b8c000ae6
+
+* Thu Jun 21 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc1.git3.1
+- Linux v4.18-rc1-107-g1abd8a8f39cd
+
+* Wed Jun 20 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc1.git2.1
+- Linux v4.18-rc1-52-g81e97f01371f
+
+* Tue Jun 19 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc1.git1.1
+- Linux v4.18-rc1-43-gba4dbdedd3ed
+
+* Tue Jun 19 2018 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
+* Mon Jun 18 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc1.git0.1
+- Linux v4.18-rc1
+
+* Mon Jun 18 2018 Laura Abbott <labbott@redhat.com>
+- Disable debugging options.
+
+* Fri Jun 15 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git10.1
+- Linux v4.17-12074-g4c5e8fc62d6a
+
+* Fri Jun 15 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- ARM updates for 4.18, cleanup some dropped config options
+- Disable zoron driver, moved to staging for removal upstream
+
+* Thu Jun 14 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git9.1
+- Linux v4.17-11928-g2837461dbe6f
+
+* Wed Jun 13 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git8.1
+- Linux v4.17-11782-gbe779f03d563
+
+* Wed Jun 13 2018 Jeremy Cline <jeremy@jcline.org>
+- Fix kexec_file_load pefile signature verification (rhbz 1470995)
+
+* Tue Jun 12 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git7.1
+- Linux v4.17-11346-g8efcf34a2639
+
+* Mon Jun 11 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Secure Boot updates
+
+* Mon Jun 11 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git6.1
+- Linux v4.17-10288-ga2225d931f75
+
+* Fri Jun 08 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git5.1
+- Linux v4.17-7997-g68abbe729567
+
+* Thu Jun 07 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git4.1
+- Linux v4.17-6625-g1c8c5a9d38f6
+
+* Wed Jun 06 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git3.1
+- Linux v4.17-3754-g135c5504a600
+
+* Tue Jun 05 2018 Jeremy Cline <jeremy@jcline.org>
+- Enable CONFIG_SCSI_DH on s390x (rhbz 1586189)
+
+* Tue Jun 05 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git2.1
+- Linux v4.17-1535-g5037be168f0e
+
+* Mon Jun 04 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git1.1
+- Linux v4.17-505-g9214407d1237
+
+* Mon Jun 04 2018 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
+* Mon Jun 04 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-1
+- Linux v4.17
+- Disable debugging options.
+
+* Sun Jun 3 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Initial support for Raspberry Pi cpufreq driver
+
+* Thu May 31 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc7.git2.1
+- Linux v4.17-rc7-43-gdd52cb879063
+
+* Wed May 30 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc7.git1.1
+- Linux v4.17-rc7-31-g0044cdeb7313
+- Reenable debugging options.
+
+* Tue May 29 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc7.git0.1
+- Linux v4.17-rc7
+
+* Tue May 29 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Disable debugging options.
+
+* Fri May 25 2018 Jeremy Cline <jcline@redhat.com> - 4.17.0-0.rc6.git3.1
+- Linux v4.17-rc6-224-g62d18ecfa641
+
+* Fri May 25 2018 Jeremy Cline <jeremy@jcline.org>
+- Fix for incorrect error message about parsing PCCT (rhbz 1435837)
+
+* Thu May 24 2018 Justin M. Forbes <jforbes@redhat.com> - 4.17.0-0.rc6.git2.1
+- Linux v4.17-rc6-158-gbee797529d7c
+- Reenable debugging options.
+
+* Mon May 21 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc6.git1.1
+- Linux v4.17-rc6-146-g5997aab0a11e
+
+* Mon May 21 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc6.git0.1
+- Linux v4.17-rc6
+- Disable debugging options.
+
+* Sun May 20 2018 Hans de Goede <hdegoede@redhat.com>
+- Enable GPIO_AMDPT, PINCTRL_AMD and X86_AMD_PLATFORM_DEVICE Kconfig options
+ to fix i2c and GPIOs not working on AMD based laptops (rhbz#1510649)
+
+* Fri May 18 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc5.git3.1
+- Linux v4.17-rc5-110-g2c71d338bef2
+
+* Thu May 17 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc5.git2.1
+- Linux v4.17-rc5-65-g58ddfe6c3af9
+
+* Tue May 15 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc5.git1.1
+- Linux v4.17-rc5-20-g21b9f1c7e319
+- Reenable debugging options.
+
+* Mon May 14 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc5.git0.1
+- Linux v4.17-rc5
+
+* Mon May 14 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Disable debugging options.
+
+* Fri May 11 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc4.git4.1
+- Linux v4.17-rc4-96-g41e3e1082367
+
+* Thu May 10 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add fix from linux-next for mvebu Armada 8K macbin boot regression
+
+* Thu May 10 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc4.git3.1
+- Linux v4.17-rc4-38-g008464a9360e
+
+* Wed May 09 2018 Jeremy Cline <jeremy@jcline.org>
+- Workaround for m400 uart irq firmware description (rhbz 1574718)
+
+* Wed May 09 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc4.git2.1
+- Linux v4.17-rc4-31-g036db8bd9637
+
+* Tue May 08 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc4.git1.1
+- Linux v4.17-rc4-12-gf142f08bf7ec
+- Reenable debugging options.
+
+* Mon May 07 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc4.git0.1
+- Linux v4.17-rc4
+
+* Mon May 07 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Disable debugging options.
+
+* Sat May 5 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fix USB-2 on Tegra devices
+
+* Fri May 04 2018 Laura Abbott <labbott@redhat.com>
+- Fix for building out of tree modules on powerpc (rhbz 1574604)
+
+* Fri May 04 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc3.git4.1
+- Linux v4.17-rc3-148-g625e2001e99e
+
+* Thu May 03 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc3.git3.1
+- Linux v4.17-rc3-36-gc15f6d8d4715
+
+* Wed May 02 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc3.git2.1
+- Linux v4.17-rc3-13-g2d618bdf7163
+
+* Tue May 01 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc3.git1.1
+- Linux v4.17-rc3-5-gfff75eb2a08c
+- Reenable debugging options.
+
+* Mon Apr 30 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc3.git0.1
+- Linux v4.17-rc3
+
+* Mon Apr 30 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Disable debugging options.
+
+* Fri Apr 27 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc2.git3.1
+- Linux v4.17-rc2-155-g0644f186fc9d
+
+* Fri Apr 27 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable QLogic NICs on ARM
+
+* Thu Apr 26 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc2.git2.1
+- Linux v4.17-rc2-104-g69bfd470f462
+
+* Wed Apr 25 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add fixes for Marvell a37xx EspressoBin
+- Update to latest Raspberry Pi 3+ fixes
+- More fixes for lan78xx on the Raspberry Pi 3+
+
+* Tue Apr 24 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc2.git1.1
+- Linux v4.17-rc2-58-g24cac7009cb1
+- Reenable debugging options.
+
+* Mon Apr 23 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc2.git0.1
+- Linux v4.17-rc2
+
+* Mon Apr 23 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Disable debugging options.
+
+* Sun Apr 22 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add quirk patch to fix X-Gene 1 console on HP m400/Mustang (RHBZ 1531140)
+
+* Fri Apr 20 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc1.git3.1
+- Linux v4.17-rc1-93-g43f70c960180
+
+* Thu Apr 19 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc1.git2.1
+- Linux v4.17-rc1-28-g87ef12027b9b
+
+* Thu Apr 19 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable UFS storage options on ARM
+
+* Wed Apr 18 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix rhbz 1565354
+
+* Tue Apr 17 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable drivers for Xilinx ZYMQ-MP Ultra96
+- Initial support for PocketBeagle
+
+* Tue Apr 17 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc1.git1.1
+- Linux v4.17-rc1-21-ga27fc14219f2
+- Reenable debugging options.
+
+* Mon Apr 16 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc1.git0.1
+- Linux v4.17-rc1
+- Disable debugging options.
+
+* Fri Apr 13 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git9.1
+- Linux v4.16-11958-g16e205cf42da
+
+* Thu Apr 12 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git8.1
+- Linux v4.16-11766-ge241e3f2bf97
+
+* Thu Apr 12 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Patch to fix nouveau on Tegra platforms
+- Enable IOMMU on Exynos now upstream does
+- Disable tps65217-charger on BeagleBone to fix USB-OTG port rhbz 1487399
+- Add fix for the BeagleBone boot failure
+- Further fix for ThunderX ZIP driver
+
+* Wed Apr 11 2018 Laura Abbott <labbott@redhat.com>
+- Enable JFFS2 and some MTD modules (rhbz 1474493)
+- Enable a few infiniband options (rhbz 1291902)
+
+* Wed Apr 11 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git7.1
+- Linux v4.16-11490-gb284d4d5a678
+
+* Tue Apr 10 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git6.1
+- Linux v4.16-10929-gc18bb396d3d2
+
+* Mon Apr 9 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fixes for Cavium ThunderX ZIP driver stability
+
+* Mon Apr 09 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git5.1
+- Linux v4.16-10608-gf8cf2f16a7c9
+
+* Fri Apr 06 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git4.1
+- Linux v4.16-9576-g38c23685b273
+
+* Thu Apr 05 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git3.1
+- Linux v4.16-7248-g06dd3dfeea60
+
+* Wed Apr 04 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git2.1
+- Linux v4.16-5456-g17dec0a94915
+
+* Tue Apr 03 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git1.1
+- Linux v4.16-2520-g642e7fd23353
+- Reenable debugging options.
+
+* Mon Apr 2 2018 Peter Robinson <pbrobinson@fedoraproject.org> 4.16.0-2
+- Improvements for the Raspberry Pi 3+
+- Fixes and minor improvements to Raspberry Pi 2/3
+
+* Mon Apr 02 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-1
+- Linux v4.16
+- Disable debugging options.
+
+* Sat Oct 20 2012 Thorsten Leemhuis <fedora@leemhuis.info> - 3.7.0-0.rc1.git3.1.vanilla.mainline.knurd.1
+- add buildid ".vanilla.knurd.1"
+- switch defines to build:
+-- a vanilla kernel without debuging
+-- no debug kernel and no debuginfo packages, to big to handle for me right now
+- disable the variant macro as that adds "-vanilla" to %%name, which confuses
+ fedpkg and prevents installonly handling of packages in yum/dnf
+- revert "Drop stable_rc macros" (8a6c714a8c)
+
###
# The following Emacs magic makes C-c C-e use UTC dates.
# Local Variables:
diff --git a/scripts/stable-update.sh b/scripts/stable-update.sh
index 259a338c1..45364c2cb 100755
--- a/scripts/stable-update.sh
+++ b/scripts/stable-update.sh
@@ -13,6 +13,11 @@
#
# Args: Stable version to update (e.g. 4.7.7, 4.8.1)
+# update orgin
+~/usr/bin/vanilla-kernel-helper.sh masterupdate
+currentbranch=$(git symbolic-ref --short HEAD)
+git merge --no-edit origin/${currentbranch%-user-thl-vanilla-fedora} || exit 1
+
if [ $# -lt 1 ]; then
echo "Need a version"
exit 1
@@ -61,7 +66,10 @@ fi
grep $1 sources &> /dev/null
if [ ! $? -eq 0 ]; then
- fedpkg upload patch-$1.xz
+ # thl is not an allowed uploader, skip this
+ # fedpkg upload patch-$1.xz
+ checksum=$(sha512sum patch-$1.xz)
+ echo "SHA512 (patch-$1.xz) = ${checksum:0:128}" >> sources
# Cryptic awk: search for the previous patch level (if one exists) and
# remove it from the source file
@@ -77,8 +85,13 @@ awk -v STABLE=$SUBLEVEL '/%define stable_update/ \
mv kernel.spec.tmp kernel.spec
# Reset the base release for use with rpmdev-bumpspec
-BASERELEASE=`cat kernel.spec | grep "%global baserelease" | cut -d ' ' -f 3 | head -c 1`00
-BASERELEASE=$(($BASERELEASE-1))
+BASERELEASE=`cat kernel.spec | grep "%global baserelease" | cut -d ' ' -f 3 | head -c 1`50
+#BASERELEASE=$(($BASERELEASE-1))
BASERELEASE=$BASERELEASE perl -p -i -e 's|%global baserelease.*|%global baserelease $ENV{'BASERELEASE'}|' kernel.spec
-rpmdev-bumpspec -c "Linux v$1" kernel.spec
+# do not generate changelog: avoids merge conflicts that are not worth the trouble
+# rpmdev-bumpspec -c "Linux v$1" kernel.spec
+
+git diff kernel.spec sources
+sleep 1 || exit 1
+git commit -m "Linux v$1" kernel.spec sources
generated by cgit (git 2.34.1) at 2024-06-08 17:25:57 +0000