summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-07-08 17:46:27 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2019-07-08 17:46:27 +0200
commitbc2ba3d2ef1ba47be8c8ee0031772b9f5fb68347 (patch)
tree422ea10decdebd62babdfd9437ec2dd9a96e5b40
parent61931128ece28395ee4a941e7a1293778dc265ad (diff)
parent52decab756a82d5af2ba5626169e008b0a64934b (diff)
downloadkernel-bc2ba3d2ef1ba47be8c8ee0031772b9f5fb68347.tar.gz
kernel-bc2ba3d2ef1ba47be8c8ee0031772b9f5fb68347.tar.xz
kernel-bc2ba3d2ef1ba47be8c8ee0031772b9f5fb68347.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.2.0-1.vanilla.knurd.1.fc31kernel-5.2.0-1.vanilla.knurd.1.fc30kernel-5.2.0-1.vanilla.knurd.1.fc29
-rw-r--r--gitrev2
-rw-r--r--kernel.spec12
-rw-r--r--sources4
3 files changed, 10 insertions, 8 deletions
diff --git a/gitrev b/gitrev
index cf1aac412..6863f5ef9 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-eca94432934fe5f141d084f2e36ee2c0e614cc04
+0ecfebd2b52404ae0c54a878c872bb93363ada36
diff --git a/kernel.spec b/kernel.spec
index 419199a0b..b42417c24 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1. For rawhide
# and/or a kernel built from an rc or git snapshot, released_kernel should
# be 0.
-%global released_kernel 0
+%global released_kernel 1
# Sign modules on x86. Make sure the config files match this setting if more
# architectures are added.
@@ -52,7 +52,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 1
+%define base_sublevel 2
## If this is a released kernel ##
%if 0%{?released_kernel}
@@ -77,9 +77,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 0
# The git snapshot level
-%define gitrev 1
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -1850,6 +1850,10 @@ fi
#
#
%changelog
+* Mon Jul 08 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-1
+- Linux v5.2.0
+- Disable debugging options.
+
* Wed Jul 03 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc7.git1.1
- Linux v5.2-rc7-8-geca94432934f
- Reenable debugging options.
diff --git a/sources b/sources
index 723c73cb9..6829e2ef2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (linux-5.1.tar.xz) = ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
-SHA512 (patch-5.2-rc7.xz) = 07e23e8003f2c69b194fa59a5bd8ea3d200f7c16d4577c2b55b0e78d48c083c2770c941dbd32221a313c63f3954ac071eef7bce03d85eeaa3f32f78c378841d6
-SHA512 (patch-5.2-rc7-git1.xz) = 395dcb81925addc09a959025e858f68c933e3657cc651679b2a293a315501d9ce4deec1df897996882c0966c050c1a1a6f586dfced1e38d2eac50829f006cce4
+SHA512 (linux-5.2.tar.xz) = 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c