diff options
| -rw-r--r-- | kernel.spec | 3 | ||||
| -rw-r--r-- | rebase-notes.txt | 1 |
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? |