summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-01-26 14:12:58 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-01-26 14:12:58 -0500
commit14c5ae909dd6409fac2509270fbd7d4cc143d757 (patch)
tree32cb4fd3189f428e159a6a1057cdc2ada655403c
parent3f3bada419adc46d7e978292fdcdd18a78cf1d04 (diff)
downloadkernel-14c5ae909dd6409fac2509270fbd7d4cc143d757.tar.gz
kernel-14c5ae909dd6409fac2509270fbd7d4cc143d757.tar.xz
kernel-14c5ae909dd6409fac2509270fbd7d4cc143d757.zip
Enable CONFIG_EFI_STUB per Matthew Garrett
-rw-r--r--config-x86-generic2
-rw-r--r--kernel.spec3
2 files changed, 3 insertions, 2 deletions
diff --git a/config-x86-generic b/config-x86-generic
index e920346f5..d3fe36502 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -34,7 +34,7 @@ CONFIG_X86_PAT=y
CONFIG_X86_PM_TIMER=y
CONFIG_EFI=y
-# CONFIG_EFI_STUB is not set
+CONFIG_EFI_STUB=y
CONFIG_EFI_VARS=y
CONFIG_EFI_PCDP=y
CONFIG_FB_EFI=y
diff --git a/kernel.spec b/kernel.spec
index d9f072d2d..5f324c66e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -2274,6 +2274,7 @@ fi
%changelog
* Thu Jan 26 2012 Josh Boyer <jwboyer@redhat.com>
- Drop revert-efi-rtclock.patch. Issue was fixed by upstream commit 47997d75
+- Enable CONFIG_EFI_STUB per Matthew Garrett
* Wed Jan 25 2012 Peter Robinson <pbrobinson@fedoraproject.org>
- Build perf/tools on ARM sfp/hfp not just sfp