summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2018-05-14 16:36:41 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2018-05-14 16:36:41 -0500
commit972f0e5c0c6af570838547983d8506d8d8d6a742 (patch)
tree136f4726924b8217029a6d1e65172697b468db22
parent181ca5389a93113906f80afd054beb491d67e010 (diff)
downloadkernel-972f0e5c0c6af570838547983d8506d8d8d6a742.tar.gz
kernel-972f0e5c0c6af570838547983d8506d8d8d6a742.tar.xz
kernel-972f0e5c0c6af570838547983d8506d8d8d6a742.zip
Obsolete kernel-bootwrapper for rawhide only
-rw-r--r--kernel.spec3
-rw-r--r--rebase-notes.txt1
2 files changed, 4 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 857fbc0e2..a92bf3ac7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -789,6 +789,9 @@ The meta-package for the %{1} kernel\
Summary: %{variant_summary}\
Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
Provides: installonlypkg(kernel)\
+%ifarch %{power64}\
+Obsoletes: kernel-bootwrapper\
+%endif\
%{expand:%%kernel_reqprovconf}\
%if %{?1:1} %{!?1:0} \
%{expand:%%kernel_meta_package %{?1:%{1}}}\
diff --git a/rebase-notes.txt b/rebase-notes.txt
index c7d620a27..27c0aeb92 100644
--- a/rebase-notes.txt
+++ b/rebase-notes.txt
@@ -1,5 +1,6 @@
Linux 4.17 rebase notes:
- Turn off MTD + JFFS2 + extra infiniband options
+- Back out kernel-bootwrapper changes for power commit f360f7278a753796aec58ade5b149d12e49f8bc1
Linux 4.16 rebase notes:
- Consider turning off all the IMA features?