summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel.spec26
-rw-r--r--sources6
2 files changed, 21 insertions, 11 deletions
diff --git a/kernel.spec b/kernel.spec
index 5c9379d29..219b1b718 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.rc5.1
+%global distro_build 0.rc5.20200513git24085f70a6e1.1
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -69,10 +69,10 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.7.0
-%define pkgrelease 0.rc5.1
+%define pkgrelease 0.rc5.20200513git24085f70a6e1.1
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.1%{?buildid}%{?dist}
+%define specrelease 0.rc5.20200513git24085f70a6e1.1%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -163,7 +163,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 1
+%define debugbuildsenabled 0
# The kernel tarball/base version
%define kversion 5.7
@@ -564,7 +564,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.7-rc5.tar.xz
+Source0: linux-20200513git24085f70a6e1.tar.xz
Source1: Makefile.rhelver
@@ -1273,8 +1273,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.7-rc5 -c
-mv linux-5.7-rc5 linux-%{KVERREL}
+%setup -q -n kernel-20200513git24085f70a6e1 -c
+mv linux-20200513git24085f70a6e1 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2587,8 +2587,9 @@ fi
%endif
%if %{with_tools}
+%ifnarch %{cpupowerarchs}
%files -n kernel-tools
-%ifarch %{cpupowerarchs}
+%else
%files -n kernel-tools -f cpupower.lang
%{_bindir}/cpupower
%{_datadir}/bash-completion/completions/cpupower
@@ -2763,6 +2764,15 @@ fi
#
#
%changelog
+* Wed May 13 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc5.20200513git24085f70a6e1.1]
+- 24085f70a6e1 rebase
+- Updated changelog for the release based on 152036d1379f ("CKI@GitLab")
+
+* Tue May 12 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc5.20200512git152036d1379f.1]
+- 152036d1379f rebase
+- Updated changelog for the release based on v5.7-rc5 ("CKI@GitLab")
+- Fix "multiple files for package kernel-tools" (Pablo Greco)
+
* Mon May 11 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc5.1]
- v5.7-rc5 rebase
- Updated changelog for the release based on e99332e7b4cd ("CKI@GitLab")
diff --git a/sources b/sources
index 04418dbef..65f55c32f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.7-rc5.tar.xz) = 0fbac0219c55574201d375cee1789b278e6ee683926568713f0166ad262eac6d4ae3c11d7cbdca5bef2a288f7143af8a5ed1e33621e5c7f2476f6cb239c508b7
-SHA512 (kernel-abi-whitelists-5.7.0-0.rc5.1.tar.bz2) = 07a4ac23c81e559a861e1f37632f306881704d2a32807f687f85a9b3376dfa12830495f44b9a2422fdb27cc7708dba59ea8049390c7b0afc0f5f9e27ef48547f
-SHA512 (kernel-kabi-dw-5.7.0-0.rc5.1.tar.bz2) = ba4c014babe6be4739af7cd7842fb203ea9aada9dd60abee924c4c6fc34d7fd75e0b380aa7d4ed1faefdf2da3356db0ded1d10504e1a1b1fdc3db38f621098a8
+SHA512 (linux-20200513git24085f70a6e1.tar.xz) = 0bfc29ba11f9d2a64a5b7e629be8db9592cc0849273fe03265822240a5a89487ad3240d986480231acaaf7722ddf3a588475cad4cea0e0cb2de60a19d7e86c48
+SHA512 (kernel-abi-whitelists-5.7.0-0.rc5.20200513git24085f70a6e1.1.tar.bz2) = 195b1b31136787e6e33321448ee0b9b88ab58f3882e4b8e6da5fad099a313aa41898fda9e18f835ad9169a4a39432b82e431d4476b00520496307adaa93506db
+SHA512 (kernel-kabi-dw-5.7.0-0.rc5.20200513git24085f70a6e1.1.tar.bz2) = bf1840c06cd4cd75539c5a26d0e0f038e9b5e81c5ec9e8164a7fd3e9b31136f807a7ddeb2b39da6bb6795a71facd15b14326fe5eab3c850afd9d344e1667d0c1