Linux v5.0.0

4 files changed, 16 insertions, 19 deletions

diff --git a/kernel.spec b/kernel.spec
index 0ed725329..fb08f6fec 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.
@@ -60,18 +60,18 @@ Summary: The Linux kernel
 %define stablerev %{stable_update}
 %define stable_base %{stable_update}
 %endif
-%define rpmversion 5%{base_sublevel}.%{stable_update}
+%define rpmversion 5.%{base_sublevel}.%{stable_update}
 
 ## The not-released-kernel case ##
 %else
 # The next upstream release sublevel (base_sublevel+1)
-# %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
+%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # Work around for major version bump
 %define upstream_sublevel 0
 # The rc snapshot level
-%global rcrev 8
+%global rcrev 0
 # The git snapshot level
-%define gitrev 1
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -124,7 +124,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
 
 # Kernel headers are being split out into a separate package
 %if 0%{?fedora}
@@ -164,8 +164,7 @@ Summary: The Linux kernel
 %endif
 
 # The kernel tarball/base version
-# %define kversion 5.%{base_sublevel}
-%define kversion 5.%{base_sublevel}-rc%rcrev
+%define kversion 5.%{base_sublevel}
 
 %define make_target bzImage
 %define image_install_path boot
@@ -427,8 +426,7 @@ BuildRequires: binutils-%{_build_arch}-linux-gnu, gcc-%{_build_arch}-linux-gnu
 %define cross_opts CROSS_COMPILE=%{_build_arch}-linux-gnu-
 %endif
 
-# Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{kversion}.tar.xz
-Source0: https://git.kernel.org/torvalds/t/linux-5.0-rc8.tar.gz
+Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{kversion}.tar.xz
 
 Source11: x509.genkey
 Source12: remove-binary-diff.pl
@@ -484,8 +482,7 @@ Source5000: %{stable_patch_00}
 # near the top of this spec file.
 %else
 %if 0%{?rcrev}
-# One more fixup apparently?
-# Source5000: patch-5.%{upstream_sublevel}-rc%{rcrev}.xz
+Source5000: patch-5.%{upstream_sublevel}-rc%{rcrev}.xz
 %if 0%{?gitrev}
 Source5001: patch-5.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.xz
 %endif
@@ -1890,6 +1887,9 @@ fi
 #
 #
 %changelog
+* Mon Mar 04 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-1
+- Linux v5.0.0
+
 * Tue Feb 26 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc8.git1.1
 - Linux v5.0-rc8-3-g7d762d69145a
 
diff --git a/scripts/create_headers_tarball.sh b/scripts/create_headers_tarball.sh
index cb57db634..5105f790c 100755
--- a/scripts/create_headers_tarball.sh
+++ b/scripts/create_headers_tarball.sh
@@ -27,10 +27,8 @@ STABLE=`grep "%define stable_update" kernel.spec| cut -d ' ' -f 3`
 RC=`grep "%global rcrev" kernel.spec| cut -d ' ' -f 3`
 GITREV=`grep "%define gitrev" kernel.spec| cut -d ' ' -f 3`
 if [ $RELEASED -eq 0 ]; then
-	#cd kernel-$MAJORVER.$BASE.fc??
-	cd kernel-5.0-rc$RC.fc??
-	#NEWBASE=$(($BASE+1))
-	NEWBASE=0
+	cd kernel-$MAJORVER.$BASE.fc??
+	NEWBASE=$(($BASE+1))
 	KVER=$MAJORVER.$NEWBASE.0-0.rc$RC.git$GITREV.$BASERELEASE
 	cd linux-$MAJORVER.$NEWBASE.0-0.rc$RC.git$GITREV.$BASERELEASE.fc*/
 else
diff --git a/scripts/kernel-version.sh b/scripts/kernel-version.sh
index 0de4c10d9..e2ec93a5a 100644
--- a/scripts/kernel-version.sh
+++ b/scripts/kernel-version.sh
@@ -2,7 +2,7 @@ VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed
 
 if [ -z "$VER" ] ;
 then
-    VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.gz// | tr -d "()")
+    VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.xz// | tr -d "()")
 fi
 
 
diff --git a/sources b/sources
index c02e17529..1eb341ce6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (linux-5.0-rc8.tar.gz) = f588175734e2969efee0fb0c61f586477fdcbc5d55ff23adb1b79ec7d3d18d2e4c4c5a43f81547cc5989546c9d9358325d84cebd3a89b756caa916c39d7b1d23
-SHA512 (patch-5.0-rc8-git1.xz) = cd7c5ae033d13050eb5188c6194d41c0cbb749bd496306db779d9fc7143144f5069e1c9a018b801ff548d5d8f15704c5141840b17dce6600359c72857f414605
+SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0