Bug 911833 - The Patch file 'secure-boot-3.7-20130204.patch' needs correction for non-EFI cases
Summary: The Patch file 'secure-boot-3.7-20130204.patch' needs correction for non-EFI ...
Keywords:
Status: CLOSED RAWHIDE
Alias: None
Product: Fedora
Classification: Fedora
Component: kernel
Version: 18
Hardware: x86_64
OS: Linux
unspecified
high
Target Milestone: ---
Assignee: Josh Boyer
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2013-02-16 08:03 UTC by Peter Bowey
Modified: 2013-02-19 00:55 UTC (History)
7 users (show)

Fixed In Version:
Clone Of:
Environment:
Last Closed: 2013-02-19 00:55:46 UTC
Type: Bug
Embargoed:


Attachments (Terms of Use)
Changed patch file with required EFI change to /arch/x86/kernel/setup.c (47.12 KB, application/octet-stream)
2013-02-16 08:03 UTC, Peter Bowey
no flags Details

Description Peter Bowey 2013-02-16 08:03:37 UTC
Created attachment 698098 [details]
Changed patch file with required EFI change to /arch/x86/kernel/setup.c

Description of problem:
kernel-3.7.8-202.fc18.src.rpm: Compile fails if 'CONFIG_EFI' not defined on build

Version-Release number of selected component (if applicable):
kernel-3.7.8-202

How reproducible:
Disable EFI Boot, then Build [rpmbuild]Kernel.

Steps to Reproduce:
1. Disable EFI
2. Build / Compile Kernel
3.
  
Actual results:
"undefined reference to `x86_efi_facility'"

Expected results:


Additional info:

The submitted PATCH 'secure-boot-3.7-20130204.patch' file is wrong:

For /arch/x86/kernel/setup.c it shows this:

// --------------------------------------------
                if (boot_params.secure_boot) {
                set_bit(EFI_SECURE_BOOT, &x86_efi_facility);
                secureboot_enable();
        }
// --------------------------------------------

Here is the corrected EFI patch for the patch file 'secure-boot-3.7-20130204.patch'  
(Starting from #244 of secure-boot-3.7-20130204.patch)

// --------------------------------------------
+#ifdef CONFIG_EFI
        if (boot_params.secure_boot) {
                set_bit(EFI_SECURE_BOOT, &x86_efi_facility);
                secureboot_enable();
        }
+#endif
// --------------------------------------------

I have added the amended the changed patch file here:
(same file-name - just the correction made above)

With the above change, the Kernel Build now completes successfully.

Comment 1 Peter Bowey 2013-02-16 08:08:53 UTC
Fixed with attached patch for 'secure-boot-3.7-20130204.patch'

Comment 2 Josh Boyer 2013-02-18 14:45:58 UTC
Thanks for the report.  I'll get this fixed up today.

Comment 3 Josh Boyer 2013-02-19 00:55:46 UTC
Slightly different patch, but should work now.  Fixed in 3.8.0-1.


Note You need to log in before you can comment on or make changes to this bug.