From 8aa3f869126757eef496fd9bc64eb0de358e5f40 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Thu, 16 Apr 2020 16:30:04 -0400
Subject: kernel-5.7.0-0.rc1.20200416git9786cab67457.1

* Thu Apr 16 2020 Jeremy Cline <jcline@redhat.com> [5.7.0-0.rc1.20200416git9786cab67457.1]
- 9786cab67457 rebase
- Copy distro files rather than moving them (Jeremy Cline)
- Place the buildid before the dist in the release (Jeremy Cline)
- Drop DIST from release commits and tags (Jeremy Cline)
- Sync up with Fedora arm configuration prior to merging (Jeremy Cline)
- Disable CONFIG_PROTECTED_VIRTUALIZATION_GUEST for zfcpdump (Jeremy Cline)
Resolves: rhbz#

Signed-off-by: Jeremy Cline <jcline@redhat.com>
---
 kernel.spec       | 20 +++++++++++---------
 sources           |  7 +++----
 update_scripts.sh |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/kernel.spec b/kernel.spec
index 2aa6271ff..071a4af07 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 0.rc1.20200414git8632e9b5645b.1
+%global distro_build 0.rc1.20200416git9786cab67457.1
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -69,12 +69,12 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.7.0
-%define pkgrelease 0.rc1.20200414git8632e9b5645b.1
+%define pkgrelease 0.rc1.20200416git9786cab67457.1
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20200414git8632e9b5645b.1%{?dist}
+%define specrelease 0.rc1.20200416git9786cab67457.1%{?buildid}%{?dist}
 
-%define pkg_release %{specrelease}%{?buildid}
+%define pkg_release %{specrelease}
 
 # What parts do we want to build?  We must build at least one kernel.
 # These are the kernels that are built IF the architecture allows it.
@@ -568,7 +568,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200414git8632e9b5645b.tar.xz
+Source0: linux-20200416git9786cab67457.tar.xz
 
 
 # Name of the packaged file containing signing key
@@ -1194,8 +1194,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20200414git8632e9b5645b -c
-mv linux-20200414git8632e9b5645b linux-%{KVERREL}
+%setup -q -n kernel-20200416git9786cab67457 -c
+mv linux-20200416git9786cab67457 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 
@@ -2603,8 +2603,10 @@ fi
 #
 #
 %changelog
-* Tue Apr 14 2020 Jeremy Cline <jcline@redhat.com> [5.7.0-0.rc1.20200414git8632e9b5645b.1]
-- 8632e9b5645b rebase
+* Thu Apr 16 2020 Jeremy Cline <jcline@redhat.com> [5.7.0-0.rc1.20200416git9786cab67457.1]
+- 9786cab67457 rebase
+- Copy distro files rather than moving them (Jeremy Cline)
+- Place the buildid before the dist in the release (Jeremy Cline)
 - Drop DIST from release commits and tags (Jeremy Cline)
 - Sync up with Fedora arm configuration prior to merging (Jeremy Cline)
 - Disable CONFIG_PROTECTED_VIRTUALIZATION_GUEST for zfcpdump (Jeremy Cline)
diff --git a/sources b/sources
index fdeed5a9b..2e7b1b257 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-SHA512 (patch-5.7-rc1.xz) = fa7e6f796ebcb275b2e7e42e62fdee9e20a1e3065c95850a2d5d46bf979f2d762997f8536d3ede4b6938ab7de96d20332bd02a62ecb87b6f36ad67a9ed866479
-SHA512 (linux-20200414git8632e9b5645b.tar.xz) = 3503f7255c029afd5f8a5bd6784b21b8830ae0254deebe0711bd5994def1f59f81fa2dba224ea8769e49541bf0943297c8166464245a59bfa02cace283bebadf
-SHA512 (kernel-abi-whitelists-5.7.0-0.rc1.20200414git8632e9b5645b.1.tar.bz2) = f9564da77f039d07ca6670ac645a3497e0264b208084af28351730f48576119af43cc885e41c911b9d9d44bbdda022a186f2bc92dd391e0f3575e15ef7d93964
-SHA512 (kernel-kabi-dw-5.7.0-0.rc1.20200414git8632e9b5645b.1.tar.bz2) = f49c5b1a2f65145632b45ff6af8bbaa3ca78d99a4cd50c52fb38545fce164223de5447e42cab10a78193c4ed23202b2338cec1feaaf8fd1c4760366ce45f75f6
+SHA512 (linux-20200416git9786cab67457.tar.xz) = 465c6ba698a0383c8eba0c94c5ec2eeab027e418bb76939d7156da343f08133f1637bc30e271d24aaabd9ce7de18bc95bba86118880aea0be59cfcf54b4cea44
+SHA512 (kernel-abi-whitelists-5.7.0-0.rc1.20200416git9786cab67457.1.tar.bz2) = bbf71c0a65308633f742209b56b584a101aa0c20020b98b6adf2292640e1a4cbc10d556ea10820eb6a3a3f4aaab8c348b17e6f195dabbd459251223779ce1def
+SHA512 (kernel-kabi-dw-5.7.0-0.rc1.20200416git9786cab67457.1.tar.bz2) = 468c5d1f14b447aec2eef7b600f528747e7e4bc774bc89145bd05b4a7c29a26cb55351316107f9b2c4e04a0525fdc8c4d84d24864cc71c46fbdea9fa817392f4
diff --git a/update_scripts.sh b/update_scripts.sh
index 77d795287..bbfd6f11f 100755
--- a/update_scripts.sh
+++ b/update_scripts.sh
@@ -8,5 +8,5 @@ TARGET=$1
 
 for i in $RPM_SOURCE_DIR/*.$TARGET; do
 	NEW=`echo $i | sed s/.$TARGET//`
-	mv $i $NEW
+	cp $i $NEW
 done
-- 
cgit